Commit 936d89cd authored by Rebecca Blundell's avatar Rebecca Blundell Committed by Robert Lyon
Browse files

Bug 1768685: upgrade selenium and chromedriver

I updated these to the latest, also changed the composer.json to >= on
the dependencies so it could update behat

Changed the mahara_behat.sh script to the other way of closing selenium
server from https://reviews.mahara.org/#/c/8006/1

behatnotneeded

Change-Id: I37cf7c13635970e37ce1e628ffeae96c5fe3f206
parent 7749c561
{ {
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"behat/behat": "v3.1.0", "behat/behat": ">=3.1.0",
"behat/mink": "v1.7.1", "behat/mink": ">=1.7.1",
"behat/mink-extension": "v2.2", "behat/mink-extension": ">=2.2",
"behat/mink-goutte-driver": "v1.2.1", "behat/mink-goutte-driver": ">=1.2.1",
"behat/mink-selenium2-driver": "v1.3.1", "behat/mink-selenium2-driver": ">=1.3.1",
"fabpot/goutte": "v3.1.2", "fabpot/goutte": ">=3.1.2",
"guzzlehttp/guzzle": "6.2.1", "guzzlehttp/guzzle": ">=6.2.1",
"phpunit/phpunit": "3.7.38" "phpunit/phpunit": ">=3.7.38"
}, },
"autoload": { "autoload": {
......
...@@ -67,6 +67,7 @@ Scenario: Clicking ID's (Bug 1428456) ...@@ -67,6 +67,7 @@ Scenario: Clicking ID's (Bug 1428456)
# Checking if we can change page layout # Checking if we can change page layout
When I follow "Edit layout" When I follow "Edit layout"
And I scroll to the id "createcustomlayoutpane" And I scroll to the id "createcustomlayoutpane"
And I expand all fieldsets
And I press "Add a row" And I press "Add a row"
And I select "25 - 50 - 25" from "selectcollayoutrow_2" And I select "25 - 50 - 25" from "selectcollayoutrow_2"
And I press "Add a row" And I press "Add a row"
......
...@@ -26,7 +26,11 @@ function is_selenium_running { ...@@ -26,7 +26,11 @@ function is_selenium_running {
function cleanup { function cleanup {
echo "Shutdown Selenium" echo "Shutdown Selenium"
curl -o /dev/null --silent http://localhost:${SELENIUM_PORT}/selenium-server/driver/?cmd=shutDownSeleniumServer # we cant kill it this way anymore as the option has been removed
# curl -o /dev/null --silent http://localhost:${SELENIUM_PORT}/selenium-server/driver/?cmd=shutDownSeleniumServer
# so find the process running on the prot and kill it
lsof -t -i :${SELENIUM_PORT} | xargs kill
if [[ $SERVER ]] if [[ $SERVER ]]
then then
...@@ -98,13 +102,13 @@ then ...@@ -98,13 +102,13 @@ then
else else
echo "Start Selenium..." echo "Start Selenium..."
SELENIUM_VERSION_MAJOR=2.53 SELENIUM_VERSION_MAJOR=3.11
SELENIUM_VERSION_MINOR=1 SELENIUM_VERSION_MINOR=0
SELENIUM_FILENAME=selenium-server-standalone-$SELENIUM_VERSION_MAJOR.$SELENIUM_VERSION_MINOR.jar SELENIUM_FILENAME=selenium-server-standalone-$SELENIUM_VERSION_MAJOR.$SELENIUM_VERSION_MINOR.jar
SELENIUM_PATH=./test/behat/$SELENIUM_FILENAME SELENIUM_PATH=./test/behat/$SELENIUM_FILENAME
# @todo make this more flexible, cross-platform? # @todo make this more flexible, cross-platform?
CHROMEDRIVER_PATH=./test/behat/chromedriver-2.35-linux64 CHROMEDRIVER_PATH=./test/behat/chromedriver-2.38-linux64
# If no Selenium installed, download it # If no Selenium installed, download it
if [ ! -f $SELENIUM_PATH ]; then if [ ! -f $SELENIUM_PATH ]; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment