Skip to content

Commit 3ffae34

Browse files
change Router test doubles to match signatures
1 parent a893f3a commit 3ffae34

1 file changed

Lines changed: 25 additions & 29 deletions

File tree

ReSwiftRouterTests/ReSwiftRouterIntegrationTests.swift

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,39 @@ class MockRoutable: Routable {
2424
func pushRouteSegment(
2525
_ routeElementIdentifier: RouteElementIdentifier,
2626
animated: Bool,
27-
completionHandler: RoutingCompletionHandler) -> Routable {
28-
callsToPushRouteSegment.append(
29-
(routeElement: routeElementIdentifier, animated: animated)
30-
)
31-
completionHandler()
32-
return MockRoutable()
27+
completionHandler: @escaping RoutingCompletionHandler
28+
) -> Routable {
29+
30+
callsToPushRouteSegment.append(
31+
(routeElement: routeElementIdentifier, animated: animated)
32+
)
33+
completionHandler()
34+
return MockRoutable()
3335
}
3436

3537
func popRouteSegment(
3638
_ routeElementIdentifier: RouteElementIdentifier,
3739
animated: Bool,
38-
completionHandler: RoutingCompletionHandler) {
39-
callsToPopRouteSegment.append(
40-
(routeElement: routeElementIdentifier, animated: animated)
41-
)
42-
completionHandler()
40+
completionHandler: @escaping RoutingCompletionHandler) {
41+
42+
callsToPopRouteSegment.append(
43+
(routeElement: routeElementIdentifier, animated: animated)
44+
)
45+
completionHandler()
4346
}
4447

4548
func changeRouteSegment(
4649
_ from: RouteElementIdentifier,
4750
to: RouteElementIdentifier,
4851
animated: Bool,
49-
completionHandler: RoutingCompletionHandler) -> Routable {
50-
completionHandler()
52+
completionHandler: @escaping RoutingCompletionHandler
53+
) -> Routable {
5154

52-
callsToChangeRouteSegment.append((from: from, to: to, animated: animated))
55+
completionHandler()
5356

54-
return MockRoutable()
57+
callsToChangeRouteSegment.append((from: from, to: to, animated: animated))
58+
59+
return MockRoutable()
5560
}
5661

5762
}
@@ -122,11 +127,8 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
122127
self.calledWithIdentifier = calledWithIdentifier
123128
}
124129

125-
func pushRouteSegment(
126-
_ routeSegment: RouteElementIdentifier,
127-
animated: Bool,
128-
completionHandler: RoutingCompletionHandler) -> Routable {
129-
calledWithIdentifier(routeSegment)
130+
func pushRouteSegment(_ routeElementIdentifier: RouteElementIdentifier, animated: Bool, completionHandler: @escaping RoutingCompletionHandler) -> Routable {
131+
calledWithIdentifier(routeElementIdentifier)
130132

131133
completionHandler()
132134
return MockRoutable()
@@ -161,11 +163,8 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
161163
self.calledWithIdentifier = calledWithIdentifier
162164
}
163165

164-
func pushRouteSegment(
165-
_ routeSegment: RouteElementIdentifier,
166-
animated: Bool,
167-
completionHandler: RoutingCompletionHandler) -> Routable {
168-
calledWithIdentifier(routeSegment)
166+
func pushRouteSegment(_ routeElementIdentifier: RouteElementIdentifier, animated: Bool, completionHandler: @escaping RoutingCompletionHandler) -> Routable {
167+
calledWithIdentifier(routeElementIdentifier)
169168

170169
completionHandler()
171170
return MockRoutable()
@@ -186,10 +185,7 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
186185
self.injectedRoutable = injectedRoutable
187186
}
188187

189-
func pushRouteSegment(
190-
_ routeElementIdentifier: RouteElementIdentifier,
191-
animated: Bool,
192-
completionHandler: RoutingCompletionHandler) -> Routable {
188+
func pushRouteSegment(_ routeElementIdentifier: RouteElementIdentifier, animated: Bool, completionHandler: @escaping RoutingCompletionHandler) -> Routable {
193189
completionHandler()
194190
return injectedRoutable
195191
}

0 commit comments

Comments
 (0)