From b9f180e0014f5bb3c37137f41a06df7acf2496e9 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 29 Jan 2015 12:04:54 +0100 Subject: [PATCH] Use 403 instead of 200 response A forbidden should throw a 403 and this makes it easier for me to do some automated testing. --- settings/middleware/subadminmiddleware.php | 4 +++- tests/settings/middleware/subadminmiddlewaretest.php | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/settings/middleware/subadminmiddleware.php b/settings/middleware/subadminmiddleware.php index a5c005e314..52b77cd7e4 100644 --- a/settings/middleware/subadminmiddleware.php +++ b/settings/middleware/subadminmiddleware.php @@ -59,7 +59,9 @@ class SubadminMiddleware extends Middleware { * @return TemplateResponse */ public function afterException($controller, $methodName, \Exception $exception) { - return new TemplateResponse('core', '403', array(), 'guest'); + $response = new TemplateResponse('core', '403', array(), 'guest'); + $response->setStatus(Http::STATUS_FORBIDDEN); + return $response; } } diff --git a/tests/settings/middleware/subadminmiddlewaretest.php b/tests/settings/middleware/subadminmiddlewaretest.php index e5572cfba5..d0da19f60e 100644 --- a/tests/settings/middleware/subadminmiddlewaretest.php +++ b/tests/settings/middleware/subadminmiddlewaretest.php @@ -81,11 +81,9 @@ class SubadminMiddlewareTest extends \Test\TestCase { $this->subadminMiddlewareAsSubAdmin->beforeController($this->controller, 'foo'); } - - - public function testAfterException() { $expectedResponse = new TemplateResponse('core', '403', array(), 'guest'); + $expectedResponse->setStatus(403); $this->assertEquals($expectedResponse, $this->subadminMiddleware->afterException($this->controller, 'foo', new \Exception())); } -} \ No newline at end of file +}