completed RedirectResultAssertions and tests

Author: CaseyBurns

src/FluentAssertions.Mvc3/RedirectResultAssertions.cs

@@ -7,41 +7,42 @@
 
 namespace FluentAssertions.Mvc3
 {
-    public class RedirectResultAssertions : ReferenceTypeAssertions<RedirectResult, RedirectResultAssertions>
+    public class RedirectResultAssertions : ObjectAssertions
     {
-        public RedirectResultAssertions(RedirectResult subject)
-        {
-            Subject = subject;
-        }
+        public RedirectResultAssertions(RedirectResult subject) : base(subject) { }
 
-        public RedirectResultAssertions HaveUrl(string expectedUrl)
+        public RedirectResultAssertions WithUrl(string expectedUrl)
         {
-            HaveUrl(expectedUrl, string.Empty, null);
+            WithUrl(expectedUrl, string.Empty, null);
             return this;
         }
 
-        public RedirectResultAssertions HaveUrl(string expectedUrl, string reason, string reasonArgs)
+        public RedirectResultAssertions WithUrl(string expectedUrl, string reason, string reasonArgs)
         {
+            string actualUrl = (Subject as RedirectResult).Url;
+
             Execute.Verification
-                    .ForCondition(string.Equals(Subject.Url, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
+                    .ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected RedirectResult.Url to be '{0}' but was '{1}'", expectedUrl, Subject.Url);
+                    .FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl);
 
             return this;
         }
 
-        public RedirectResultAssertions HavePermanent(bool expectedPermanent)
+        public RedirectResultAssertions WithPermanent(bool expectedPermanent)
         {
-            HavePermanent(expectedPermanent, string.Empty, null);
+            WithPermanent(expectedPermanent, string.Empty, null);
             return this;
         }
 
-        public RedirectResultAssertions HavePermanent(bool expectedPermanent, string reason, string reasonArgs)
+        public RedirectResultAssertions WithPermanent(bool expectedPermanent, string reason, string reasonArgs)
         {
+            bool actualPermanent = (Subject as RedirectResult).Permanent;
+
             Execute.Verification
-                    .ForCondition(expectedPermanent == Subject.Permanent)
+                    .ForCondition(expectedPermanent == actualPermanent)
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected RedirectResult.Permanent to be '{0}' but was '{1}'", expectedPermanent, Subject.Permanent);
+                    .FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
 
             return this;
         }

tests/FluentAssertions.Mvc3.Tests/RedirectResultAssertions_Tests.cs

@@ -1,25 +1,50 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
 using System.Web.Mvc;
-using FluentAssertions.Mvc3;
+using NUnit.Framework;
 
 namespace FluentAssertions.Mvc3.Tests
 {
     [TestFixture]
     public class RedirectResultAssertions_Tests
     {
         [Test]
-        public void HaveUrl_GivenValidUrl_ShouldPass()
+        public void WithUrl_GivenExpectedUrl_ShouldPass()
+        {
+            ActionResult result = new RedirectResult("/abc");
+
+            result.Should().BeRedirect()
+                .WithUrl("/abc");
+        }
+
+        [Test]
+        public void WithUrl_GivenUnexpectedUrl_ShouldFail()
         {
             ActionResult result = new RedirectResult("/abc");
 
+            Action a = () => result.Should().BeRedirect()
+                    .WithUrl("/xyz");
+            a.ShouldThrow<Exception>()
+                    .WithMessage("Expected RedirectResult.Url to be \"/xyz\" but was \"/abc\"");
+        }
+
+        [Test]
+        public void WithPermanent_GivenExpectedUrl_ShouldPass()
+        {
+            ActionResult result = new RedirectResult("/abc", true);
+
             result.Should().BeRedirect()
-                .HaveUrl("/abc");
+                .WithPermanent(true);
         }
 
-#warning more tests!
+        [Test]
+        public void WithPermanent_GivenUnexpectedUrl_ShouldFail()
+        {
+            ActionResult result = new RedirectResult("/abc", true);
+
+            Action a = () => result.Should().BeRedirect()
+                    .WithPermanent(false);
+            a.ShouldThrow<Exception>()
+                    .WithMessage("Expected RedirectResult.Permanent to be False but was True");
+        }
     }
 }