Skip to content
Browse files

Fixed unit tests (thx travis..)

  • Loading branch information...
1 parent b66910c commit f4ca05d77fc14e42d330dc62c4e82332a0e2beef @andrerom committed Apr 1, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 HiMVC/Core/MVC/Tests/ViewDispatcherTest.php
View
14 HiMVC/Core/MVC/Tests/ViewDispatcherTest.php
@@ -11,7 +11,7 @@
namespace HiMVC\Core\MVC\Tests;
use HiMVC\Core\MVC\View\ViewDispatcher;
-use HiMVC\API\MVC\Values\Result;
+use HiMVC\API\MVC\Values\ResultItem;
use HiMVC\Core\MVC\Request;
use PHPUnit_Framework_TestCase;
@@ -72,7 +72,7 @@ public function testNoConditions()
$dispatcher = new ViewDispatcher( array( 'tpl' => array( $this->viewMock1, 'render' ) ), array() );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read', 'view' => 'full' ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'view' => 'full', 'uri' => 'content/' ) )
);
$this->viewMock2->expects( $this->once() )
@@ -84,7 +84,7 @@ public function testNoConditions()
$dispatcher = new ViewDispatcher( array( 'php' => array( $this->viewMock2, 'render' ) ), array() );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read' ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'uri' => 'content/' ) )
);
}
@@ -112,7 +112,7 @@ public function testVerySimpleCondition()
) );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read', 'view' => 'full', 'params' => $params ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'view' => 'full', 'params' => $params, 'uri' => 'content/' ) )
);
$this->viewMock2->expects( $this->once() )
@@ -130,7 +130,7 @@ public function testVerySimpleCondition()
) );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read', 'params' => $params ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'params' => $params, 'uri' => 'content/') )
);
}
@@ -164,7 +164,7 @@ public function testSimpleCondition()
) );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read', 'view' => 'full', 'params' => $params ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'view' => 'full', 'params' => $params, 'uri' => 'content/' ) )
);
$this->viewMock2->expects( $this->once() )
@@ -187,7 +187,7 @@ public function testSimpleCondition()
) );
$dispatcher->view(
$this->request,
- new Result( array( 'module' => 'content', 'action' => 'read', 'params' => $params ) )
+ new ResultItem( array( 'model' => array(), 'module' => 'content', 'action' => 'read', 'params' => $params, 'uri' => 'content/' ) )
);
}
}

0 comments on commit f4ca05d

Please sign in to comment.
Something went wrong with that request. Please try again.