From ff48abd125a8073c3e7082c44d51ff727f4f3d35 Mon Sep 17 00:00:00 2001 From: Benjamin Coe Date: Tue, 8 Nov 2016 11:39:55 -0800 Subject: [PATCH] feat: switch to .js based configuration --- config-test.js | 12 ++++++++++++ config-test.json | 12 ------------ package.json | 7 ++++--- 3 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 config-test.js delete mode 100644 config-test.json diff --git a/config-test.js b/config-test.js new file mode 100644 index 0000000..6a6578d --- /dev/null +++ b/config-test.js @@ -0,0 +1,12 @@ +module.exports = { + connection: { + driver: "pg", + user: "postgres", + host: "0.0.0.0", + database: "oauth2_server" + }, + pool: { + min: 0, + max: 7 + } +} diff --git a/config-test.json b/config-test.json deleted file mode 100644 index 8986412..0000000 --- a/config-test.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "connection": { - "driver": "pg", - "user": "postgres", - "host": "0.0.0.0", - "database": "oauth2_server" - }, - "pool": { - "min": 0, - "max": 7 - } -} diff --git a/package.json b/package.json index 73b7e24..4450e92 100644 --- a/package.json +++ b/package.json @@ -5,16 +5,17 @@ "main": "./lib/server.js", "bin": "./bin/oauth2-server-pg.js", "scripts": { - "pretest": "standard; if pgrep \"docker\" > /dev/null; then (npm run pg-test-down || true) && npm run pg-test-up; sleep 5; fi", + "posttest": "standard", + "pretest": "if pgrep \"docker\" > /dev/null; then (npm run pg-test-down || true) && npm run pg-test-up; sleep 5; fi", "test": "nyc mocha --timeout=5000 test/*.js", "posttest": "if pgrep \"docker\" > /dev/null; then npm run pg-test-down; fi", "coverage": "nyc report --reporter=text-lcov | coveralls", "pg-test-up": "docker run --name oauth2serverpg_postgres_1 -e POSTGRES_DB=oauth2_server -p 5432:5432/tcp -d postgres:9.4 postgres", "pg-test-down": "docker rm -f oauth2serverpg_postgres_1", "pg-test": "npm run pg-test-up; sleep 5; npm run migrate-test", - "migrate-test": "db-migrate --config=./config-test.json --env=connection up", + "migrate-test": "db-migrate --config=./config-test.js --env=connection up", "psql": "docker exec -it oauth2serverpg_postgres_1 psql -U postgres -d oauth2_server", - "migrate": "db-migrate --config=./config.json --env=connection", + "migrate": "db-migrate --config=./config.js --env=connection", "release": "standard-version" }, "repository": {