diff options
Diffstat (limited to 'tests/Controller')
| -rw-r--r-- | tests/Controller/ContentNegotiationTest.php | 4 | ||||
| -rw-r--r-- | tests/Controller/RouteActionTest.php | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/Controller/ContentNegotiationTest.php b/tests/Controller/ContentNegotiationTest.php index 1a390a4..d5e142d 100644 --- a/tests/Controller/ContentNegotiationTest.php +++ b/tests/Controller/ContentNegotiationTest.php @@ -38,10 +38,10 @@ class ContentNegotiationTest extends \PHPUnit_Framework_TestCase $trait->expects($this->once())->method('getRequest')->will($this->returnValue($request)); $trait->expects($this->once())->method('getNegotiator')->with($this->equalTo($type))->will($this->returnValue($negotiator)); - $builtClass = $this->callProtectedMethod($trait, 'getNegotiatorName', [$type]); + $buildClass = $this->callProtectedMethod($trait, 'getNegotiatorName', [$type]); $result = $trait->{$method}($priorities); - $this->assertEquals($builtClass, $negotiatorClass, "Obtained wrong negotiator class"); + $this->assertEquals($buildClass, $negotiatorClass, "Obtained wrong negotiator class"); $this->assertEquals($result, $expected, "Obtained result does not match expected result"); } diff --git a/tests/Controller/RouteActionTest.php b/tests/Controller/RouteActionTest.php index fcab3ed..3e42d1d 100644 --- a/tests/Controller/RouteActionTest.php +++ b/tests/Controller/RouteActionTest.php @@ -14,7 +14,10 @@ class RouteActionTest extends \PHPUnit_Framework_TestCase use TestHelper { getController as private _getController; } - + + /** + * @return string + */ protected function getControllerClass() { return RouteActionController::class; @@ -27,7 +30,7 @@ class RouteActionTest extends \PHPUnit_Framework_TestCase * @param string $className * @return RouteActionController|\PHPUnit_Framework_MockObject_MockObject */ - protected function getController($methods = array(), $className = null) + protected function getController($methods = [], $className = null) { return $this->_getController( array_merge($methods, ['getRequest', 'defaultAction', 'runTestAction', 'notFound', 'before', 'after']), @@ -41,7 +44,7 @@ class RouteActionTest extends \PHPUnit_Framework_TestCase { return [ [(object)['args' => ['woo']], 'defaultAction', ['woo']], - [(object)['action' => 'test-run'], 'testRunAction'], + [(object)['action' => 'run-test'], 'runTestAction'], [(object)['action' => 'non-existent'], 'notFound'] ]; } |