Merge pull request #477 from cakephp/fix-tests

Fix tests in 3.4.0+
cakephp · Jan 15, 2017 · 0affaef · 0affaef
2 parents 5e48c05 + 1ef7308
commit 0affaef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -210,9 +210,16 @@ public function injectScripts($row, $response)
         if (strpos($response->type(), 'html') === false) {
             return $response;
         }
-        $body = $response->getBody();
-        if (!$body->isSeekable()) {
-            return $response;
+        if (method_exists($response, 'getBody')) {
+            $body = $response->getBody();
+            if (!$body->isSeekable()) {
+                return $response;
+            }
+        } else {
+            $body = $response->body();
+            if (!is_string($body)) {
+                return $response;
+            }
         }
         $pos = strrpos($body, '</body>');
         if ($pos === false) {

diff --git a/tests/TestCase/Routing/Filter/DebugBarFilterTest.php b/tests/TestCase/Routing/Filter/DebugBarFilterTest.php
@@ -136,7 +136,11 @@ public function testAfterDispatchIgnoreStreamBodies()
         $bar = new DebugBarFilter($this->events, []);
         $event = new Event('Dispatcher.afterDispatch', $bar, compact('request', 'response'));
         $bar->afterDispatch($event);
-        $this->assertEquals('I am a teapot!', $response->body());
+        if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
+            $this->assertEquals('I am a teapot!', $response->body());
+        } else {
+            $this->assertInstanceOf('Closure', $response->body());
+        }
     }
 
     /**

diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -206,7 +206,11 @@ public function testInjectScriptsStreamBodies()
 
         $result = $bar->injectScripts($row, $response);
         $this->assertInstanceOf('Cake\Network\Response', $result);
-        $this->assertEquals('I am a teapot!', $result->body());
+        if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
+            $this->assertEquals('I am a teapot!', $response->body());
+        } else {
+            $this->assertInstanceOf('Closure', $response->body());
+        }
     }