Merge conflict involving gulpfile (karma changes) resolved

Author: Joe Alves

generated/.eslintrc.json

@@ -12,7 +12,8 @@
   },
   "rules": {
     "global-require": 0, // 0 = off, 1 = warn (yellow), 2 = error (red)
-    "camelcase": 0
+    "camelcase": 0,
+    "no-debugger": 1
     // add more rules here to override the fullstack config
   }
 }

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 mocha = require('gulp-mocha');
 var karma = require('karma');
+var mocha = require('gulp-spawn-mocha');
 var istanbul = require('gulp-istanbul');
 var notify = require('gulp-notify');
 
@@ -110,6 +110,22 @@ gulp.task('buildCSS', function () {
 // Production tasks
 // --------------------------------------------------------------
 
+gulp.task('lintJSProduction', function () {
+
+    return gulp.src(['./browser/js/**/*.js', './server/**/*.js'])
+        .pipe(plumber({
+            errorHandler: notify.onError('Linting FAILED! Check your gulp process.')
+        }))
+        .pipe(eslint({
+            rules: {
+                'no-debugger': 2 // 1 in dev
+            }
+        }))
+        .pipe(eslint.format())
+        .pipe(eslint.failOnError());
+
+});
+
 gulp.task('buildCSSProduction', function () {
     return gulp.src('./browser/scss/main.scss')
         .pipe(sass())

generated/package.json

@@ -36,21 +36,23 @@
     "gulp-istanbul": "^0.9.0",
     "gulp-livereload": "^3.7.0",
     "gulp-minify-css": "^0.4.6",
-    "gulp-mocha": "^2.0.0",
     "gulp-ng-annotate": "^0.5.2",
     "gulp-notify": "^2.2.0",
     "gulp-plumber": "^0.6.6",
     "gulp-rename": "^1.2.0",
     "gulp-sass": "^2.0.4",
     "gulp-sourcemaps": "^1.3.0",
+    "gulp-spawn-mocha": "^3.1.0",
     "gulp-uglify": "^1.1.0",
+    "istanbul": "^0.4.5",
     "karma": "^0.13.14",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "0.2.3",
     "karma-coverage": "^0.2.7",
     "karma-mocha": "^0.1.10",
     "karma-mocha-reporter": "^1.0.2",
     "lodash": "^3.9.3",
+    "mocha": "^3.0.2",
     "nodemon": "^1.3.7",
     "passport": "^0.2.1",
     "passport-facebook": "^1.0.3",

generated/server/app/configure/authentication/twitter.js

@@ -27,7 +27,7 @@ module.exports = function (app, db) {
             where: {
                 twitter_id: profile.id
             }
-        }).exec()
+        })
             .then(function (user) {
                 if (user) { // If a user with this twitter id already exists.
                     return user;

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

@@ -45,10 +45,8 @@ describe('Members Route', function () {
 			password: 'shoopdawoop'
 		};
 
-		beforeEach('Create a user', function (done) {
-			return User.create(userInfo).then(function (user) {
-                done();
-            }).catch(done);
+		beforeEach('Create a user', function () {
+			return User.create(userInfo);
 		});
 
 		beforeEach('Create loggedIn user agent and authenticate', function (done) {