diff --git a/conf.d/mysql.yml b/conf.d/mysql.yml index 99c5e53..86bcdf8 100644 --- a/conf.d/mysql.yml +++ b/conf.d/mysql.yml @@ -20,4 +20,4 @@ test: development: password: StaySafeOutThere - socketPath: /opt/local/var/run/mysql57/mysqld.sock + # socketPath: /opt/local/var/run/mysql82/mysqld.sock diff --git a/package.json b/package.json index bdd64c5..a42b31b 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,7 @@ "prettier": "npx prettier *.js lib routes test html --check", "prettier:fix": "npm run prettier -- --write", "start": "NODE_ENV=production node ./server", - "testSetup": "node test/.setup.js", - "testTeardown": "node test/.teardown.js", - "test": "npm run testSetup; node --test; npm run testTeardown", + "test": "test/run.sh", "versions": "npx dependency-version-checker check", "watch": "npm run test -- --watch" }, diff --git a/test/.setup.js b/test/.setup.js index f95c009..424302e 100644 --- a/test/.setup.js +++ b/test/.setup.js @@ -1,7 +1,7 @@ -const util = require('../lib/util') const group = require('../lib/group') -// const session = require('../lib/session') const user = require('../lib/user') +// const session = require('../lib/session') + const userCase = require('./fixtures/user.json') const groupCase = require('./fixtures/group.json') @@ -11,7 +11,7 @@ const setup = async () => { // await createTestSession() await user._mysql.disconnect() await group._mysql.disconnect() - process.exit(1) + process.exit() } setup() diff --git a/test/.teardown.js b/test/.teardown.js index 37dbfd7..571d46b 100644 --- a/test/.teardown.js +++ b/test/.teardown.js @@ -10,7 +10,7 @@ const teardown = async () => { await destroyTestGroup() await user._mysql.disconnect() await group._mysql.disconnect() - process.exit(1) + process.exit() } teardown() diff --git a/test/run.sh b/test/run.sh new file mode 100755 index 0000000..5b81082 --- /dev/null +++ b/test/run.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +node test/.setup.js +node --test +node test/.teardown.js \ No newline at end of file