diff --git a/.jshintrc b/.jshintrc index dbd2b69..3003f08 100644 --- a/.jshintrc +++ b/.jshintrc @@ -16,6 +16,11 @@ "trailing": true, "smarttabs": true, "globals": { - "angular": false + "angular": false, + "describe": false, + "protractor": false, + "it": false, + "beforeEach": false, + "expect": false } } diff --git a/test/protractor.conf.js b/test/protractor.conf.js index e955d5a..e8f7f84 100644 --- a/test/protractor.conf.js +++ b/test/protractor.conf.js @@ -11,7 +11,7 @@ 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, @@ -19,7 +19,7 @@ exports.config = { // 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'],