Merge "Bug 1768685: upgrade selenium and chromedriver" into 17.04_STABLE

external/composer.json

 {
     "require": {
         "php": ">=5.3.3",
-        "behat/behat": "v3.1.0",
-        "behat/mink": "v1.7.1",
+        "behat/behat": ">=3.1.0",
+        "behat/mink": ">=1.7.1",
 
-        "behat/mink-extension": "v2.2",
+        "behat/mink-extension": ">=2.2",
 
-        "behat/mink-goutte-driver": "v1.2.1",
-        "behat/mink-selenium2-driver": "v1.3.1",
-        "fabpot/goutte": "v3.1.2",
-        "guzzlehttp/guzzle": "6.2.1",
+        "behat/mink-goutte-driver": ">=1.2.1",
+        "behat/mink-selenium2-driver": ">=1.3.1",
+        "fabpot/goutte": ">=3.1.2",
+        "guzzlehttp/guzzle": ">=6.2.1",
 
-        "phpunit/phpunit": "3.7.38"
+        "phpunit/phpunit": ">=3.7.38"
     },
 
     "autoload": {

test/behat/mahara_behat.sh

@@ -26,7 +26,11 @@ function is_selenium_running {
 
 function cleanup {
     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 ]]
     then
@@ -98,13 +102,13 @@ then
     else
         echo "Start Selenium..."
 
-        SELENIUM_VERSION_MAJOR=2.53
-        SELENIUM_VERSION_MINOR=1
+        SELENIUM_VERSION_MAJOR=3.11
+        SELENIUM_VERSION_MINOR=0
 
         SELENIUM_FILENAME=selenium-server-standalone-$SELENIUM_VERSION_MAJOR.$SELENIUM_VERSION_MINOR.jar
         SELENIUM_PATH=./test/behat/$SELENIUM_FILENAME
         # @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 [ ! -f $SELENIUM_PATH ]; then