[#1] Update ActionController tests

- Tests now recognize that return value from notFoundAction() is a ViewModel
weierophinney · Feb 19, 2012 · e23c369 · e23c369
1 parent 78ba1dc
commit e23c369
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/tests/Zend/Mvc/Controller/ActionControllerTest.php b/tests/Zend/Mvc/Controller/ActionControllerTest.php
@@ -34,8 +34,11 @@ public function testDispatchInvokesNotFoundActionWhenNoActionPresentInRouteMatch
         $result = $this->controller->dispatch($this->request, $this->response);
         $response = $this->controller->getResponse();
         $this->assertEquals(404, $response->getStatusCode());
-        $this->assertTrue(isset($result['content']));
-        $this->assertContains('Page not found', $result['content']);
+        $this->assertInstanceOf('Zend\View\Model', $result);
+        $this->assertEquals('content', $result->captureTo());
+        $vars = $result->getVariables();
+        $this->assertArrayHasKey('content', $vars, var_export($vars, 1));
+        $this->assertContains('Page not found', $vars['content']);
     }
 
     public function testDispatchInvokesNotFoundActionWhenInvalidActionPresentInRouteMatch()
@@ -44,8 +47,11 @@ public function testDispatchInvokesNotFoundActionWhenInvalidActionPresentInRoute
         $result = $this->controller->dispatch($this->request, $this->response);
         $response = $this->controller->getResponse();
         $this->assertEquals(404, $response->getStatusCode());
-        $this->assertTrue(isset($result['content']));
-        $this->assertContains('Page not found', $result['content']);
+        $this->assertInstanceOf('Zend\View\Model', $result);
+        $this->assertEquals('content', $result->captureTo());
+        $vars = $result->getVariables();
+        $this->assertArrayHasKey('content', $vars, var_export($vars, 1));
+        $this->assertContains('Page not found', $vars['content']);
     }
 
     public function testDispatchInvokesProvidedActionWhenMethodExists()