Merge pull request #15 from michal-franc/nre_fix

Fix to NRE when redirect to action without specified controller

Author: robdmoore

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs

@@ -233,6 +233,15 @@ public void Check_for_redirect_to_incorrect_action_in_another_controller()
             );
             Assert.That(exception.Message, Is.EqualTo("Expected redirect to action 'SomeOtherAction', but instead was given a redirect to action 'SomeAction'."));
         }
+
+        [Test]
+        public void Check_for_redirect_to_action_with_non_specified_controller()
+        {
+            var exception = Assert.Throws<ActionResultAssertionException>(() =>
+                _controller.WithCallTo(c => c.RedirectToAnotherActionNoController()).ShouldRedirectTo<SomeOtherController>(c => c.SomeOtherAction())
+            );
+            Assert.That(exception.Message, Is.EqualTo("Expected redirect to action 'SomeOtherAction' in 'SomeOther' controller, but instead was given redirect to action 'SomeAction' within the same controller."));
+        }
         #endregion
 
         #region View tests

TestStack.FluentMVCTesting.Tests/TestControllers/ControllerResultTestController.cs

@@ -78,6 +78,11 @@ public ActionResult RedirectToAnotherController()
             return RedirectToAction("SomeAction", "SomeOther");
         }
 
+        public ActionResult RedirectToAnotherActionNoController()
+        {
+            return RedirectToAction("SomeAction");
+        }
+
         #region Redirect Actions
         public ActionResult ActionWithNoParameters()
         {

TestStack.FluentMvcTesting/ControllerResultTest.cs

@@ -160,6 +160,9 @@ public RouteValueDictionary ShouldRedirectTo<TController>(MethodInfo methodInfo)
 
             var redirectResult = (RedirectToRouteResult)_actionResult;
 
+            if (redirectResult.RouteValues["Controller"] == null)
+                throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}' in '{1}' controller, but instead was given redirect to action '{2}' within the same controller.", actionName, controllerName, redirectResult.RouteValues["Action"]));
+
             if (redirectResult.RouteValues["Controller"].ToString() != controllerName)
                 throw new ActionResultAssertionException(string.Format("Expected redirect to controller '{0}', but instead was given a redirect to controller '{1}'.", controllerName, redirectResult.RouteValues["Controller"]));