Skip to content

Protractor Update #3635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2015
Merged

Protractor Update #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions test/protractor.ci.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'],
Expand All @@ -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'],
Expand All @@ -34,4 +34,4 @@ exports.config = {
// Default time to wait in ms before a test fails.
defaultTimeoutInterval: 60000
}
};
};
8 changes: 4 additions & 4 deletions test/protractor.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'],
Expand All @@ -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'],
Expand All @@ -28,4 +28,4 @@ exports.config = {
// Default time to wait in ms before a test fails.
defaultTimeoutInterval: 60000
}
};
};