2
2
{
3
3
using System ;
4
4
using Builders . Contracts . Actions ;
5
- using Builders . Contracts . Controllers ;
6
5
using Builders . Contracts . Pipeline ;
7
6
using Builders . Contracts . Routing ;
8
7
using Builders . Pipeline ;
@@ -24,17 +23,7 @@ public static class ControllerRouteTestBuilderPipelineExtensions
24
23
public static IWhichControllerInstanceBuilder < TController > Which < TController > (
25
24
this IControllerRouteTestBuilder < TController > builder )
26
25
where TController : class
27
- {
28
- var actualBuilder = ( ControllerRouteTestBuilder < TController > ) builder ;
29
-
30
- var actionCall = actualBuilder . ActionCallExpression ;
31
-
32
- return new WhichControllerInstanceBuilder < TController > ( new ControllerTestContext
33
- {
34
- ComponentConstructionDelegate = ( ) => null ,
35
- MethodCall = actionCall
36
- } ) ;
37
- }
26
+ => ( IWhichControllerInstanceBuilder < TController > ) builder . Which ( null ) ;
38
27
39
28
/// <summary>
40
29
/// Allows the route test to continue the assertion chain on the matched controller action.
@@ -45,10 +34,22 @@ public static IWhichControllerInstanceBuilder<TController> Which<TController>(
45
34
/// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
46
35
public static IActionResultTestBuilder < MethodResult > Which < TController > (
47
36
this IControllerRouteTestBuilder < TController > builder ,
48
- Action < IControllerInstanceBuilder < TController > > controllerInstanceBuilder )
37
+ Action < IWhichControllerInstanceBuilder < TController > > controllerInstanceBuilder )
49
38
where TController : class
50
39
{
51
- return null ;
40
+ var actualBuilder = ( ControllerRouteTestBuilder < TController > ) builder ;
41
+
42
+ var actionCall = actualBuilder . ActionCallExpression ;
43
+
44
+ var whichControllerInstanceBuilder = new WhichControllerInstanceBuilder < TController > ( new ControllerTestContext
45
+ {
46
+ ComponentConstructionDelegate = ( ) => null ,
47
+ MethodCall = actionCall
48
+ } ) ;
49
+
50
+ controllerInstanceBuilder ? . Invoke ( whichControllerInstanceBuilder ) ;
51
+
52
+ return whichControllerInstanceBuilder ;
52
53
}
53
54
}
54
55
}
0 commit comments