fix #4 use browser sync for e2e and embed phantomjs for protractor

Author: Swiip

app/templates/_package.json

@@ -30,11 +30,12 @@
     "gulp-karma": "0.0.4",
     "karma-jasmine": "^0.1.5",
     "karma-phantomjs-launcher": "^0.1.4",
-    "gulp-protractor": "0.0.7",
-    "protractor": "~0.22.0",
     "require-dir": "~0.1.0",
     "browser-sync": "~0.9.1",
-    "http-proxy": "~1.1.4"
+    "http-proxy": "~1.1.4",
+    "phantomjs": "~1.9.7-8",
+    "protractor": "~0.24.0",
+    "gulp-protractor": "0.0.7"
   },
   "engines": {
     "node": ">=0.10.0"

app/templates/gulp/e2e-tests.js

@@ -4,31 +4,34 @@ var gulp = require('gulp');
 
 var $ = require('gulp-load-plugins')();
 
+var browserSync = require('browser-sync');
+
 // Downloads the selenium webdriver
 gulp.task('webdriver-update', $.protractor.webdriver_update);
 
 gulp.task('webdriver-standalone', $.protractor.webdriver_standalone);
 
-gulp.task('protractor-only', ['webdriver-update', 'wiredep'], function(done) {
+gulp.task('protractor-only', ['webdriver-update', 'wiredep'], function (done) {
   var testFiles = [
     'test/e2e/**/*.js'
-  ]
+  ];
 
   gulp.src(testFiles)
     .pipe($.protractor.protractor({
       configFile: 'test/protractor.conf.js',
     }))
-    .on('error', function(err) {
+    .on('error', function (err) {
       // Make sure failed tests cause gulp to exit non-zero
       throw err;
     })
-    .on('end', function() {
+    .on('end', function () {
       // Close connect server to and gulp connect task
-      gulp.server.close();
+      // Feature ignored because it's not possible to stop browser sync
+      // browserSync.close();
       done();
     });
 });
 
-gulp.task('protractor', ['connect:src', 'protractor-only']);
-gulp.task('protractor:src', ['connect:src', 'protractor-only']);
-gulp.task('protractor:dist', ['connect:dist', 'protractor-only']);
+gulp.task('protractor', ['serve:e2e', 'protractor-only']);
+gulp.task('protractor:src', ['serve:e2e', 'protractor-only']);
+gulp.task('protractor:dist', ['serve:e2e-dist', 'protractor-only']);

app/templates/gulp/server.js

@@ -2,8 +2,6 @@
 
 var gulp = require('gulp');
 
-var $ = require('gulp-load-plugins')();
-
 var browserSync = require('browser-sync');
 var httpProxy = require('http-proxy');
 
@@ -16,24 +14,28 @@ var proxy = httpProxy.createProxyServer({
 });
 
 function proxyMiddleware(req, res, next) {
-  if (req.url.indexOf(proxyApiPrefix) != -1) {
+  if (req.url.indexOf(proxyApiPrefix) !== -1) {
     proxy.web(req, res);
   } else {
     next();
   }
-};
+}
+
+function browserSyncInit(baseDir, files, browser) {
+  browser = browser === undefined ? 'default' : browser;
 
-function browserSyncInit(baseDir, files) {
   browserSync.init(files, {
-    startPath: "/index.html",
+    startPath: '/index.html',
     server: {
       baseDir: baseDir,
       middleware: proxyMiddleware
-    }
+    },
+    browser: browser
   });
+
 }
 
-gulp.task('serve', ['watch'], function() {
+gulp.task('serve', ['watch'], function () {
   browserSyncInit([
     'app',
     '.tmp'
@@ -46,6 +48,14 @@ gulp.task('serve', ['watch'], function() {
   ]);
 });
 
-gulp.task('serve:dist', ['build'], function() {
+gulp.task('serve:dist', ['build'], function () {
   browserSyncInit('dist');
 });
+
+gulp.task('serve:e2e', function () {
+  browserSyncInit(['app', '.tmp'], null, []);
+});
+
+gulp.task('serve:e2e-dist', ['watch'], function () {
+  browserSyncInit('dist', null, []);
+});

app/templates/test/e2e/main.js

@@ -1,12 +1,12 @@
 'use strict';
 
-describe('The main view', function(){
+describe('The main view', function () {
 
-  beforeEach(function() {
-    browser.get('http://localhost:9000');
+  beforeEach(function () {
+    browser.get('http://localhost:3002');
   });
 
-  it('list 3 awesome things', function() {
+  it('list 3 awesome things', function () {
     expect(element.all(by.repeater('awesomeThing in awesomeThings')).count()).toBe(3);
   });
 

app/templates/test/protractor.conf.js

@@ -2,11 +2,17 @@
 exports.config = {
   // The address of a running selenium server.
   // seleniumAddress: 'http://localhost:4444/wd/hub',
-  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.41.0.jar', // Make use you check the version in the folder
+  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.42.0.jar', // Make use you check the version in the folder
 
   // Capabilities to be passed to the webdriver instance.
   capabilities: {
-    'browserName': 'phantomjs'
+    'browserName': 'phantomjs',
+
+    /*
+     * Can be used to specify the phantomjs binary path.
+     * This can generally be ommitted if you installed phantomjs globally.
+     */
+    'phantomjs.binary.path': './node_modules/phantomjs/bin/phantomjs',
   },
 
   // Spec patterns are relative to the current working directly when

test/deps/package.json

@@ -27,14 +27,16 @@
     "gulp-karma": "^0.0.4",
     "karma-jasmine": "^0.1.5",
     "karma-phantomjs-launcher": "^0.1.4",
-    "gulp-protractor": "0.0.7",
-    "protractor": "~0.22.0",
     "require-dir": "~0.1.0",
     "gulp-ng-html2js": "~0.1.6",
     "gulp-minify-html": "~0.1.3",
     "gulp-inject": "~0.4.1",
     "browser-sync": "~0.9.1",
-    "http-proxy": "~1.1.4"
+    "http-proxy": "~1.1.4",
+    "gulp-order": "~1.0.6",
+    "phantomjs": "~1.9.7-8",
+    "protractor": "~0.24.0",
+    "gulp-protractor": "0.0.7"
   },
   "engines": {
     "node": ">=0.10.0"