Skip to content

Commit

Permalink
Update selenium to latest
Browse files Browse the repository at this point in the history
Also stop using selenium-standalone
  • Loading branch information
jparyani committed Jan 29, 2016
1 parent 9e4a519 commit c19c93a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion tests/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
reports
reports
selenium-server-standalone-*
4 changes: 1 addition & 3 deletions tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"description": "Tests for the sandstorm platform",
"version": "0.0.1",
"devDependencies": {
"nightwatch": "0.8.6",
"phantomjs": "~1.9.10",
"selenium-standalone": "4.2.2"
"nightwatch": "0.8.15"
},
"repository": {
"type": "git",
Expand Down
6 changes: 4 additions & 2 deletions tests/run-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ THIS_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
METEOR_DEV_BUNDLE=$("$THIS_DIR/../find-meteor-dev-bundle.sh")
NODEJS="$METEOR_DEV_BUNDLE/bin/node"
NPM="$METEOR_DEV_BUNDLE/bin/npm"
SELENIUM_JAR="selenium-server-standalone-2.50.0.jar"

cleanExit () {
rc=$1
Expand All @@ -41,7 +42,7 @@ cleanExit () {
# Send SIGINT to the selenium-server child of the backgrounded xvfb-run, so
# it will exit cleanly and the Xvfb process will also be cleaned up.
# We don't actually know that PID, so we find it with pgrep.
kill -SIGINT $(pgrep --parent $XVFB_PID node)
kill $(pgrep --parent $XVFB_PID java)
wait $XVFB_PID
fi
exit $rc
Expand Down Expand Up @@ -93,7 +94,8 @@ if [ "$RUN_SELENIUM" != "false" ] ; then
checkInstalled java default-jre-headless
checkInstalled xvfb-run Xvfb
checkInstalled pgrep procps
xvfb-run ./node_modules/selenium-standalone/bin/selenium-standalone start &
test -e ./$SELENIUM_JAR || curl -o $SELENIUM_JAR "http://selenium-release.storage.googleapis.com/2.50/$SELENIUM_JAR"
xvfb-run --server-args="-screen 0, 1280x1024x24" java -jar ./$SELENIUM_JAR &
XVFB_PID=$!
fi

Expand Down

0 comments on commit c19c93a

Please sign in to comment.