fix to deprecated method + more tests

Kong · Feb 5, 2015 · d5a7ad4 · d5a7ad4
1 parent 8af870f
commit d5a7ad4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Unirest/Request.php b/src/Unirest/Request.php
@@ -345,7 +345,7 @@ public static function send($method, $url, $body = null, $headers = array(), $us
         // supporting deprecated http auth method
         if (!empty($username)) {
             curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-            curl_setopt($ch, CURLOPT_USERPWD, self::$auth['user'] . ':' . self::$auth['pass']);
+            curl_setopt($ch, CURLOPT_USERPWD, $username . ':' . $password);
         }
 
         if (!empty(self::$auth['user'])) {

diff --git a/tests/Unirest/RequestTest.php b/tests/Unirest/RequestTest.php
@@ -71,13 +71,21 @@ public function testGzip()
         $this->assertEquals(true, $args->gzipped);
     }
 
-    public function testBasicAuthentication()
+    public function testBasicAuthenticationDeprecated()
     {
         $response = Unirest\Request::get('http://httpbin.org/get', array(), array(), 'user', 'password');
         $headers  = $response->body->headers;
         $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $headers->Authorization);
     }
 
+    public function testBasicAuthentication()
+    {
+        Unirest\Request::auth('user', 'password');
+        $response = Unirest\Request::get('http://httpbin.org/get');
+
+        $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $response->body->headers->Authorization);
+    }
+
     public function testCustomHeaders()
     {
         $response = Unirest\Request::get('http://httpbin.org/get', array(