fixed JsonResponder to respect status code set in domainpayload

fixed TwigResponder to respect status code set in domainpayload added unittests for fixes fixes bitExpert#2
dropdevcoding · Jan 8, 2017 · 9cb75c5 · 9cb75c5
1 parent 6dae35c
commit 9cb75c5
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 2 deletions.
diff --git a/src/bitExpert/Adrenaline/Responder/JsonResponder.php b/src/bitExpert/Adrenaline/Responder/JsonResponder.php
@@ -50,6 +50,9 @@ public function __invoke(Payload $payload, ResponseInterface $response)
             $response = $response->withHeader($header, $value);
         }
 
-        return $response->withStatus(200);
+        /** @var \bitExpert\Adrenaline\Domain\DomainPayload $payload */
+        $status = $payload->getStatus() ?: 200;
+
+        return $response->withStatus($status);
     }
 }
diff --git a/src/bitExpert/Adrenaline/Responder/TwigResponder.php b/src/bitExpert/Adrenaline/Responder/TwigResponder.php
@@ -92,6 +92,9 @@ public function __invoke(Payload $payload, ResponseInterface $response)
             $response = $response->withHeader($header, $value);
         }
 
-        return $response->withStatus(200);
+        /** @var \bitExpert\Adrenaline\Domain\DomainPayload $payload */
+        $status = $payload->getStatus() ?: 200;
+
+        return $response->withStatus($status);
     }
 }
diff --git a/tests/bitExpert/Adrenaline/Responder/JsonResponderUnitTest.php b/tests/bitExpert/Adrenaline/Responder/JsonResponderUnitTest.php
@@ -83,8 +83,35 @@ public function contentTypeCantBeChanged()
         $domainPayload = new DomainPayload('test');
         $this->responder->setHeaders(['Content-Type' => 'my/type']);
         $responder = $this->responder;
+        /** @var ResponseInterface $response */
         $response = $responder($domainPayload, $this->response);
 
         $this->assertEquals(['application/json'], $response->getHeader('Content-Type'));
     }
+
+    /**
+     * @test
+     */
+    public function respectsStatusCodeSetInPayload()
+    {
+        $domainPayload = (new DomainPayload('test'))->withStatus(400);
+        $responder = $this->responder;
+        /** @var ResponseInterface $response */
+        $response = $responder($domainPayload, $this->response);
+
+        $this->assertEquals(400, $response->getStatusCode());
+    }
+
+    /**
+     * @test
+     */
+    public function usesOkStatusCodeIfNoneSetInPayload()
+    {
+        $domainPayload = (new DomainPayload('test'));
+        $responder = $this->responder;
+        /** @var ResponseInterface $response */
+        $response = $responder($domainPayload, $this->response);
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
 }
diff --git a/tests/bitExpert/Adrenaline/Responder/TwigResponderUnitTest.php b/tests/bitExpert/Adrenaline/Responder/TwigResponderUnitTest.php
@@ -131,4 +131,32 @@ public function contentTypeCantBeChanged()
 
         $this->assertEquals(['text/html'], $response->getHeader('Content-Type'));
     }
+
+    /**
+     * @test
+     */
+    public function respectsStatusCodeSetInPayload()
+    {
+        $domainPayload = (new DomainPayload('test'))->withStatus(400);
+        $responder = $this->responder;
+        $responder->setTemplate('mytemplate.twig');
+        /** @var ResponseInterface $response */
+        $response = $responder($domainPayload, $this->response);
+
+        $this->assertEquals(400, $response->getStatusCode());
+    }
+
+    /**
+     * @test
+     */
+    public function usesOkStatusCodeIfNoneSetInPayload()
+    {
+        $domainPayload = (new DomainPayload('test'));
+        $responder = $this->responder;
+        $responder->setTemplate('mytemplate.twig');
+        /** @var ResponseInterface $response */
+        $response = $responder($domainPayload, $this->response);
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
 }