Fix CachedHttpKernel tests, fix events

Author: cursedcoder

lib/Github/HttpClient/CachedHttpClient.php

@@ -61,11 +61,11 @@ public function request($path, array $parameters = array(), $httpMethod = 'GET',
      *
      * {@inheritdoc}
      */
-    protected function createRequest($httpMethod, $url)
+    protected function createRequest($httpMethod, $path, $requestBody, array $headers = array())
     {
-        $request = parent::createRequest($httpMethod, $url);
+        $request = parent::createRequest($httpMethod, $path, $requestBody, $headers = array());
 
-        if ($modifiedAt = $this->getCache()->getModifiedSince($url)) {
+        if ($modifiedAt = $this->getCache()->getModifiedSince($path)) {
             $modifiedAt = new \DateTime('@'.$modifiedAt);
             $modifiedAt->setTimezone(new \DateTimeZone('GMT'));
 

lib/Github/HttpClient/HttpClient.php

@@ -131,13 +131,11 @@ public function request($path, array $parameters = array(), $httpMethod = 'GET',
             ? null : json_encode($parameters, empty($parameters) ? JSON_FORCE_OBJECT : 0)
         ;
 
-        $request = $this->client->createRequest($httpMethod, $path, array_merge($this->headers, $headers), $requestBody);
+        $request = $this->createRequest($httpMethod, $path, $requestBody, $headers);
         $request->addHeaders($headers);
 
         try {
-            $response = Response::fromMessage(
-                $this->client->send($request)
-            );
+            $response = $this->createResponse($this->client->send($request));
         } catch (\LogicException $e) {
             throw new ErrorException($e->getMessage());
         } catch (\RuntimeException $e) {
@@ -175,4 +173,14 @@ public function getLastResponse()
     {
         return $this->lastResponse;
     }
+
+    protected function createRequest($httpMethod, $path, $requestBody, array $headers = array())
+    {
+        return $this->client->createRequest($httpMethod, $path, array_merge($this->headers, $headers), $requestBody);
+    }
+
+    protected function createResponse($response)
+    {
+        return Response::fromMessage($response);
+    }
 }

test/Github/Tests/HttpClient/CachedHttpClientTest.php

@@ -8,39 +8,30 @@
 class CachedHttpClientTest extends HttpClientTest
 {
     /**
-     * test
+     * @test
      */
     public function shouldCacheResponseAtFirstTime()
     {
         $cache = $this->getCacheMock();
+        $response = new Response(200);
 
-        $httpClient = new TestCachedHttpClient(
-            array('base_url' => ''),
-            $this->getMock('Guzzle\Http\ClientInterface', array('send'))
-        );
+        $httpClient = $this->getHttpClientMock($response);
         $httpClient->setCache($cache);
 
-        $cache->expects($this->once())->method('set')->with('test', new Response(200));
+        $cache->expects($this->once())->method('set')->with('test', $response);
 
         $httpClient->get('test');
     }
 
     /**
-     * test
+     * @test
      */
     public function shouldGetCachedResponseWhileResourceNotModified()
     {
-        $client = $this->getMock('Guzzle\Http\ClientInterface', array('send'));
-        $client->expects($this->once())->method('send');
-
         $cache = $this->getCacheMock();
-
         $response = new Response(304);
 
-        $httpClient = new TestCachedHttpClient(
-            array('base_url' => ''),
-            $client
-        );
+        $httpClient = $this->getHttpClientMock($response);
         $httpClient->setCache($cache);
         $httpClient->fakeResponse = $response;
 
@@ -50,23 +41,15 @@ public function shouldGetCachedResponseWhileResourceNotModified()
     }
 
     /**
-     * test
+     * @test
      */
     public function shouldRenewCacheWhenResourceHasChanged()
     {
-        $client = $this->getMock('Guzzle\Http\ClientInterface', array('send'));
-        $client->expects($this->once())->method('send');
-
         $cache = $this->getCacheMock();
-
         $response = new Response(200);
 
-        $httpClient = new TestCachedHttpClient(
-            array('base_url' => ''),
-            $client
-        );
+        $httpClient = $this->getHttpClientMock($response);
         $httpClient->setCache($cache);
-        $httpClient->fakeResponse = $response;
 
         $cache->expects($this->once())->method('set')->with('test', $response);
         $cache->expects($this->once())->method('getModifiedSince')->with('test')->will($this->returnValue(1256953732));
@@ -78,14 +61,19 @@ public function getCacheMock()
     {
         return $this->getMock('Github\HttpClient\Cache\CacheInterface');
     }
-}
-
-class TestCachedHttpClient extends CachedHttpClient
-{
-    public $fakeResponse;
 
-    protected function createResponse()
+    private function getHttpClientMock($response)
     {
-        return $this->fakeResponse ?: new Response(200);
+        $mock = $this
+            ->getMockBuilder('Github\HttpClient\CachedHttpClient')
+            ->setConstructorArgs(array(array('base_url' => ''), $this->getBrowserMock()))
+            ->setMethods(array('createResponse'))
+            ->getMock();
+
+        $mock->expects($this->any())
+            ->method('createResponse')
+            ->will($this->returnValue($response));
+
+        return $mock;
     }
 }

test/Github/Tests/HttpClient/HttpClientTest.php

@@ -41,15 +41,17 @@ public function shouldBeAbleToSetOption()
     public function shouldAuthenticateUsingAllGivenParameters($login, $password, $method)
     {
         $client = new GuzzleClient();
+        $listeners = $client->getEventDispatcher()->getListeners('request.before_send');
+        $this->assertCount(1, $listeners);
 
         $httpClient = new TestHttpClient(array(), $client);
         $httpClient->authenticate($login, $password, $method);
 
-        $this->assertCount(1, $client->getEventDispatcher()->getListeners('request.create'));
-        $this->assertInstanceOf(
-            'Github\HttpClient\Listener\AuthListener',
-            current(current($client->getEventDispatcher()->getListeners('request.create')))
-        );
+        $listeners = $client->getEventDispatcher()->getListeners('request.before_send');
+        $this->assertCount(2, $listeners);
+
+        $authListener = $listeners[1][0];
+        $this->assertInstanceOf('Github\HttpClient\Listener\AuthListener', $authListener);
     }
 
     public function getAuthenticationFullData()
@@ -88,8 +90,8 @@ public function shouldDoPOSTRequest()
 
         $client = $this->getBrowserMock();
         $client->expects($this->once())
-            ->method('send')
-            ->with($this->anything(), $this->isType('array'), '{"a":"b"}');
+            ->method('createRequest')
+            ->with('POST', $path, $this->isType('array'), '{"a":"b"}');
 
         $httpClient = new HttpClient(array(), $client);
         $httpClient->post($path, $parameters, $headers);
@@ -103,10 +105,9 @@ public function shouldDoPOSTRequestWithoutContent()
         $path       = '/some/path';
 
         $client = $this->getBrowserMock();
-
         $client->expects($this->once())
-            ->method('send')
-            ->with($this->anything(), $this->isType('array'), $this->isEmpty());
+            ->method('createRequest')
+            ->with('POST', $path, $this->isType('array'));
 
         $httpClient = new HttpClient(array(), $client);
         $httpClient->post($path);
@@ -242,13 +243,19 @@ public function shouldThrowExceptionWhenApiIsExceeded()
 
     protected function getBrowserMock(array $methods = array())
     {
-        return $this->getMock(
+        $mock = $this->getMock(
             'Guzzle\Http\Client',
             array_merge(
-                array('send'),
+                array('send', 'createRequest'),
                 $methods
             )
         );
+
+        $mock->expects($this->any())
+            ->method('createRequest')
+            ->will($this->returnValue($this->getMock('Guzzle\Http\Message\Request', array(), array('GET', 'some'))));
+
+        return $mock;
     }
 }
 
@@ -261,7 +268,7 @@ public function getOption($name, $default = null)
 
     public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
     {
-        $request = $this->createRequest($httpMethod, $path);
+        $request = $this->client->createRequest($httpMethod, $path);
 
         return $this->client->send($request, $headers, $parameters);
     }