Merge branch 'feature-sauce' into canary

Author: DaftMonk

.travis.yml

@@ -2,6 +2,12 @@ language: node_js
 node_js:
   - '0.10'
   - '0.11'
+env:
+  global:
+    - secure: fBqMlUrbIwaRJeKe39zxVsRcvtPIP/R98JNzrD0ycHzdfbhsWge0J7FCpdKjgRCf99ggqMhyevJafSJv7cfiVgJhB6kYudhG0G60V+vBjj4NIZnOelpVeQHXyLlekRpu+Qa/DaL43jovRAI0I11cwVfIRWtXZwiQOjCd/Elsdl8=
+    - secure: GZ95FcH0K88RG7P0SJjoIcHLfUalFRHeu5Vd7Kh0wXTh3O6Zku7iauk6Cd+aYGuFedL5wSzht5qnVBRm10VxhhJMxHiZ+I+VBxt4bysKM0axMZ+SMTfPK3zajVVXKfzIsIYO0m0qwYtHCgSXUrMnwAczESxczxq48VxA/rCXbYc=
+addons:
+  sauce_connect: true
 before_install:
   - gem update --system
   - gem install sass --version "=3.3.7"

Gruntfile.js

@@ -3,7 +3,7 @@ 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');
@@ -227,12 +227,20 @@ module.exports = function (grunt) {
 
     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) {
+          child_process.exec('npm run update-webdriver', function() {
+            shell.cd('../../');
+            done();
+          });
+        } else {
+          shell.cd('../../');
+          done();
+        }
       })
     });
   });

app/templates/protractor.conf.js

@@ -12,9 +12,10 @@ exports.config = {
   // with relative paths will be prepended with this.
   baseUrl: 'http://localhost:' + (process.env.PORT || '9000'),
 
-  // If true, only chromedriver will be started, not a standalone selenium.
-  // Tests for browsers other than chrome will not run.
-  chromeOnly: true,
+  // Credientials for Saucelabs
+  sauceUser: process.env.SAUCE_USERNAME,
+
+  sauceKey: process.env.SAUCE_ACCESS_KEY,
 
   // list of files / patterns to load in the browser
   specs: [

test/test-file-creation.js

@@ -347,17 +347,15 @@ describe('angular-fullstack generator', function () {
         });
       });
 
-//      it('should run e2e tests successfully', function(done) {
-//        this.timeout(80000);
-//        gen.run({}, function () {
-//          exec('npm run update-webdriver', function (error, stdout, stderr) {
-//            exec('grunt test:e2e', function (error, stdout, stderr) {
-//              expect(stdout, 'Client tests failed \n' + stdout ).to.contain('Done, without errors.');
-//              done();
-//            });
-//          });
-//        })
-//      });
+      it('should run e2e tests successfully', function(done) {
+        this.timeout(80000);
+        gen.run({}, function () {
+          exec('grunt test:e2e', function (error, stdout, stderr) {
+            expect(stdout, 'Client tests failed \n' + stdout).to.contain('0 failures');
+            done();
+          });
+        });
+      });
     });
 
     describe('with other preprocessors and oauth', function() {