Merge pull request #3635 from JLLeitschuh/feature/protractorUpdate

Protractor Update

Author: PaulL1

package.json

@@ -56,8 +56,8 @@
     "semver": "~2.2.1",
     "shelljs": "~0.2.6",
     "grunt-contrib-copy": "~0.4.1",
-    "protractor": "~1.5.0",
-    "grunt-protractor-runner": "~1.1.4",
+    "protractor": "~2.1.0",
+    "grunt-protractor-runner": "~2.0.0",
     "grunt-shell-spawn": "~0.3.0",
     "selenium-webdriver": "~2.44.0",
     "grunt-jscs": "^0.7.1",

test/protractor.ci.conf.js

@@ -1,9 +1,9 @@
-// An example configuration file.
+// Protractor config file for Travis CI
 exports.config = {
   // The address of a running selenium server.
 
   //seleniumAddress: 'http://localhost:4444/wd/hub',
-  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.44.0.jar',
+  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
   seleniumPort: 4444,
 
   specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],
@@ -22,7 +22,7 @@ exports.config = {
   // A base URL for your application under test. Calls to protractor.get()
   // with relative paths will be prepended with this.
   // baseUrl: 'http://localhost:9999',
-  
+
   // Spec patterns are relative to the location of the spec file. They may
   // include glob patterns.
   // specs: ['./e2e/**/*.spec.js'],
@@ -34,4 +34,4 @@ exports.config = {
     // Default time to wait in ms before a test fails.
     defaultTimeoutInterval: 60000
   }
-};
+};

test/protractor.conf.js

@@ -1,9 +1,9 @@
-// An example configuration file.
+// Protractor config file for local test running
 exports.config = {
   // The address of a running selenium server.
 
   //seleniumAddress: 'http://localhost:4444/wd/hub',
-  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.44.0.jar',
+  seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
   seleniumPort: 4444,
 
   specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],
@@ -16,7 +16,7 @@ exports.config = {
   // A base URL for your application under test. Calls to protractor.get()
   // with relative paths will be prepended with this.
   // baseUrl: 'http://localhost:9999',
-  
+
   // Spec patterns are relative to the location of the spec file. They may
   // include glob patterns.
   // specs: ['./e2e/**/*.spec.js'],
@@ -28,4 +28,4 @@ exports.config = {
     // Default time to wait in ms before a test fails.
     defaultTimeoutInterval: 60000
   }
-};
+};