Fix test after previous commit

Author: stloyd

test/Github/Tests/ClientTest.php

@@ -3,7 +3,6 @@
 namespace Github\Tests;
 
 use Github\Client;
-use Github\HttpClient\Listener\AuthListener;
 use Github\Exception\InvalidArgumentException;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
@@ -34,10 +33,10 @@ public function shouldPassHttpClientInterfaceToConstructor()
      */
     public function shouldAuthenticateUsingAllGivenParameters($login, $password, $method)
     {
-        $httpClient = $this->getHttpClientMock(array('addListener'));
+        $httpClient = $this->getHttpClientMock(array('authenticate'));
         $httpClient->expects($this->once())
-            ->method('addListener')
-            ->with(new AuthListener($method, array('tokenOrLogin' => $login, 'password' => $password)));
+            ->method('authenticate')
+            ->with($login, $password, $method);
 
         $client = new Client($httpClient);
         $client->authenticate($login, $password, $method);
@@ -59,10 +58,10 @@ public function getAuthenticationFullData()
      */
     public function shouldAuthenticateUsingGivenParameters($token, $method)
     {
-        $httpClient = $this->getHttpClientMock(array('addListener'));
+        $httpClient = $this->getHttpClientMock(array('authenticate'));
         $httpClient->expects($this->once())
-            ->method('addListener')
-            ->with(new AuthListener($method, array('tokenOrLogin' => $token, 'password' => null)));
+            ->method('authenticate')
+            ->with($token, null, $method);
 
         $client = new Client($httpClient);
         $client->authenticate($token, $method);

test/Github/Tests/Functional/CommitTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class CommitTest extends TestCase
 {
     /**

test/Github/Tests/Functional/GistTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class GistTest extends TestCase
 {
     /**

test/Github/Tests/Functional/IssueCommentTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class IssueCommentTest extends TestCase
 {
     /**

test/Github/Tests/Functional/MarkdownTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class MarkdownTest extends TestCase
 {
     /**

test/Github/Tests/Functional/RepoCommentTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class RepoCommentTest extends TestCase
 {
     /**

test/Github/Tests/Functional/RepoTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class RepoTest extends TestCase
 {
     /**

test/Github/Tests/Functional/UserTest.php

@@ -2,6 +2,9 @@
 
 namespace Github\Tests\Functional;
 
+/**
+ * @group functional
+ */
 class UsetTest extends TestCase
 {
     /**

test/Github/Tests/HttpClient/HttpClientTest.php

@@ -2,6 +2,7 @@
 
 namespace Github\Tests\HttpClient;
 
+use Github\Client;
 use Github\HttpClient\HttpClient;
 use Github\HttpClient\Message\Request;
 use Github\HttpClient\Message\Response;
@@ -32,6 +33,29 @@ public function shouldBeAbleToSetOption()
         $this->assertEquals(666, $httpClient->getOption('timeout'));
     }
 
+    /**
+     * @test
+     * @dataProvider getAuthenticationFullData
+     */
+    public function shouldAuthenticateUsingAllGivenParameters($login, $password, $method)
+    {
+        $client = new TestHttpClient();
+        $client->authenticate($login, $password, $method);
+
+        $this->assertCount(2, $client->listeners);
+        $this->assertInstanceOf('Github\HttpClient\Listener\AuthListener', $client->listeners['Github\HttpClient\Listener\AuthListener']);
+    }
+
+    public function getAuthenticationFullData()
+    {
+        return array(
+            array('login', 'password', Client::AUTH_HTTP_PASSWORD),
+            array('token', null, Client::AUTH_HTTP_TOKEN),
+            array('token', null, Client::AUTH_URL_TOKEN),
+            array('client_id', 'client_secret', Client::AUTH_URL_CLIENT_ID),
+        );
+    }
+
     /**
      * @test
      */
@@ -186,15 +210,22 @@ public function shouldThrowExceptionWhenApiIsExceeded()
         $httpClient->get($path, $parameters, $headers);
     }
 
-    protected function getBrowserMock()
+    protected function getBrowserMock(array $methods = array())
     {
-        return $this->getMock('Buzz\Client\ClientInterface', array('setTimeout', 'setVerifyPeer', 'send'));
+        return $this->getMock(
+            'Buzz\Client\ClientInterface',
+            array_merge(
+                array('setTimeout', 'setVerifyPeer', 'send'),
+                $methods
+            )
+        );
     }
 }
 
 class TestHttpClient extends HttpClient
 {
     public $fakeResponse;
+    public $listeners;
 
     public function getOption($name, $default = null)
     {