More ViewResult assertions

Author: CaseyBurns

src/FluentAssertions.Mvc.Tests/ControllerAssertions_Tests.cs

@@ -21,13 +21,27 @@ public void BeView_GivenViewResultWithExpectedName_ShouldPass ()
 			var controller = new FakeController (new ViewResult { ViewName = "Index"});
 			controller.Index ().Should ().BeView ();
 		}
-		
+			
 		[Test]
 		public void BeView_GivenRedirection_ShouldFail ()
 		{
 			var controller = new FakeController (new RedirectResult ("/"));
 			Action action = () => controller.Index ().Should ().BeView ();
-			action.ShouldThrow<AssertionException> ().WithMessage ("Expected ActionResult to be ViewResult but was \"RedirectResult\"");
+			action.ShouldThrow<AssertionException> ();
+		}
+		
+		[Test]
+		public void a ()
+		{
+			var controller = new FakeController (new ViewResult { ViewName = "Index"});
+			controller.Index ().Should ().BeView ().WithViewName ("Index");
+		}
+
+		[Test]
+		public void b ()
+		{
+			var controller = new FakeController (new ViewResult { ViewName = "Index", MasterName="Fake"});
+			controller.Index ().Should ().BeView ().WithViewName ("Index").WithControllerName ("Fake");
 		}
 	}
 }

src/FluentAssertions.Mvc.Tests/Fakes/FakeController.cs

@@ -12,7 +12,7 @@ public FakeController (ActionResult indexResult)
 			_indexResult = indexResult;
 		}
 
-		public ActionResult Index()
+		public ActionResult Index ()
 		{
 			return _indexResult;
 		}

src/FluentAssertions.Mvc.userprefs

@@ -1,14 +1,20 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="FluentAssertions.Mvc.Tests\ControllerAssertions_Tests.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="FluentAssertions.Mvc3\ViewResultAndConstraint.cs">
     <Files>
-      <File FileName="FluentAssertions.Mvc.Tests\ControllerAssertions_Tests.cs" Line="5" Column="1" />
+      <File FileName="FluentAssertions.Mvc.Tests\ControllerAssertions_Tests.cs" Line="45" Column="4" />
+      <File FileName="d:\Development\FluentAssertions.MVC\src\FluentAssertions.Mvc3\AssertionsExtensions.cs" Line="16" Column="1" />
+      <File FileName="FluentAssertions.Mvc3\ActionResultAssertions.cs" Line="31" Column="4" />
+      <File FileName="FluentAssertions.Mvc.Tests\Fakes\FakeController.cs" Line="21" Column="1" />
+      <File FileName="FluentAssertions.Mvc3\ViewResultAndConstraint.cs" Line="1" Column="14" />
+      <File FileName="FluentAssertions.Mvc3\ControllerAssertions.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Option id="ShowAllFiles" value="False" />
           <Option id="ShowVersionControlOverlays" value="True" />
+          <Node name="FluentAssertions.Mvc.Tests" expanded="True" />
           <Node name="FluentAssertions.Mvc3" expanded="True" selected="True" />
         </State>
       </Pad>
@@ -19,7 +25,17 @@
         <State />
       </Pad>
       <Pad Id="MonoDevelop.NUnit.TestPad">
-        <State expanded="True" selected="True" />
+        <State expanded="True" selected="True">
+          <Node name="FluentAssertions.Mvc.Tests" expanded="True">
+            <Node name="FluentAssertions" expanded="True">
+              <Node name="Mvc" expanded="True">
+                <Node name="Tests" expanded="True">
+                  <Node name="ActionResultAssertions_Tests" expanded="True" />
+                </Node>
+              </Node>
+            </Node>
+          </Node>
+        </State>
       </Pad>
     </Pads>
   </MonoDevelop.Ide.Workbench>

src/FluentAssertions.Mvc3/ActionResultAndConstraint.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Web.Mvc;
+
+namespace FluentAssertions.Mvc
+{
+	public class ActionResultAndConstraint : AndConstraint<ActionResult>
+	{
+		public ActionResultAndConstraint (ActionResult subject) : base(subject)
+		{
+		}
+		
+		public ActionResultAndConstraint WithViewName (string viewName)
+		{
+			throw new NotImplementedException ();
+			return this;
+		}
+		
+		public ActionResultAndConstraint WithViewName (string viewName, string reason, params object[] reasonArgs)
+		{
+			return this;
+		}
+		
+		public ActionResultAndConstraint WithControllerName (string viewName)
+		{
+			throw new NotImplementedException ();
+			return this;
+		}
+		
+		public ActionResultAndConstraint WithControllerName (string viewName, string reason, params object[] reasonArgs)
+		{
+			throw new NotImplementedException ();
+			return this;
+		}		
+	}
+}
+

src/FluentAssertions.Mvc3/ActionResultAssertions.cs

@@ -11,20 +11,20 @@ public ActionResultAssertions (ActionResult subject)
 			Subject = subject;
 		}
 
-		public AndConstraint<ActionResultAssertions> BeView ()
+		public ActionResultAndConstraint BeView ()
 		{
 			var andConstraint = BeView (string.Empty, new object[] { });
 			return andConstraint;
 		}
 
-		public AndConstraint<ActionResultAssertions> BeView (string reason, params object [] reasonArgs)
+		public ActionResultAndConstraint BeView (string reason, params object [] reasonArgs)
 		{
 			Execute.Verification
 					.ForCondition (Subject is ViewResult)
 					.BecauseOf (reason, reasonArgs)
 					.FailWith ("Expected ActionResult to be View but was {0}", Subject.GetType ().Name);
 
-			return new AndConstraint<ActionResultAssertions> (this);
-		}		
+			return new ActionResultAndConstraint (Subject);
+		}
 	}
 }

src/FluentAssertions.Mvc3/AssertionFailureReasons.resources

@@ -0,0 +1 @@
+

src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj

@@ -19,6 +19,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <GenerateDocumentation>true</GenerateDocumentation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -34,7 +35,6 @@
     <Reference Include="System" />
     <Reference Include="FluentAssertions">
       <HintPath>..\..\lib\FluentAssertions.1.7.0\Lib\net40\FluentAssertions.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <Private>False</Private>
@@ -49,7 +49,10 @@
     <Compile Include="AssertionsExtensions.cs" />
     <Compile Include="ControllerAssertions.cs" />
     <Compile Include="ActionResultAssertions.cs" />
-    <Compile Include="ViewResultAndConstraint.cs" />
+    <Compile Include="ActionResultAndConstraint.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <EmbeddedResource Include="AssertionFailureReasons.resources" />
+  </ItemGroup>
 </Project>