PLAT-3846 fix Critic client (#25)

Author: Grzegorz Rajchman

src/Talis/Critic/Client.php

@@ -148,7 +148,7 @@ protected function getHeaders($clientId, $clientSecret, array $params = [])
         );
 
         return [
-            'Content-Type' => 'application/json',
+            'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8',
             'Authorization' => "Bearer {$token['access_token']}",
         ];
     }

test/unit/Critic/ClientTest.php

@@ -8,25 +8,11 @@
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
     private $criticBaseUrl;
-    private $criticClient;
-    private $personaConfig;
     private $postFields;
-    private $cacheDriver;
 
     protected function setUp()
     {
         $this->criticBaseUrl = 'http://listreviews.talis.com/test/reviews';
-        $this->criticClient = new \Talis\Critic\Client($this->criticBaseUrl);
-
-        $this->cacheDriver = new \Doctrine\Common\Cache\ArrayCache();
-        $this->personaConfig = [
-            'userAgent' => 'userAgentVal',
-            'persona_host' => 'persona_host_val',
-            'persona_oauth_route' => 'persona_oauth_route_val',
-            'persona_oauth_route' => 'persona_oauth_route_val',
-            'cacheBackend' => $this->cacheDriver,
-        ];
-
         $this->postFields = ['listUri' => 'http://somelist'];
     }
 
@@ -37,7 +23,6 @@ public function testCreateReviewSuccess()
             new \GuzzleHttp\Psr7\Response(201, [], json_encode(['id' => $id])),
         ]);
 
-        $criticClient->setPersonaConnectValues($this->personaConfig);
         $this->assertEquals($id, $criticClient->createReview($this->postFields, '', ''));
     }
 
@@ -52,7 +37,6 @@ public function testCreateReviewException()
             new \GuzzleHttp\Psr7\Response(200, [], json_encode(['id' => '1234'])),
         ]);
 
-        $criticClient->setPersonaConnectValues($this->personaConfig);
         $criticClient->createReview($this->postFields, '', '');
     }
 
@@ -67,8 +51,6 @@ public function testCreateReviewGuzzleException()
             new \GuzzleHttp\Psr7\Response(401, [], json_encode([])),
         ]);
 
-        $criticClient->setPersonaConnectValues($this->personaConfig);
-
         $criticClient->createReview(
             $this->postFields,
             'someClientId',
@@ -82,41 +64,75 @@ public function testCreateReviewGuzzleException()
      */
     public function testCreateReviewWithInvalidPersonaConfigFails()
     {
-        $this->criticClient->setPersonaConnectValues($this->personaConfig);
-
-        $this->criticClient->createReview(
+        $criticClient = new \Talis\Critic\Client($this->criticBaseUrl);
+        $criticClient->setPersonaConnectValues([
+            'userAgent' => 'userAgentVal',
+            'persona_host' => 'persona_host_val',
+            'persona_oauth_route' => 'persona_oauth_route_val',
+            'persona_oauth_route' => 'persona_oauth_route_val',
+            'cacheBackend' => new \Doctrine\Common\Cache\ArrayCache(),
+        ]);
+        $criticClient->createReview(
             $this->postFields,
             'someClientId',
             'someClientSecret'
         );
     }
 
+    public function testCreateReviewRequestIsSentOutCorrectly()
+    {
+        $history = [];
+        $criticClient = $this->getClientWithMockResponses([
+            new \GuzzleHttp\Psr7\Response(201, [], json_encode(['id' => '1234567890'])),
+        ], $history);
+        $criticClient->createReview($this->postFields, '', '');
+
+        /** @var \Psr\Http\Message\RequestInterface $request */
+        $request = array_pop($history)['request'];
+
+        $this->assertTrue($request->hasHeader('Content-Type'), 'Content-Type header is missing');
+        $this->assertStringStartsWith('application/x-www-form-urlencoded', $request->getHeader('Content-Type')[0]);
+        parse_str((string) $request->getBody(), $body);
+        $this->assertInternalType('array', $body);
+        $this->assertEquals($this->postFields, $body);
+    }
+
     /**
      * Gets the client with mocked HTTP responses.
      *
      * @param \GuzzleHttp\Psr7\Response[] $responses The responses
+     * @param array $history History middleware container
      * @return \Talis\Critic\Client|\PHPUnit_Framework_MockObject_MockObject The client.
      */
-    private function getClientWithMockResponses(array $responses)
+    private function getClientWithMockResponses(array $responses, array &$history = null)
     {
         $mockHandler = new \GuzzleHttp\Handler\MockHandler($responses);
         $handlerStack = \GuzzleHttp\HandlerStack::create($mockHandler);
+
+        if (isset($history)) {
+            $handlerStack->push(\GuzzleHttp\Middleware::history($history));
+        }
+
         $httpClient = new \GuzzleHttp\Client(['handler' => $handlerStack]);
 
+        $tokenClient = $this->getMockBuilder(\Talis\Persona\Client\Tokens::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['obtainNewToken'])
+            ->getMock();
+        $tokenClient->method('obtainNewToken')
+            ->willReturn(['access_token' => 'TOKEN']);
+
+        /** @var \Talis\Critic\Client|\PHPUnit_Framework_MockObject_MockObject */
         $criticClient = $this->getMockBuilder(\Talis\Critic\Client::class)
-            ->setMethods(['getHTTPClient', 'getHeaders'])
+            ->setMethods(['getHTTPClient', 'getTokenClient'])
             ->setConstructorArgs([$this->criticBaseUrl])
             ->getMock();
 
         $criticClient->method('getHTTPClient')
             ->willReturn($httpClient);
 
-        $criticClient->expects($this->once())
-            ->method('getHeaders')
-            ->willReturn([
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer TOKEN',
-            ]);
+        $criticClient->method('getTokenClient')
+            ->willReturn($tokenClient);
 
         return $criticClient;
     }