Skip to content
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.

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

Update protractor.conf.js so that "grunt test" works #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
"trailing": true,
"smarttabs": true,
"globals": {
"angular": false
"angular": false,
"describe": false,
"protractor": false,
"it": false,
"beforeEach": false,
"expect": false
}
}
4 changes: 2 additions & 2 deletions test/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ exports.config = {
// 3. sauceUser/sauceKey - to use remote Selenium servers via SauceLabs.

// The location of the selenium standalone server .jar file.
seleniumServerJar: './selenium/selenium-server-standalone-2.37.0.jar',
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.39.0.jar',
// The port to start the selenium server on, or null if the server should
// find its own unused port.
seleniumPort: null,
// Chromedriver location is used to help the selenium standalone server
// 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: './selenium/chromedriver',
chromeDriver: '../node_modules/protractor/selenium/chromedriver',
// Additional command line options to pass to selenium. For example,
// if you need to change the browser timeout, use
// seleniumArgs: ['-browserTimeout=60'],
Expand Down