userName and userId were mixed up

Fabrizio Branca · Fabrizio Branca · commit 5ce678a542a3 · 2012-11-29T14:38:18.000-08:00
diff --git a/lib/WebDriver/SauceLabs/SauceRest.php b/lib/WebDriver/SauceLabs/SauceRest.php
@@ -33,7 +33,7 @@ class SauceRest
     /**
      * @var string
      */
-    private $userName;
+    private $userId;
 
     /**
      * @var string
@@ -48,7 +48,7 @@ class SauceRest
      */
     public function __construct($userName, $accessKey)
     {
-        $this->userName = $userName;
+        $this->userId = $userName;
         $this->accessKey = $accessKey;
     }
 
@@ -67,7 +67,7 @@ protected function execute($requestMethod, $url, $parameters = null)
     {
         $extraOptions = array(
             CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-            CURLOPT_USERPWD => $this->userName . ':' . $this->accessKey,
+            CURLOPT_USERPWD => $this->userId . ':' . $this->accessKey,
         );
 
         $url = 'https://saucelabs.com/rest/v1/' . $url;
@@ -110,7 +110,7 @@ public function getAccountLimits()
      */
     public function createSubAccount($accountInfo)
     {
-        return $this->execute('POST', 'users/' . $this->userName, $accountInfo);
+        return $this->execute('POST', 'users/' . $this->userId, $accountInfo);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SauceRest`
`33`	`33`	`/**`
`34`	`34`	`* @var string`
`35`	`35`	`*/`
`36`		`- private $userName;`
	`36`	`+ private $userId;`
`37`	`37`
`38`	`38`	`/**`
`39`	`39`	`* @var string`
`@@ -48,7 +48,7 @@ class SauceRest`
`48`	`48`	`*/`
`49`	`49`	`public function __construct($userName, $accessKey)`
`50`	`50`	`{`
`51`		`- $this->userName = $userName;`
	`51`	`+ $this->userId = $userName;`
`52`	`52`	`$this->accessKey = $accessKey;`
`53`	`53`	`}`
`54`	`54`
`@@ -67,7 +67,7 @@ protected function execute($requestMethod, $url, $parameters = null)`
`67`	`67`	`{`
`68`	`68`	`$extraOptions = array(`
`69`	`69`	`CURLOPT_HTTPAUTH => CURLAUTH_BASIC,`
`70`		`- CURLOPT_USERPWD => $this->userName . ':' . $this->accessKey,`
	`70`	`+ CURLOPT_USERPWD => $this->userId . ':' . $this->accessKey,`
`71`	`71`	`);`
`72`	`72`
`73`	`73`	`$url = 'https://saucelabs.com/rest/v1/' . $url;`
`@@ -110,7 +110,7 @@ public function getAccountLimits()`
`110`	`110`	`*/`
`111`	`111`	`public function createSubAccount($accountInfo)`
`112`	`112`	`{`
`113`		`- return $this->execute('POST', 'users/' . $this->userName, $accountInfo);`
	`113`	`+ return $this->execute('POST', 'users/' . $this->userId, $accountInfo);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/**`