22{
33 using System ;
44 using Builders . Contracts . Actions ;
5- using Builders . Contracts . Controllers ;
65 using Builders . Contracts . Pipeline ;
76 using Builders . Contracts . Routing ;
87 using Builders . Pipeline ;
@@ -24,17 +23,7 @@ public static class ControllerRouteTestBuilderPipelineExtensions
2423 public static IWhichControllerInstanceBuilder < TController > Which < TController > (
2524 this IControllerRouteTestBuilder < TController > builder )
2625 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 ) ;
3827
3928 /// <summary>
4029 /// Allows the route test to continue the assertion chain on the matched controller action.
@@ -45,10 +34,22 @@ public static IWhichControllerInstanceBuilder<TController> Which<TController>(
4534 /// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
4635 public static IActionResultTestBuilder < MethodResult > Which < TController > (
4736 this IControllerRouteTestBuilder < TController > builder ,
48- Action < IControllerInstanceBuilder < TController > > controllerInstanceBuilder )
37+ Action < IWhichControllerInstanceBuilder < TController > > controllerInstanceBuilder )
4938 where TController : class
5039 {
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 ;
5253 }
5354 }
5455}
0 commit comments