Fix supporting defaults for routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 10 insertions, 14 deletions

diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php
index c078023e653..4712d2f30eb 100644
--- a/tests/lib/AppFramework/Routing/RoutingTest.php
+++ b/tests/lib/AppFramework/Routing/RoutingTest.php
@@ -419,7 +419,7 @@ class RoutingTest extends \Test\TestCase {
 		array $defaults=[]
 	) {
 		$route = $this->getMockBuilder(Route::class)
-			->onlyMethods(['method', 'setDefault', 'requirements', 'defaults'])
+			->onlyMethods(['method', 'requirements', 'defaults'])
 			->disableOriginalConstructor()
 			->getMock();
 		$route
@@ -428,12 +428,6 @@ class RoutingTest extends \Test\TestCase {
 			->with($this->equalTo($verb))
 			->willReturn($route);
 
-		$route
-			->expects($this->once())
-			->method('setDefault')
-			->with('caller', ['app1', $controllerName, $actionName])
-			->willReturn($route);
-
 		if (count($requirements) > 0) {
 			$route
 				->expects($this->once())
@@ -442,13 +436,15 @@ class RoutingTest extends \Test\TestCase {
 				->willReturn($route);
 		}
 
-		if (count($defaults) > 0) {
-			$route
-				->expects($this->once())
-				->method('defaults')
-				->with($this->equalTo($defaults))
-				->willReturn($route);
-		}
+		$route->expects($this->once())
+			->method('defaults')
+			->with($this->callback(function (array $def) use ($defaults, $controllerName, $actionName) {
+				$defaults['caller'] = ['app1', $controllerName, $actionName];
+
+				$this->assertEquals($defaults, $def);
+				return true;
+			}))
+			->willReturn($route);
 
 		return $route;
 	}