removed console.log and resolved conflict

salesforce · Nov 3, 2016 · feb07ca · feb07ca
1 parent b69c7a3
commit feb07ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/db/createOrUpdateDb.js b/db/createOrUpdateDb.js
@@ -21,7 +21,6 @@ const utils = require('./utils');
 models.sequelize.query(`select count(*) from
   information_schema.tables where table_schema = 'public'`)
 .then((data) => {
-  console.log('found', data); // eslint-disable-line
   if (data[0][0].count === '0') { // eslint-disable-line
     require('./reset.js'); // eslint-disable-line global-require
   } else {
@@ -30,7 +29,7 @@ models.sequelize.query(`select count(*) from
 })
 .catch((err) => {
   const dbConfig = utils.dbConfigObjectFromDbURL();
-  console.log('create db now', dbConfig); // eslint-disable-line
+  console.log('create db now', dbConfig.name); // eslint-disable-line
   pgtools.createdb(dbConfig, dbConfig.name, (err2, res) => {
     if (err2) {
       console.error('ERROR', err2); // eslint-disable-line

diff --git a/package.json b/package.json
@@ -28,14 +28,14 @@
     "checkdb": "node db/createOrUpdateDb.js",
     "undo-migratedb": "node db/migrateUndo.js",
     "test-api": "mocha -R dot --recursive tests/api",
-    "test-disablehttp": "NODE_ENV=testDisableHttp  mocha -R dot --recursive tests/disableHttp",
+    "test-disablehttp": "DISABLE_HTTP=true mocha -R dot --recursive tests/disableHttp",
     "test-token-req": "NODE_ENV=testTokenReq mocha -R dot --recursive tests/tokenReq",
     "test-token-notreq": "NODE_ENV=testTokenNotReq mocha -R dot --recursive tests/tokenNotReq",
     "test-db": "npm run resetdb && mocha -R dot --recursive tests/db",
     "test-realtime": "mocha -R dot --recursive tests/realtime",
-    "test-subj-tag-filter": "NODE_ENV=testSubjTagFilter mocha -R dot --recursive tests/subjectTagFilter",
+    "test-subj-tag-filter": "FILTER_SUBJ_BY_TAGS=true mocha -R dot --recursive tests/subjectTagFilter",
     "test-view": "NODE_ENV=test mocha -R dot --recursive --compilers js:babel-core/register --require ./tests/view/setup.js tests/view",
-    "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R dot --recursive tests/api tests/db && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage && npm run test-view && npm run test-realtime && npm run test-token-req && npm run test-token-notreq && npm run test-disablehttp && npm run test-subj-tag-filter",
+    "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R dot --recursive tests/api tests/db tests/config && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage && npm run test-view && npm run test-realtime && npm run test-token-req && npm run test-token-notreq && npm run test-disablehttp && npm run test-subj-tag-filter",
     "postinstall": "NODE_ENV=production gulp browserifyViews && gulp movecss && gulp movesocket && gulp movelensutil",
     "prestart": "npm run checkdb"
   },
@@ -71,21 +71,23 @@
     "express-ipfilter": "^0.0.24",
     "express-session": "^1.13.0",
     "extract-text-webpack-plugin": "^0.8.2",
+    "feature-toggles": "^1.4.0",
     "fs": "0.0.2",
     "gulp": "^3.9.0",
     "gulp-chmod": "^1.3.0",
-    "gulp-jscs": "^3.0.2",
+    "gulp-jscs": "^4.0.0",
     "helmet": "^0.15.0",
     "html-webpack-plugin": "^2.16.0",
     "js-yaml": "^3.4.6",
-    "jscs": "^2.7.0",
-    "jsdom": "^5.6.1",
+    "jscs": "^3.0.7",
+    "jsdom": "^9.8.3",
     "jsonwebtoken": "^5.7.0",
     "lodash": "^4.0.0",
     "mocha": "^2.3.4",
     "multer": "^1.0.3",
     "newrelic": "^1.28.1",
     "nock": "^3.6.0",
+    "npm": "^3.10.9",
     "npm-watch": "^0.1.3",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",