Merge pull request #1011 from DaftMonk/canary

Merge canary into master

Author: Awk34

Diff for: .gitattributes

@@ -1 +1 @@
-* text=auto
+* text eol=lf

Diff for: .gitignore

@@ -5,5 +5,5 @@ demo
 .idea
 .DS_Store
 release.txt
-fixtures/bower.json
-fixtures/package.json
+test/fixtures/bower.json
+test/fixtures/package.json

Diff for: .travis.yml

@@ -1,15 +1,26 @@
+sudo: false
 language: node_js
 node_js:
   - '0.12'
+env:
+  global:
+    - SAUCE_USERNAME=fullstack_ci
+    - SAUCE_ACCESS_KEY=1a527ca6-4aa5-4618-86ce-0278bf158cbf
 before_install:
+  - ./scripts/sauce_connect_setup.sh
   - gem update --system
   - gem install sass --version "=3.3.7"
   - npm install -g bower grunt-cli
 services: mongodb
+cache:
+  directories:
+    - node_modules
+    - test/fixtures/node_modules
+    - test/fixtures/bower_components
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/911ed472ef19bcb27858
+      - secure: "DhPNqHXuUIeIGE9Ek3+63qhco+4MozXqMZL6dAKoq1MHQ2RAPO6SYIkUYZqDnuWYlwWao2EnTYcDREivIV/m/RnkP9bKlpX/n/RNJe+X4bwFaCU55fVKgkAFn3takSBC5SVoeTWHdWu3WhhqSdioWjT7mlE1wtt/RanSMb5Id8M="
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false

Diff for: CHANGELOG.md

@@ -582,4 +582,4 @@ Closes #18, #17
 
 #### Features
 
-* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))
+* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))

Diff for: Gruntfile.js

@@ -1,16 +1,19 @@
 'use strict';
-var markdown = require('marked');
+
 var semver = require('semver');
-var _s = require('underscore.string');
 var shell = require('shelljs');
-var process = require('child_process');
+var child_process = require('child_process');
 var Q = require('q');
 var helpers = require('yeoman-generator').test;
-var fs = require('fs-extra');
+var fs = require('fs');
 var path = require('path');
 
 module.exports = function (grunt) {
-  require('load-grunt-tasks')(grunt);
+  // Load grunt tasks automatically, when needed
+  require('jit-grunt')(grunt, {
+    buildcontrol: 'grunt-build-control',
+    changelog: 'grunt-conventional-changelog'
+  });
 
   grunt.initConfig({
     config: {
@@ -58,6 +61,11 @@ module.exports = function (grunt) {
       },
       all: ['Gruntfile.js', '*/index.js']
     },
+    env: {
+      fast: {
+        SKIP_E2E: true
+      }
+    },
     mochaTest: {
       test: {
         src: [
@@ -82,6 +90,16 @@ module.exports = function (grunt) {
           ]
         }]
       }
+    },
+    david: {
+      gen: {
+        options: {}
+      },
+      app: {
+        options: {
+          package: 'test/fixtures/package.json'
+        }
+      }
     }
   });
 
@@ -139,6 +157,7 @@ module.exports = function (grunt) {
         bootstrap: true,
         uibootstrap: true,
         mongoose: true,
+        testing: 'jasmine',
         auth: true,
         oauth: ['googleAuth', 'twitterAuth'],
         socketio: true
@@ -202,7 +221,6 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('updateFixtures', 'updates package and bower fixtures', function() {
-    var done = this.async();
     var packageJson = fs.readFileSync(path.resolve('app/templates/_package.json'), 'utf8');
     var bowerJson = fs.readFileSync(path.resolve('app/templates/_bower.json'), 'utf8');
 
@@ -215,24 +233,30 @@ module.exports = function (grunt) {
     bowerJson = bowerJson.replace(/<%(.*)%>/g, '');
 
     // save files
-    fs.writeFile(path.resolve(__dirname + '/test/fixtures/package.json'), packageJson, function() {
-      fs.writeFile(path.resolve(__dirname + '/test/fixtures/bower.json'), bowerJson, function() {
-        done();
-      });
-    });
+    fs.writeFileSync(path.resolve(__dirname + '/test/fixtures/package.json'), packageJson);
+    fs.writeFileSync(path.resolve(__dirname + '/test/fixtures/bower.json'), bowerJson);
   });
 
   grunt.registerTask('installFixtures', 'install package and bower fixtures', function() {
     var done = this.async();
 
     shell.cd('test/fixtures');
     grunt.log.ok('installing npm dependencies for generated app');
-    process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {
+    child_process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {
 
       grunt.log.ok('installing bower dependencies for generated app');
-      process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
-        shell.cd('../../');
-        done();
+      child_process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
+
+        if(!process.env.SAUCE_USERNAME) {
+          grunt.log.ok('running npm run update-webdriver');
+          child_process.exec('npm run update-webdriver', function() {
+            shell.cd('../../');
+            done();
+          });
+        } else {
+          shell.cd('../../');
+          done();
+        }
       })
     });
   });
@@ -242,6 +266,24 @@ module.exports = function (grunt) {
     'installFixtures',
     'mochaTest'
   ]);
+  grunt.registerTask('test', function(target, option) {
+    if (target === 'fast') {
+      grunt.task.run([
+        'env:fast'
+      ]);
+    }
+
+    return grunt.task.run([
+      'updateFixtures',
+      'installFixtures',
+      'mochaTest'
+    ])
+  });
+
+  grunt.registerTask('deps', function(target) {
+    if (!target || target === 'app') grunt.task.run(['updateFixtures']);
+    grunt.task.run(['david:' + (target || '')]);
+  });
 
   grunt.registerTask('demo', [
     'clean:demo',