Merge pull request giorgiosironi#392 from paulbriton/2.x

Various updates

Author: giorgiosironi

.ci/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sudo apt-get update
-
 if [ ! -f "/usr/local/bin/composer" ]; then
     echo "Installing Composer"
     php -r "readfile('https://getcomposer.org/installer');" | sudo php -d apc.enable_cli=0 -- --install-dir=/usr/local/bin --filename=composer
@@ -23,6 +21,12 @@ sudo sed -i "s/^autostart=.*python-webserver$/autostart=true/" /etc/supervisor/c
 echo "Installing Firefox"
 sudo apt-get install firefox -y --no-install-recommends
 
+echo "Installing Java 8"
+sudo apt-add-repository ppa:openjdk-r/ppa -y
+sudo apt-get update
+sudo apt-get install openjdk-8-jre-headless -y --no-install-recommends
+sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+
 if [ ! -f "$SELENIUM_JAR" ]; then
     echo "Downloading Selenium"
     sudo mkdir -p $(dirname "$SELENIUM_JAR")

.ci/vagrant_pre_setup.sh

@@ -11,11 +11,10 @@ apt-get update
 apt-get install software-properties-common -y
 apt-get install python-software-properties -y
 
-apt-add-repository ppa:ondrej/php5-5.6 -y
-apt-add-repository ppa:openjdk-r/ppa -y
+apt-add-repository ppa:ondrej/php -y
 
 apt-get update
 
 # installing xvfb, java and php
-apt-get install xvfb openjdk-8-jre-headless php5-cli php5-curl php5-xdebug ncurses-term unzip xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic vim -y --no-install-recommends
+apt-get install xvfb php5.6-cli php5.6-curl php5.6-xml php-xdebug ncurses-term unzip xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic vim -y --no-install-recommends
 

PHPUnit/Extensions/Selenium2TestCase.php

@@ -507,4 +507,17 @@ public function setUpPage()
     {
 
     }
+
+    /**
+     * Check whether an alert box is present
+     */
+    public function alertIsPresent()
+    {
+        try {
+            $this->alertText();
+            return TRUE;
+        } catch (Exception $e) {
+            return NULL;
+        }
+    }
 }

README.md

@@ -1,3 +1,5 @@
+PHPUNIT-Selenium [![Build Status](https://api.travis-ci.org/giorgiosironi/phpunit-selenium.svg?branch=2.x)](https://travis-ci.org/giorgiosironi/phpunit-selenium/branches)
+-
 This package contains a Selenium2TestCase class that can be used to run end-to-end tests against Selenium 2.
 
 Installing