#154 Handle Content-Type header (#155)

raml-org · Aug 3, 2019 · 1e8183c · 1e8183c
1 parent 3f464e1
commit 1e8183c
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 2 deletions.
diff --git a/src/Validator/RequestValidator.php b/src/Validator/RequestValidator.php
@@ -103,7 +103,7 @@ private function assertValidBody(RequestInterface $request)
     {
         $method = $request->getMethod();
         $path = $request->getUri()->getPath();
-        $contentType = $request->getHeaderLine('Content-Type');
+        $contentType = \explode(';', $request->getHeaderLine('Content-Type'))[0];
 
         $schemaBody = $this->schemaHelper->getRequestBody($method, $path, $contentType);
 

diff --git a/src/Validator/ResponseValidator.php b/src/Validator/ResponseValidator.php
@@ -99,7 +99,7 @@ private function assertValidBody(RequestInterface $request, ResponseInterface $r
         $method = $request->getMethod();
         $path = $request->getUri()->getPath();
         $statusCode = $response->getStatusCode();
-        $contentType = $response->getHeaderLine('Content-Type');
+        $contentType = \explode(';', $response->getHeaderLine('Content-Type'))[0];
 
         $schemaBody = $this->schemaHelper->getResponseBody($method, $path, $statusCode, $contentType);
 

diff --git a/tests/Validator/RequestValidatorTest.php b/tests/Validator/RequestValidatorTest.php
@@ -7,10 +7,12 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
+use Raml\Body;
 use Raml\Parser;
 use Raml\Validator\RequestValidator;
 use Raml\Validator\ValidatorRequestException;
 use Raml\Validator\ValidatorSchemaHelper;
+use Raml\ValidatorInterface;
 
 class RequestValidatorTest extends TestCase
 {
@@ -159,6 +161,41 @@ public function shouldAllowEmptyRequestBody()
         $validator->validateRequest($this->request);
     }
 
+    /**
+     * @test
+     * @doesNotPerformAssertions
+     */
+    public function shouldParseContentTypeHeader()
+    {
+        $body = $this->createMock(StreamInterface::class);
+        $body->method('getContents')->willReturn('{"title":"Aaa"}');
+
+        $this->request->method('getMethod')->willReturn('post');
+        $this->uri->method('getPath')->willReturn('/songs');
+        $this->request->method('getHeaderLine')->with('Content-Type')->willReturn('application/json; charset=us-ascii');
+        $this->request->method('getBody')->willReturn($body);
+
+        $schemaBody = $this->createMock(Body::class);
+        $schemaBody
+            ->expects($this->atLeastOnce())
+            ->method('getValidator')
+            ->willReturn($this->createMock(ValidatorInterface::class));
+
+        $apiDefinition = $this->parser->parse(__DIR__ . '/../fixture/validator/requestBody.raml');
+        $schemaHelper = $this->getMockBuilder(ValidatorSchemaHelper::class)
+            ->setConstructorArgs([$apiDefinition])
+            ->setMethods(['getRequestBody'])
+            ->getMock();
+        $schemaHelper
+            ->expects($this->once())
+            ->method('getRequestBody')
+            ->with('post', '/songs', 'application/json')
+            ->willReturn($schemaBody);
+
+        $validator = new RequestValidator($schemaHelper, new Negotiator());
+        $validator->validateRequest($this->request);
+    }
+
     /**
      * @param string $fixturePath
      * @return RequestValidator

diff --git a/tests/Validator/ResponseValidatorTest.php b/tests/Validator/ResponseValidatorTest.php
@@ -7,10 +7,12 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
+use Raml\Body;
 use Raml\Parser;
 use Raml\Validator\ResponseValidator;
 use Raml\Validator\ValidatorResponseException;
 use Raml\Validator\ValidatorSchemaHelper;
+use Raml\ValidatorInterface;
 
 class ResponseValidatorTest extends TestCase
 {
@@ -169,4 +171,54 @@ public function shouldCatchInvalidBody()
         $validator = $this->getValidatorForSchema(__DIR__ . '/../fixture/validator/responseBody.raml');
         $validator->validateResponse($this->request, $this->response);
     }
+
+    /**
+     * @test
+     * @doesNotPerformAssertions
+     */
+    public function shouldParseContentTypeHeader()
+    {
+        $json = '{}';
+
+        $headers = [
+            'X-Required-Header' => ['123456'],
+            'X-Long-Optional-Header' => ['Abcdefghijkl'],
+        ];
+
+        $map = [
+            ['X-Required-Header', [['123456']]],
+            ['X-Long-Optional-Header', [['Abcdefg', 'Abc']]],
+        ];
+
+        $body = $this->createMock(StreamInterface::class);
+        $body->method('getContents')->willReturn($json);
+
+        $this->request->method('getMethod')->willReturn('post');
+        $this->uri->method('getPath')->willReturn('/songs');
+        $this->response->method('getStatusCode')->willReturn(200);
+        $this->response->method('getHeader')->willReturnMap($map);
+        $this->response->method('getHeaders')->willReturn($headers);
+        $this->response->method('getHeaderLine')->with('Content-Type')->willReturn('application/json; charset=us-ascii');
+        $this->response->method('getBody')->willReturn($body);
+
+        $schemaBody = $this->createMock(Body::class);
+        $schemaBody
+            ->expects($this->atLeastOnce())
+            ->method('getValidator')
+            ->willReturn($this->createMock(ValidatorInterface::class));
+
+        $apiDefinition = $this->parser->parse(__DIR__ . '/../fixture/validator/responseBody.raml');
+        $schemaHelper = $this->getMockBuilder(ValidatorSchemaHelper::class)
+            ->setConstructorArgs([$apiDefinition])
+            ->setMethods(['getResponseBody'])
+            ->getMock();
+        $schemaHelper
+            ->expects($this->once())
+            ->method('getResponseBody')
+            ->with('post', '/songs', 200, 'application/json')
+            ->willReturn($schemaBody);
+
+        $validator = new ResponseValidator($schemaHelper);
+        $validator->validateResponse($this->request, $this->response);
+    }
 }