Permalink
Browse files

Merge branch 'feature/broken-controller-tests' into develop

  • Loading branch information...
2 parents faaef76 + 8ae2134 commit 884bc62db666c692498bff9edf01be4bc5e033b3 @trq trq committed Nov 13, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 tests/lib/Proem/Tests/ControllerTest.php
  2. +2 −2 tests/lib/Proem/Tests/Fixtures/Controller/Bar.php
@@ -58,13 +58,13 @@ public function testCanInstantiate()
public function testCanDispatchAction()
{
$controller = new \Controller\Foo($this->assets);
- $this->assertTrue($controller->dispatch('bar'));
+ $this->assertTrue($controller->dispatch('barAction'));
}
public function testPrePostEvents()
{
$controller = new \Controller\Bar($this->assets);
$this->expectOutputString('preactionpost');
- $controller->dispatch('foo');
+ $controller->dispatch('fooAction');
}
}
@@ -7,11 +7,11 @@ class Bar extends \Proem\Controller\Standard
public function init()
{
$e = $this->assets->get('events');
- $e->attach('proem.pre.action.foo', function() {
+ $e->attach('proem.pre.action.fooAction', function() {
echo 'pre';
});
- $e->attach('proem.post.action.foo', function() {
+ $e->attach('proem.post.action.fooAction', function() {
echo 'post';
});
}

0 comments on commit 884bc62

Please sign in to comment.