Merge branch 'hotfix/#6047-enable-zend-test-controller-tests' into de…

…velop Close #6047 Forward Port #6047
zendframework · Apr 2, 2014 · bea663f · bea663f
2 parents fafa338 + 178da75
commit bea663f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tests/ZendTest/Test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php b/tests/ZendTest/Test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php
@@ -627,11 +627,14 @@ public function testAssertExceptionInAction()
     {
         $this->dispatch('/exception');
         $this->assertResponseStatusCode(500);
-        $this->assertApplicationException('RuntimeException', 'Foo error');
+        $this->assertApplicationException('RuntimeException');
+    }
 
+    public function testAssertExceptionAndMessageInAction()
+    {
         $this->dispatch('/exception');
         $this->assertResponseStatusCode(500);
-        $this->assertApplicationException('RuntimeException');
+        $this->assertApplicationException('RuntimeException', 'Foo error');
     }
 
     /**