Merge branch 'hotfix/zendframework/zendframework#6047-enable-zend-tes…

…t-controller-tests' into develop Close zendframework/zendframework#6047 Forward Port zendframework/zendframework#6047
zendframework · Apr 2, 2014 · e4e8452 · e4e8452
3 parents 2725baa + 4d8efbe + 4cfd6ad
commit e4e8452
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php b/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');
     }
 
     /**