Updated setup-protractor script and e2e conf to work on linux and mac correctly

Author: pilsy

package.json

@@ -6,7 +6,7 @@
     "email": "admin@cleverstack.io",
     "web": "http://cleverstack.io"
   },
-  "version": "1.1.0",
+  "version": "1.1.1",
   "collaborators": [
     "Richard Gustin <richard@clevertech.biz>",
     "Simon W. Jackson <simon@clevertech.biz>",

scripts/setup-protractor.js

@@ -1,24 +1,24 @@
-var async_exec = require('child_process').exec
+var async_exec = require( 'child_process' ).exec
 
-async_exec('npm install shelljs', function (err, stdout, stderr) {
-  require('shelljs/global');
+async_exec( 'npm install shelljs', function( err, stdout, stderr ) {
+  require( 'shelljs/global' );
 
   //detect OS
-  var os = require('os')
-    , isWin = /^win32/.test(os.platform())
-    , isLinux = /^linux/.test(os.platform())
-    , isMac = /^darwin/.test(os.platform()) || /^freebsd/.test(os.platform());
+  var os = require( 'os' )
+    , isWin = /^win32/.test( os.platform() )
+    , isLinux = /^linux/.test( os.platform() )
+    , isMac = /^darwin/.test( os.platform() ) || /^freebsd/.test( os.platform() );
 
-  echo('About to setup protractor and dependencies.');
-  echo('It works if it finishes with OK');
+  echo( 'About to setup protractor and dependencies.' );
+  echo( 'It works if it finishes with OK' );
 
   //Selenium Standalone Server - required for protractor e2e testing
   //Note: Protractor comes with a script to help download and install the standalone server. Run 'webdriver-manager-update': https://github.com/angular/protractor/blob/master/docs/getting-started.md
   //https://code.google.com/p/selenium/downloads/list
   //Size: ~33mb
-  echo('Downloading specific Selenium Server jar...');
-  exec('wget http://selenium.googlecode.com/files/selenium-server-standalone-2.39.0.jar');
-  exec('mv selenium-server-standalone-2.39.0.jar scripts/selenium-server-standalone-2.39.0.jar');
+  echo( 'Downloading specific Selenium Server jar...' );
+  exec( 'wget http://selenium.googlecode.com/files/selenium-server-standalone-2.39.0.jar' );
+  exec( 'mv selenium-server-standalone-2.39.0.jar scripts/selenium-server-standalone-2.39.0.jar' );
 
   //Chrome driver required to run Chrome on Selenium Server
   //Note: download file is based on OS (CLI to handle which one to download)
@@ -32,37 +32,42 @@ async_exec('npm install shelljs', function (err, stdout, stderr) {
   } else if (isMac) {
     chromedriverLink = 'chromedriver_mac32.zip';
   }
-  echo('Downloading OS specific Chromedriver...');
-  exec('wget http://chromedriver.storage.googleapis.com/2.8/'+chromedriverLink);
-  exec('unzip '+chromedriverLink);
-  exec('mv Chromedriver.exe scripts/Chromedriver.exe');
-  exec('rm '+chromedriverLink);
+  echo( 'Downloading OS specific Chromedriver...' );
+  exec( 'wget http://chromedriver.storage.googleapis.com/2.8/' + chromedriverLink);
+  exec( 'unzip ' + chromedriverLink );
+
+  if ( isWin ) {
+    exec( 'mv Chromedriver.exe scripts/Chromedriver.exe' );
+  } else {
+    exec( 'mv Chromedriver scripts/Chromedriver' );
+  }
+  exec( 'rm ' + chromedriverLink );
 
   //PhantomJS driver required to run on Selenium Server
   //Note: download file is based on OS (CLI to handle which one to download)
   //http://phantomjs.org/download.html
   //Size: ~7mb
   var phantomjsLink, linkExt;
-  if (isWin) {
+  if ( isWin ) {
     phantomjsLink = 'phantomjs-1.9.2-windows';
     linkExt = '.zip';
-  } else if (isLinux) {
+  } else if ( isLinux ) {
     phantomjsLink = 'phantomjs-1.9.2-linux-i686';
     linkExt = '.tar.bz2';
-  } else if (isMac) {
+  } else if ( isMac ) {
     phantomjsLink = 'phantomjs-1.9.2-macosx';
     linkExt = '.zip';
   }
-  echo('Downloading OS specific Phantomjs...');
-  exec('wget http://phantomjs.googlecode.com/files/'+phantomjsLink+linkExt);
+  echo( 'Downloading OS specific Phantomjs...' );
+  exec( 'wget http://phantomjs.googlecode.com/files/' + phantomjsLink + linkExt );
   if (isLinux) {
-    exec('tar -xjvf '+phantomjsLink+linkExt);
+    exec( 'tar -xjvf ' + phantomjsLink + linkExt );
   } else {
-    exec('unzip '+phantomjsLink+linkExt);
+    exec( 'unzip ' + phantomjsLink + linkExt );
   }
-  exec('mv '+phantomjsLink+'/phantomjs.exe scripts/phantomjs.exe');
-  exec('rm '+phantomjsLink+linkExt);
-  exec('rm -rf '+phantomjsLink);
+  exec( 'mv ' + phantomjsLink + '/phantomjs.exe scripts/phantomjs.exe' );
+  exec( 'rm ' + phantomjsLink + linkExt);
+  exec( 'rm -rf ' + phantomjsLink );
 
-  echo('OK!');
+  echo( 'OK!' );
 });

test-e2e.conf.js

@@ -1,3 +1,6 @@
+var os = require( 'os' )
+  , isWin = /^win32/.test( os.platform() );
+
 // A reference configuration file.
 exports.config = {
   // ----- How to setup Selenium -----
@@ -22,7 +25,7 @@ exports.config = {
   // find chromedriver. This will be passed to the selenium jar as
   // the system property webdriver.chrome.driver. If null, selenium will
   // attempt to find chromedriver using PATH.
-  chromeDriver: './scripts/Chromedriver.exe',
+  chromeDriver: isWin ? './scripts/Chromedriver.exe' : './scripts/Chromedriver',
   // Additional command line options to pass to selenium. For example,
   // if you need to change the browser timeout, use
   // seleniumArgs: ['-browserTimeout=60'],