Merge pull request #59 from FullstackAcademy/testingEdits

Testing edits Closes #55

Author: omriAckley

generated/gulpfile.js

@@ -55,12 +55,16 @@ gulp.task('buildJS', ['lintJS'], function () {
 
 gulp.task('testServerJS', function () {
     require('babel-register');
+    //testing environment variable 
+    process.env.NODE_ENV = 'testing';
 	return gulp.src('./tests/server/**/*.js', {
 		read: false
 	}).pipe(mocha({ reporter: 'spec' }));
 });
 
 gulp.task('testServerJSWithCoverage', function (done) {
+    //testing environment variable 
+    process.env.NODE_ENV = 'testing';
     gulp.src('./server/**/*.js')
         .pipe(istanbul({
             includeUntested: true
@@ -78,6 +82,8 @@ gulp.task('testServerJSWithCoverage', function (done) {
 });
 
 gulp.task('testBrowserJS', function (done) {
+    //testing environment variable 
+    process.env.NODE_ENV = 'testing';
     karma.start({
         configFile: __dirname + '/tests/browser/karma.conf.js',
         singleRun: true

generated/server/db/_db.js

@@ -2,6 +2,6 @@ var path = require('path');
 var Sequelize = require('sequelize');
 
 var env = require(path.join(__dirname, '../env'));
-var db = new Sequelize(env.DATABASE_URI);
+var db = new Sequelize(env.DATABASE_URI, { logging: env.LOGGING });
 
 module.exports = db;

generated/server/env/development.js

@@ -15,5 +15,6 @@ module.exports = {
     "clientID": "INSERT_GOOGLE_CLIENTID_HERE",
     "clientSecret": "INSERT_GOOGLE_CLIENT_SECRET_HERE",
     "callbackURL": "INSERT_GOOGLE_CALLBACK_HERE"
-  }
+  },
+  "LOGGING": true
 };

generated/server/env/index.js

@@ -1,9 +1,12 @@
 var path = require('path');
 var devConfigPath = path.join(__dirname, './development.js');
 var productionConfigPath = path.join(__dirname, './production.js');
+var testConfigPath = path.join(__dirname, './testing.js');
 
 if (process.env.NODE_ENV === 'production') {
     module.exports = require(productionConfigPath);
+} else if (process.env.NODE_ENV === 'testing') {
+    module.exports = require(testConfigPath);	
 } else {
     module.exports = require(devConfigPath);
 }

generated/server/env/production.js

@@ -23,5 +23,6 @@ module.exports = {
         "clientID": process.env.GOOGLE_CLIENT_ID,
         "clientSecret": process.env.GOOGLE_CLIENT_SECRET,
         "callbackURL": process.env.GOOGLE_CALLBACK_URL
-    }
+    },
+    "LOGGING": true
 };

generated/server/env/testing.js

@@ -0,0 +1,20 @@
+module.exports = {
+  "DATABASE_URI": "postgres://localhost:5432/testing-fsg",
+  "SESSION_SECRET": "Optimus Prime is my real dad",
+  "TWITTER": {
+    "consumerKey": "INSERT_TWITTER_CONSUMER_KEY_HERE",
+    "consumerSecret": "INSERT_TWITTER_CONSUMER_SECRET_HERE",
+    "callbackUrl": "INSERT_TWITTER_CALLBACK_HERE"
+  },
+  "FACEBOOK": {
+    "clientID": "INSERT_FACEBOOK_CLIENTID_HERE",
+    "clientSecret": "INSERT_FACEBOOK_CLIENT_SECRET_HERE",
+    "callbackURL": "INSERT_FACEBOOK_CALLBACK_HERE"
+  },
+  "GOOGLE": {
+    "clientID": "INSERT_GOOGLE_CLIENTID_HERE",
+    "clientSecret": "INSERT_GOOGLE_CLIENT_SECRET_HERE",
+    "callbackURL": "INSERT_GOOGLE_CALLBACK_HERE"
+  },
+  "LOGGING": false
+};

generated/tests/server/models/user-test.js

@@ -2,10 +2,8 @@ var sinon = require('sinon');
 var expect = require('chai').expect;
 
 var Sequelize = require('sequelize');
-var dbURI = 'postgres://localhost:5432/testing-fsg';
-var db = new Sequelize(dbURI);
 
-require('../../../server/db/models/user')(db);
+var db = require('../../../server/db');
 
 var User = db.model('user');
 

generated/tests/server/routes/members-only-test.js

@@ -2,11 +2,8 @@
 var expect = require('chai').expect;
 
 var Sequelize = require('sequelize');
-var dbURI = 'postgres://localhost:5432/testing-fsg';
-var db = new Sequelize(dbURI, {
-    logging: false
-});
-require('../../../server/db/models/user')(db);
+
+var db = require('../../../server/db');
 
 var supertest = require('supertest');