Skip to content

Commit

Permalink
Merge branch 'new-jar'
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Cook committed Jun 27, 2014
2 parents 76a9fa8 + 437639e commit 258b115
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/grunt-selenium-webdriver.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/scopes/scope_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed jar/selenium-server-standalone-2.39.0.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grunt-selenium-webdriver",
"description": "Starts and stops selenium in webdriver or hub mode for use with 3rd party CI platforms where phantomjs / chromedriver can have issue with selenium",
"version": "0.2.42",
"version": "0.2.420",
"homepage": "https://github.com/connectid/grunt-selenium-webdriver",
"contibutors": [
{
Expand Down
1 change: 0 additions & 1 deletion tasks/selenium_webdriver.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if (fs.existsSync('jar')) {
selOptions.push ( 'node_modules/grunt-selenium-webdriver/jar/selenium-server-standalone-2.42.2.jar' );
phantomLoc += "/../../phantomjs/bin";
}
console.log (selOptions , phantomLoc ,__dirname);
/*
* starts phantom, called after grid has been established
* @private
Expand Down

0 comments on commit 258b115

Please sign in to comment.