fix: local testing

nearform · Mar 25, 2020 · ade956a · ade956a
1 parent 6ec613b
commit ade956a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ sudo: required
 
 env:
   global:
-  - NODE_ENV=travis
   - TRAIL_DB_HOST=localhost
   - TRAIL_DB_PORT=5432
   - TRAIL_DB_NAME=trails_test
@@ -24,6 +23,7 @@ env:
 
 addons:
   postgresql: "9.6"
+
 services:
   - postgresql
 

diff --git a/packages/trail-core/database/config.js b/packages/trail-core/database/config.js
diff --git a/packages/trail-core/package.json b/packages/trail-core/package.json
@@ -33,8 +33,8 @@
     "coverage": "lab -c test",
     "depcheck": "npx depcheck --ignores=config",
     "pg:init": "node ./database/init.js && npm run pg:migrate",
-    "pg:test:init": "NODE_ENV=test node ./database/init.js && NODE_ENV=test npm run pg:migrate",
-    "pg:travis:init": "NODE_ENV=travis node ./database/init.js && NODE_ENV=travis npm run pg:migrate",
+    "pg:test:init": "TRAIL_DB_NAME=trails_test node ./database/init.js && TRAIL_DB_NAME=trails_test npm run pg:migrate",
+    "pg:travis:init": "TRAIL_DB_NAME=trails_test TRAIL_DB_PASSWORD= node ./database/init.js && TRAIL_DB_NAME=trails_test TRAIL_DB_PASSWORD= npm run pg:migrate",
     "pg:migrate": "node ./database/migrate.js --version=max",
     "test": "lab test"
   },
@@ -52,4 +52,4 @@
     "code": "^5.2.0",
     "sinon": "^8.1.1"
   }
-}
+}