summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-30 10:11:12 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-30 10:11:12 +0100
commit9c1dbaf0ad73bc84e41db964b319d7b2842ac7ae (patch)
tree5f1cfe8ae0d7092f37f45410d98dc0741a133b00 /tests
parentde02cde70ce5b0df7459d4d45abdaebeca3424d6 (diff)
parentaa822f76e2c608555eba3202bd5139944f72b884 (diff)
downloadnextcloud-server-9c1dbaf0ad73bc84e41db964b319d7b2842ac7ae.tar.gz
nextcloud-server-9c1dbaf0ad73bc84e41db964b319d7b2842ac7ae.zip
Merge pull request #20788 from owncloud/catch-missing-route
Dont die when we're missing a route
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/appframework/routing/RoutingTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index 51c191fdfb7..b063ef32835 100644
--- a/tests/lib/appframework/routing/RoutingTest.php
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -74,7 +74,7 @@ class RoutingTest extends \Test\TestCase
));
// router mock
- $router = $this->getMock("\OC\Route\Router", array('create'));
+ $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]);
// load route configuration
$container = new DIContainer('app1');
@@ -124,7 +124,7 @@ class RoutingTest extends \Test\TestCase
$route = $this->mockRoute($container, $verb, $controllerName, $actionName, $requirements, $defaults);
// router mock
- $router = $this->getMock("\OC\Route\Router", array('create'));
+ $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]);
// we expect create to be called once:
$router
@@ -148,7 +148,7 @@ class RoutingTest extends \Test\TestCase
private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName)
{
// router mock
- $router = $this->getMock("\OC\Route\Router", array('create'));
+ $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]);
// route mocks
$container = new DIContainer('app1');