Updating for compatibility with Firefox 17.0.1 and Selenium Server 2.25.0.

Author: Daniel Khodaparast

README.md

@@ -1,6 +1,6 @@
 Selenium-Saucelabs (S2) PHP Webdriver
 =====================================
-This allows for the integration of PHP based unit tests with a [Selenium Server][selenium] or remote [Saucelabs][saucelabs] connection.  The unit tests provided are currently compatible with Firefox [9.0][firefox] and Selenium Server [2.18][seleniumServer].
+This allows for the integration of PHP based unit tests with a [Selenium Server][selenium] or remote [Saucelabs][saucelabs] connection.  The unit tests provided are currently compatible with Firefox [17.0.1][firefox] and Selenium Server [2.25][seleniumServer].
 
 Getting Started
 ---------------
@@ -22,7 +22,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 [bronto]:http://www.bronto.com
-[firefox]:ftp://ftp.mozilla.org/pub/firefox/releases/9.0
+[firefox]:ftp://ftp.mozilla.org/pub/firefox/releases/17.0.1/
 [saucelabs]:http://www.saucelabs.com
 [selenium]:http://www.seleniumhq.org
-[seleniumServer]:http://selenium.googlecode.com/files/selenium-server-standalone-2.18.0.jar
+[seleniumServer]:http://selenium.googlecode.com/files/selenium-server-standalone-2.25.0.jar

Test/Base.php

@@ -29,7 +29,7 @@ class Test_Base extends PHPUnit_Framework_TestCase {
 		$sessionSetup = array(
 			// default browser to use when all else fails
 			'browser'		=> 'firefox',
-			'version'		=> '9.0',
+			'version'		=> '17.0.1',
 
 			// default os/platform (ANY, XP, VISTA, or LINUX)
 			'platform'		=> 'ANY',
@@ -62,7 +62,7 @@ public function setUp() {
 				$capabilities = array(
 					'name'				=> $this->getJobName(),
 					'platform'			=> $setup['platform'],
-					'selenium-version'	=> '2.18.0',
+					'selenium-version'	=> '2.25.0',
 				);
 
 				$setup['host'] = $setup['sauce']['user'] . ':' . $setup['sauce']['key'] . '@ondemand.saucelabs.com';
@@ -73,7 +73,7 @@ public function setUp() {
 			$this->session = new WebDriver_Session($setup['host'], $setup['port']);
 			$this->session->setBrowser($setup['browser'], $setup['version']);
 
-			if (!is_null($capabilities)) {
+			if (isset($capabilities)) {
 				foreach ($capabilities as $capability => $value) {
 					$this->session->setCapability($capability, $value);
 				}

Test/ElementTest.php

@@ -74,7 +74,7 @@ public function testCss() {
 		$this->assertEquals('48px', $elementImage->css('width'));
 
 		$elementDiv = $this->session->element('id', 'testContent');
-		$this->assertEquals('rgb(206, 206, 206)', $elementDiv->css('background-color'));
+		$this->assertEquals('rgba(206, 206, 206, 1)', $elementDiv->css('background-color'));
 		$this->assertEquals('left', $elementDiv->css('text-align'));
 	}
 

Test/SessionTest.php

@@ -74,9 +74,12 @@ public function testAlertText() {
 	public function testBack() {
 		$elementLink = $this->session->element('link text', 'Sauce Labs');
 		$elementLink->click();
+		sleep(3);
 
-		$this->assertEquals('http://saucelabs.com/', $this->session->url());
+		$this->assertEquals('https://saucelabs.com/', $this->session->url());
 		$this->session->back();
+		sleep(3);
+
 		$this->assertEquals($this->testWebDriver, $this->session->url());
 	}
 
@@ -207,12 +210,17 @@ public function testDoubleclick() {
 	public function testForward() {
 		$elementLink = $this->session->element('link text', 'Sauce Labs');
 		$elementLink->click();
+		sleep(3);
 
-		$this->assertEquals('http://saucelabs.com/', $this->session->url());
+		$this->assertEquals('https://saucelabs.com/', $this->session->url());
 		$this->session->back();
+		sleep(3);
+
 		$this->assertEquals($this->testWebDriver, $this->session->url());
 		$this->session->forward();
-		$this->assertEquals('http://saucelabs.com/', $this->session->url());
+		sleep(3);
+
+		$this->assertEquals('https://saucelabs.com/', $this->session->url());
 	}
 
 
@@ -283,6 +291,8 @@ public function testWindow() {
 		$this->assertEquals(2, count($windows));
 
 		$this->session->window($windows[1]);
+		sleep(5);
+
 		$this->assertEquals('http://www.google.com/', $this->session->url());
 		$this->session->window();
 

testWebDriver.html

@@ -134,7 +134,7 @@ <h3><a onclick="doSelenium(); doEvent(event);" href="javascript:void(0);">Seleni
 		<p class="header">Example Links</p>
 		<ul>
 			<li><a href="http://seleniumhq.org">Selenium HQ</a></li>
-			<li><a href="http://saucelabs.com">Sauce Labs</a></li>
+			<li><a href="https://saucelabs.com">Sauce Labs</a></li>
 			<li><a href="http://google.com" target="_blank">Google</a></li>
 		</ul>
 
@@ -188,4 +188,4 @@ <h3><a onclick="doSelenium(); doEvent(event);" href="javascript:void(0);">Seleni
 
 		<div id="testHidden"></div>
 	</body>
-</html>
+</html>