Merge pull request #97 from loezix/master

FIX: broken seleniumServerJar setting

Author: Swiip

app/templates/_package.json

@@ -34,7 +34,7 @@
     "browser-sync": "^1.3.6",
     "http-proxy": "^1.3.0",
     "chalk": "^0.4.0",
-    "protractor": "^1.1.1",
+    "protractor": "^1.4.0",
     "uglify-save-license": "^0.4.1"<%= npmDependencies %>
   },
   "engines": {

app/templates/test/protractor.conf.js

@@ -2,7 +2,7 @@
 exports.config = {
   // The address of a running selenium server.
   //seleniumAddress: 'http://localhost:4444/wd/hub',
-  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.43.1.jar', // Make use you check the version in the folder
+  //seleniumServerJar: deprecated, this should be set on node_modules/protractor/config.json
 
   // Capabilities to be passed to the webdriver instance.
   capabilities: {