Refactor to use helper method + test coverage.

Refs #9842 Refs #9847
cakephp · Dec 8, 2016 · fc2d1f4 · fc2d1f4
1 parent 9b3a191
commit fc2d1f4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -879,7 +879,7 @@ public function assertResponseRegExp($pattern, $message = '')
         if (!$this->_response) {
             $this->fail('No response set, cannot assert content. ' . $message);
         }
-        $this->assertRegExp($pattern, (string)$this->_response->body(), $message);
+        $this->assertRegExp($pattern, $this->_getBodyAsString(), $message);
     }
 
     /**
@@ -894,7 +894,7 @@ public function assertResponseNotRegExp($pattern, $message = '')
         if (!$this->_response) {
             $this->fail('No response set, cannot assert content. ' . $message);
         }
-        $this->assertNotRegExp($pattern, (string)$this->_response->body(), $message);
+        $this->assertNotRegExp($pattern, $this->_getBodyAsString(), $message);
     }
 
     /**

diff --git a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php
@@ -762,6 +762,18 @@ public function testAssertResponseRegExp()
         $this->assertResponseRegExp('/cont/');
     }
 
+    /**
+     * Test the content regexp assertion failing
+     *
+     * @expectedException \PHPUnit_Framework_AssertionFailedError
+     * @expectedExceptionMessage No response set
+     * @return void
+     */
+    public function testAssertResponseRegExpNoResponse()
+    {
+        $this->assertResponseRegExp('/cont/');
+    }
+
     /**
      * Test the negated content regexp assertion.
      *
@@ -775,6 +787,18 @@ public function testAssertResponseNotRegExp()
         $this->assertResponseNotRegExp('/cant/');
     }
 
+    /**
+     * Test negated content regexp assertion failing
+     *
+     * @expectedException \PHPUnit_Framework_AssertionFailedError
+     * @expectedExceptionMessage No response set
+     * @return void
+     */
+    public function testAssertResponseNotRegExpNoResponse()
+    {
+        $this->assertResponseNotRegExp('/cont/');
+    }
+
     /**
      * Test that works in tandem with testEventManagerReset2 to
      * test the EventManager reset.