Skip to content

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

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

Open
renanmartins wants to merge 4 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c42accb
Update protractor.conf.js so that "grunt test" works
renanmartins Dec 22, 2013
2bd2a4c
Updates .jshitrc so that jshint ignores global functions and object u…
renanmartins Dec 23, 2013
67419fe
Missed comma (,) in my last commit that changed .jshintrc
renanmartins Dec 23, 2013
7275fde
Extra comma (,) in my last commit that changed .jshintrc
renanmartins Dec 23, 2013
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
7 changes: 6 additions & 1 deletion .jshintrc
View file
Open in desktop
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
View file
Open in desktop
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