Skip to content

Commit ad0670d

Browse files
committed
Protractor Update
Updates protractor version from 1.5.0 to 2.1.0 and the grunt-protractor runner from 1.1.4 to 2.0.0.
1 parent 1adfae4 commit ad0670d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"semver": "~2.2.1",
5757
"shelljs": "~0.2.6",
5858
"grunt-contrib-copy": "~0.4.1",
59-
"protractor": "~1.5.0",
60-
"grunt-protractor-runner": "~1.1.4",
59+
"protractor": "~2.1.0",
60+
"grunt-protractor-runner": "~2.0.0",
6161
"grunt-shell-spawn": "~0.3.0",
6262
"selenium-webdriver": "~2.44.0",
6363
"grunt-jscs": "^0.7.1",

test/protractor.ci.conf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// An example configuration file.
1+
// Protractor config file for Travis CI
22
exports.config = {
33
// The address of a running selenium server.
44

55
//seleniumAddress: 'http://localhost:4444/wd/hub',
6-
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.44.0.jar',
6+
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
77
seleniumPort: 4444,
88

99
specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],
@@ -22,7 +22,7 @@ exports.config = {
2222
// A base URL for your application under test. Calls to protractor.get()
2323
// with relative paths will be prepended with this.
2424
// baseUrl: 'http://localhost:9999',
25-
25+
2626
// Spec patterns are relative to the location of the spec file. They may
2727
// include glob patterns.
2828
// specs: ['./e2e/**/*.spec.js'],
@@ -34,4 +34,4 @@ exports.config = {
3434
// Default time to wait in ms before a test fails.
3535
defaultTimeoutInterval: 60000
3636
}
37-
};
37+
};

test/protractor.conf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// An example configuration file.
1+
// Protractor config file for local test running
22
exports.config = {
33
// The address of a running selenium server.
44

55
//seleniumAddress: 'http://localhost:4444/wd/hub',
6-
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.44.0.jar',
6+
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
77
seleniumPort: 4444,
88

99
specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],
@@ -16,7 +16,7 @@ exports.config = {
1616
// A base URL for your application under test. Calls to protractor.get()
1717
// with relative paths will be prepended with this.
1818
// baseUrl: 'http://localhost:9999',
19-
19+
2020
// Spec patterns are relative to the location of the spec file. They may
2121
// include glob patterns.
2222
// specs: ['./e2e/**/*.spec.js'],
@@ -28,4 +28,4 @@ exports.config = {
2828
// Default time to wait in ms before a test fails.
2929
defaultTimeoutInterval: 60000
3030
}
31-
};
31+
};

0 commit comments

Comments
 (0)