flip my patch

robocoder · robocoder · commit 10dcea308e5c · 2013-08-08T09:56:39.000-04:00
diff --git a/lib/WebDriver/WebDriver.php b/lib/WebDriver/WebDriver.php
@@ -75,12 +75,12 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
             array(CURLOPT_FOLLOWLOCATION => true)
         );
 
-        // for backwards-compatibility (Selenium 2.33 and below)
-        if (isset($results['info']['url'])) {
-            return new Session($results['info']['url']);
+        if (isset($results['value']['webdriver.remote.sessionid'])) {
+            return new Session($this->url . '/session/' . $results['value']['webdriver.remote.sessionid']);
         }
 
-        return new Session($this->url . '/session/' . $results['value']['webdriver.remote.sessionid']);
+        // backward compatibility fallback
+        return new Session($results['info']['url']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi`
`75`	`75`	`array(CURLOPT_FOLLOWLOCATION => true)`
`76`	`76`	`);`
`77`	`77`
`78`		`- // for backwards-compatibility (Selenium 2.33 and below)`
`79`		`- if (isset($results['info']['url'])) {`
`80`		`- return new Session($results['info']['url']);`
	`78`	`+ if (isset($results['value']['webdriver.remote.sessionid'])) {`
	`79`	`+ return new Session($this->url . '/session/' . $results['value']['webdriver.remote.sessionid']);`
`81`	`80`	`}`
`82`	`81`
`83`		`- return new Session($this->url . '/session/' . $results['value']['webdriver.remote.sessionid']);`
	`82`	`+ // backward compatibility fallback`
	`83`	`+ return new Session($results['info']['url']);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`