Sort out exception decorator, tests passing

delboy1978uk · Oct 27, 2019 · b7c0277 · b7c0277
1 parent 7772bcf
commit b7c0277
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ services:
   - mysql
 
 install:
-  - wget http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
   - composer install
 
 before_script:

diff --git a/src/Mvc/Router/Decorator/ExceptionDecorator.php b/src/Mvc/Router/Decorator/ExceptionDecorator.php
@@ -78,7 +78,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             ]);
             $status = ($e->getCode() >= 100 && $e->getCode() < 600) ? $e->getCode() : 500;
 
-            return $this->getResponseWithBodyAndStatus(new HtmlResponse($body), $body, $status);
+            return $this->getResponseWithBodyAndStatus(new HtmlResponse(), $body, $status);
         }
     }
 

diff --git a/src/Mvc/Router/Decorator/NotAllowedDecorator.php b/src/Mvc/Router/Decorator/NotAllowedDecorator.php
@@ -7,8 +7,9 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Zend\Diactoros\Response\HtmlResponse;
 
-class NotAllowedDecorator extends NotFoundDecorator
+class NotAllowedDecorator extends ExceptionDecorator
 {
     /**
      * @param ServerRequestInterface $request
@@ -17,7 +18,12 @@ class NotAllowedDecorator extends NotFoundDecorator
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $this->setView('error/not-allowed');
+        $body = $this->viewEngine->render('error/not-allowed');
+        $body = $this->viewEngine->render($this->getLayout(), [
+            'content' => $body,
+        ]);
+
+        return $this->getResponseWithBodyAndStatus(new HtmlResponse(''), $body, 405);
 
         return parent::process($request, $handler);
     }

diff --git a/src/Mvc/Router/Decorator/NotFoundDecorator.php b/src/Mvc/Router/Decorator/NotFoundDecorator.php
@@ -25,10 +25,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             'content' => $body,
         ]);
 
-        $stream = new Stream('php://memory', 'r+');
-        $stream->write($body);
-        $response = (new Response())->withStatus(404)->withBody($stream);
-
-        return $response;
+        return $this->getResponseWithBodyAndStatus(new Response\HtmlResponse(''), $body, 404);
     }
 }
diff --git a/tests/_data/config/layouts.php b/tests/_data/config/layouts.php
@@ -5,4 +5,12 @@
     'available_layouts' => [
         'layouts/bonemvc',
     ],
+    'error_pages' => [
+        'exception' => 'error/error',
+        401 => 'error/not-authorised',
+        403 => 'error/not-authorised',
+        404 => 'error/not-found',
+        405 => 'error/not-allowed',
+        500 => 'error/error',
+    ],
 ];
diff --git a/tests/_data/config2/layouts.php b/tests/_data/config2/layouts.php
@@ -5,4 +5,12 @@
     'available_layouts' => [
         'layouts/bonemvc',
     ],
+    'error_pages' => [
+        'exception' => 'error/error',
+        401 => 'error/not-authorised',
+        403 => 'error/not-authorised',
+        404 => 'error/not-found',
+        405 => 'error/not-allowed',
+        500 => 'error/error',
+    ],
 ];
diff --git a/tests/unit/BoneMvcApplicationTest.php b/tests/unit/BoneMvcApplicationTest.php
@@ -50,7 +50,6 @@ public function testGetContainer()
      */
     public function testCanSetSail()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -71,10 +70,8 @@ public function testMethodNotAllowed()
         global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
-        $_SERVER = [
-            'REQUEST_URI' => '/en_GB/testpackage',
-            'REQUEST_METHOD' => 'POST',
-        ];
+        $_SERVER['REQUEST_URI'] = '/en_GB/testpackage';
+        $_SERVER['REQUEST_METHOD'] = 'POST';
         ob_start();
         $this->assertTrue($application->setSail());
         $contents = ob_get_contents();
@@ -99,7 +96,6 @@ public function testMethodNotAllowed()
      */
     public function testApi()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -117,7 +113,6 @@ public function testApi()
      */
     public function testException()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -136,7 +131,6 @@ public function testException()
      */
     public function testJsonResponse()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -154,7 +148,6 @@ public function testJsonResponse()
      */
     public function test404Request()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -174,7 +167,6 @@ public function test404Request()
      */
     public function testRedirectToLocalisedURL()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config');
         $_SERVER = [
@@ -194,7 +186,6 @@ public function testRedirectToLocalisedURL()
      */
     public function testWithoutI18n()
     {
-        global $_SERVER;
         $application = Application::ahoy();
         $application->setConfigFolder('tests/_data/config2');
         $_SERVER = [