Added un-merged improvements from #9528

Revert 306 unused fix test case to account for previous missing http status code
cakephp · Oct 3, 2016 · 9e71a53 · 9e71a53
1 parent ca96417
commit 9e71a53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Network/Response.php b/src/Network/Response.php
@@ -67,7 +67,7 @@ class Response
         405 => 'Method Not Allowed',
         406 => 'Not Acceptable',
         407 => 'Proxy Authentication Required',
-        408 => 'Request Time-out',
+        408 => 'Request Timeout',
         409 => 'Conflict',
         410 => 'Gone',
         411 => 'Length Required',
@@ -78,6 +78,7 @@ class Response
         416 => 'Requested range not satisfiable',
         417 => 'Expectation Failed',
         418 => 'I\'m a teapot',
+        421 => 'Misdirected Request',
         422 => 'Unprocessable Entity',
         423 => 'Locked',
         424 => 'Failed Dependency',
@@ -93,7 +94,7 @@ class Response
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
-        504 => 'Gateway Time-out',
+        504 => 'Gateway Timeout',
         505 => 'Unsupported Version',
         506 => 'Variant Also Negotiates',
         507 => 'Insufficient Storage',

diff --git a/tests/TestCase/Network/ResponseTest.php b/tests/TestCase/Network/ResponseTest.php
@@ -459,7 +459,7 @@ public function testHttpCodes()
     {
         $response = new Response();
         $result = $response->httpCodes();
-        $this->assertEquals(64, count($result));
+        $this->assertEquals(65, count($result));
 
         $result = $response->httpCodes(100);
         $expected = [100 => 'Continue'];
@@ -472,7 +472,7 @@ public function testHttpCodes()
 
         $result = $response->httpCodes($codes);
         $this->assertTrue($result);
-        $this->assertEquals(66, count($response->httpCodes()));
+        $this->assertEquals(67, count($response->httpCodes()));
 
         $result = $response->httpCodes(381);
         $expected = [381 => 'Unicorn Moved'];
@@ -481,7 +481,7 @@ public function testHttpCodes()
         $codes = [404 => 'Sorry Bro'];
         $result = $response->httpCodes($codes);
         $this->assertTrue($result);
-        $this->assertEquals(66, count($response->httpCodes()));
+        $this->assertEquals(67, count($response->httpCodes()));
 
         $result = $response->httpCodes(404);
         $expected = [404 => 'Sorry Bro'];