Merge pull request #80 from FullstackAcademy/database-environment-url-fix

Database environment url fix

Author: joedotjs

generated/gulpfile.js

@@ -12,8 +12,8 @@ var ngAnnotate = require('gulp-ng-annotate');
 var uglify = require('gulp-uglify');
 var sourcemaps = require('gulp-sourcemaps');
 var eslint = require('gulp-eslint');
+var karma = require('karma');
 var mocha = require('gulp-spawn-mocha');
-var karma = require('karma').server;
 var istanbul = require('gulp-istanbul');
 var notify = require('gulp-notify');
 
@@ -84,10 +84,11 @@ gulp.task('testServerJSWithCoverage', function (done) {
 gulp.task('testBrowserJS', function (done) {
     //testing environment variable
     process.env.NODE_ENV = 'testing';
-    karma.start({
+    var server = new karma.Server({
         configFile: __dirname + '/tests/browser/karma.conf.js',
         singleRun: true
     }, done);
+    server.start();
 });
 
 gulp.task('buildCSS', function () {

generated/server/app/configure/index.js

@@ -16,7 +16,9 @@ module.exports = function (app, db) {
 
     // Logging middleware, set as application
     // variable inside of server/app/configure/app-variables.js
-    app.use(app.getValue('log'));
+    if (process.env.NODE_ENV !== 'testing') {
+        app.use(app.getValue('log'));
+    }
 
     require('./authentication')(app, db);
 

generated/server/db/_db.js

@@ -2,8 +2,8 @@ var path = require('path');
 var Sequelize = require('sequelize');
 
 var env = require(path.join(__dirname, '../env'));
-var db = new Sequelize(env.DATABASE_URI, {
-  logging: env.LOGGING,
+var db = new Sequelize(env.DATABASE_URL, {
+  logging: env.LOGGING ? console.log : false,
   native: env.NATIVE
 });
 

generated/server/db/models/user.js

@@ -45,17 +45,14 @@ module.exports = db.define('user', {
         }
     },
     hooks: {
-        beforeCreate: function (user) {
-            if (user.changed('password')) {
-                user.salt = user.Model.generateSalt();
-                user.password = user.Model.encryptPassword(user.password, user.salt);
-            }
-        },
-        beforeUpdate: function (user) {
-            if (user.changed('password')) {
-                user.salt = user.Model.generateSalt();
-                user.password = user.Model.encryptPassword(user.password, user.salt);
-            }
-        }
+        beforeCreate: setSaltAndPassword,
+        beforeUpdate: setSaltAndPassword
     }
 });
+
+function setSaltAndPassword(user) {
+    if (user.changed('password')) {
+        user.salt = user.Model.generateSalt();
+        user.password = user.Model.encryptPassword(user.password, user.salt);
+    }
+}

generated/server/env/development.js

@@ -1,5 +1,5 @@
 module.exports = {
-  DATABASE_URI: 'postgres://localhost:5432/fsg',
+  DATABASE_URL: 'postgres://localhost:5432/fsg',
   SESSION_SECRET: 'Optimus Prime is my real dad',
   TWITTER: {
     consumerKey: 'INSERT_TWITTER_CONSUMER_KEY_HERE',

generated/server/env/production.js

@@ -7,7 +7,7 @@
  */
 
 module.exports = {
-    DATABASE_URI: process.env.DATABASE_URI,
+    DATABASE_URL: process.env.DATABASE_URL,
     SESSION_SECRET: process.env.SESSION_SECRET,
     TWITTER: {
         consumerKey: process.env.TWITTER_CONSUMER_KEY,

generated/server/env/testing.js

@@ -1,5 +1,5 @@
 module.exports = {
-  DATABASE_URI: 'postgres://localhost:5432/testing-fsg',
+  DATABASE_URL: 'postgres://localhost:5432/testing-fsg',
   SESSION_SECRET: 'Optimus Prime is my real dad',
   TWITTER: {
     consumerKey: 'INSERT_TWITTER_CONSUMER_KEY_HERE',