Merge pull request Element-34#44 from voodoo144/master

adamgoucher · adamgoucher · commit 8d26aec848de · 2013-08-21T17:50:39.000-07:00
changes from https://code.google.com/p/selenium/source/detail?r=8c3c6577...
diff --git a/PHPWebDriver/WebDriver.php b/PHPWebDriver/WebDriver.php
@@ -56,8 +56,8 @@ public function session($browser = 'firefox',
       '/session',
       array('desiredCapabilities' => $desired_capabilities),
       $curl_opts);
-    // var_dump($results);
-    return new PHPWebDriver_WebDriverSession($results['info']['url']);
+      //var_dump($results);
+    return new PHPWebDriver_WebDriverSession($results['info']['url'].$results['sessionId']);
   }
   
   public function sessions($curl_opts = array()) {
diff --git a/PHPWebDriver/WebDriverBase.php b/PHPWebDriver/WebDriverBase.php
@@ -196,9 +196,14 @@ protected function curl($http_method,
       $message = $value['message'];
     }
 
+	$sessionId="";
+	  if (is_array($results) && array_key_exists('sessionId', $results)) {
+		  $sessionId = "/".$results['sessionId'];
+	  }
+
     self::throwException($results['status'], $message, $results);
     
-    return array('value' => $value, 'info' => $info);
+    return array('value' => $value, 'info' => $info, 'sessionId'=>$sessionId);
   }
 
   public function __call($name, $arguments) {

Original file line number	Diff line number	Diff line change
`@@ -196,9 +196,14 @@ protected function curl($http_method,`
`196`	`196`	`$message = $value['message'];`
`197`	`197`	`}`
`198`	`198`
	`199`	`+ $sessionId="";`
	`200`	`+ if (is_array($results) && array_key_exists('sessionId', $results)) {`
	`201`	`+ $sessionId = "/".$results['sessionId'];`
	`202`	`+ }`
	`203`	`+`
`199`	`204`	`self::throwException($results['status'], $message, $results);`
`200`	`205`
`201`		`- return array('value' => $value, 'info' => $info);`
	`206`	`+ return array('value' => $value, 'info' => $info, 'sessionId'=>$sessionId);`
`202`	`207`	`}`
`203`	`208`
`204`	`209`	`public function __call($name, $arguments) {`