Merge pull request #35 from sminnee/fix-sauce-connect

Fix Sauce Connect usage.

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -140,7 +140,16 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             throw WebDriverException::factory($results['status'], $message);
         }
 
-        return array('value' => $value, 'info' => $info);
+        $return = array('value' => $value, 'info' => $info);
+
+        // Pass through the sessionId return value if it exists, failing over to webdriver.remote.sessionid in the val
+        if(isset($results['sessionId'])) {
+            $return['sessionId'] = $results['sessionId'];
+        } else if(isset($value['webdriver.remote.sessionid'])) {
+            $return['sessionId']  = $value['webdriver.remote.sessionid'];
+        }
+
+        return $return;
     }
 
     /**

lib/WebDriver/WebDriver.php

@@ -75,8 +75,8 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
             array(CURLOPT_FOLLOWLOCATION => true)
         );
 
-        if (isset($results['value']['webdriver.remote.sessionid'])) {
-            return new Session($this->url . '/session/' . $results['value']['webdriver.remote.sessionid']);
+        if (isset($results['sessionId'])) {
+            return new Session($this->url . '/session/' . $results['sessionId']);
         }
 
         // backward compatibility fallback