diff --git a/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj b/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj index 8da0007..71231bc 100644 --- a/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj +++ b/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj @@ -49,9 +49,9 @@ ..\..\packages\EntityFramework.4.1.10331.0\lib\EntityFramework.dll - + False - ..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll False diff --git a/samples/FluentAssertions.Mvc3.Samples/packages.config b/samples/FluentAssertions.Mvc3.Samples/packages.config index 678a529..02e2ecd 100644 --- a/samples/FluentAssertions.Mvc3.Samples/packages.config +++ b/samples/FluentAssertions.Mvc3.Samples/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/FluentAssertions.Mvc3/ActionResultAssertions.cs b/src/FluentAssertions.Mvc3/ActionResultAssertions.cs index 16b714e..0667a4b 100644 --- a/src/FluentAssertions.Mvc3/ActionResultAssertions.cs +++ b/src/FluentAssertions.Mvc3/ActionResultAssertions.cs @@ -26,7 +26,7 @@ public ContentResultAssertions BeContentResult() public ContentResultAssertions BeContentResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(Subject is ContentResult) .FailWith(Constants.CommonFailMessage, typeof(ContentResult).Name, Subject.GetType().Name); @@ -41,7 +41,7 @@ public EmptyResult BeEmptyResult() public EmptyResult BeEmptyResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(Subject is EmptyResult) .FailWith(Constants.CommonFailMessage, typeof(EmptyResult).Name, Subject.GetType().Name); @@ -56,7 +56,7 @@ public RedirectToRouteAssertions BeRedirectToRouteResult() public RedirectToRouteAssertions BeRedirectToRouteResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(Subject is RedirectToRouteResult) .FailWith(Constants.CommonFailMessage, typeof(RedirectToRouteResult).Name, Subject.GetType().Name); @@ -71,7 +71,7 @@ public PartialViewResultAssertions BePartialViewResult() public PartialViewResultAssertions BePartialViewResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(Subject is PartialViewResult) .FailWith(Constants.CommonFailMessage, typeof(PartialViewResult).Name, Subject.GetType().Name); @@ -86,7 +86,7 @@ public RedirectResultAssertions BeRedirectResult() public RedirectResultAssertions BeRedirectResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(Subject is RedirectResult) .FailWith(Constants.CommonFailMessage, "RedirectResult", Subject.GetType().Name); @@ -101,7 +101,7 @@ public ViewResultAssertions BeViewResult() public ViewResultAssertions BeViewResult(string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition (Subject is ViewResult) .FailWith(Constants.CommonFailMessage, "ViewResult", Subject.GetType().Name); diff --git a/src/FluentAssertions.Mvc3/ContentResultAssertions.cs b/src/FluentAssertions.Mvc3/ContentResultAssertions.cs index 4fd63d7..774c7fa 100644 --- a/src/FluentAssertions.Mvc3/ContentResultAssertions.cs +++ b/src/FluentAssertions.Mvc3/ContentResultAssertions.cs @@ -24,7 +24,7 @@ public ContentResultAssertions WithContent(string expectedContent, string reason { string actualContent = (Subject as ContentResult).Content; - Execute.Verification + Execute.Assertion .ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase)) .BecauseOf(reason, reasonArgs) .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent)); @@ -42,7 +42,7 @@ public ContentResultAssertions WithContentType(string expectedContent, string re { string actualContentType = (Subject as ContentResult).ContentType; - Execute.Verification + Execute.Assertion .ForCondition(string.Equals(expectedContent, actualContentType, StringComparison.InvariantCultureIgnoreCase)) .BecauseOf(reason, reasonArgs) .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContent, actualContentType)); @@ -60,7 +60,7 @@ public ContentResultAssertions WithContentEncoding(Encoding expectedEncoding, st { Encoding actualContentEncoding = (Subject as ContentResult).ContentEncoding; - Execute.Verification + Execute.Assertion .ForCondition(expectedEncoding == actualContentEncoding) .BecauseOf(reason, reasonArgs) .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedEncoding.ToString(), actualContentEncoding.ToString())); diff --git a/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj b/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj index bdcbc70..12a4540 100644 --- a/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj +++ b/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj @@ -44,9 +44,9 @@ ..\..\bin\Release\FluentAssertions.Mvc3.XML - + False - ..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll @@ -83,15 +83,15 @@ - - - ResXFileCodeGenerator FailureMessages.Designer.cs + + + \ No newline at end of file diff --git a/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.nuspec b/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.nuspec index cfc5e4d..d1286a0 100644 --- a/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.nuspec +++ b/src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.nuspec @@ -6,15 +6,15 @@ $version$ Casey Burns, Kevin Kuszyk Casey Burns, Kevin Kuszyk - http://raw.github.com/kevinkuszyk/FluentAssertions.MVC/master/license.txt - http://github.com/CaseyBurns/FluentAssertions.MVC + http://fluentassertionsmvc.codeplex.com/license + http://fluentassertionsmvc.codeplex.com false - A set of extensions to the Fluent Assertions framework to enable more expressive testing of the MVC applications. + FluentAssertions MVC is a set of MVC focused assertions and helper extensions to the excellent FluentAssertions library. Initial release. Copyright 2013 TDD, TDD, Fluent, Mvc, AspNetMvc - + \ No newline at end of file diff --git a/src/FluentAssertions.Mvc3/RedirectResultAssertions.cs b/src/FluentAssertions.Mvc3/RedirectResultAssertions.cs index 6237b52..78aaef4 100644 --- a/src/FluentAssertions.Mvc3/RedirectResultAssertions.cs +++ b/src/FluentAssertions.Mvc3/RedirectResultAssertions.cs @@ -22,7 +22,7 @@ public RedirectResultAssertions WithUrl(string expectedUrl, string reason, strin { string actualUrl = (Subject as RedirectResult).Url; - Execute.Verification + Execute.Assertion .ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase)) .BecauseOf(reason, reasonArgs) .FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl); @@ -40,7 +40,7 @@ public RedirectResultAssertions WithPermanent(bool expectedPermanent, string rea { bool actualPermanent = (Subject as RedirectResult).Permanent; - Execute.Verification + Execute.Assertion .ForCondition(expectedPermanent == actualPermanent) .BecauseOf(reason, reasonArgs) .FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent); diff --git a/src/FluentAssertions.Mvc3/RedirectToRouteAssertions.cs b/src/FluentAssertions.Mvc3/RedirectToRouteAssertions.cs index 46b101c..e0d5070 100644 --- a/src/FluentAssertions.Mvc3/RedirectToRouteAssertions.cs +++ b/src/FluentAssertions.Mvc3/RedirectToRouteAssertions.cs @@ -24,7 +24,7 @@ public RedirectToRouteAssertions WithPermanent(bool expectedPermanent) public RedirectToRouteAssertions WithPermanent(bool expectedPermanent, string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(expectedPermanent == Subject.Permanent) .FailWith("Expected RedirectToRoute.Permanent to be {0}{reason}, but found {1}", expectedPermanent, Subject.Permanent); @@ -39,7 +39,7 @@ public RedirectToRouteAssertions WithRouteName(string expectedRouteName) public RedirectToRouteAssertions WithRouteName(string expectedRouteName, string reason, params object[] reasonArgs) { - Execute.Verification + Execute.Assertion .BecauseOf(reason, reasonArgs) .ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.InvariantCultureIgnoreCase)) .FailWith("Expected RedirectToRoute.RouteName to be {0}{reason}, but found {1}", expectedRouteName, Subject.RouteName); @@ -94,5 +94,13 @@ public RedirectToRouteAssertions WithArea(string expectedArea, string reason, pa WithRouteValue("Area", expectedArea, reason, reasonArgs); return this; } + + /// + /// Returns the type of the subject the assertion applies on. + /// + protected override string Context + { + get { return "RedirectToRouteResult"; } + } } } diff --git a/src/FluentAssertions.Mvc3/RouteDataAssertions.cs b/src/FluentAssertions.Mvc3/RouteDataAssertions.cs index e12557b..73675df 100644 --- a/src/FluentAssertions.Mvc3/RouteDataAssertions.cs +++ b/src/FluentAssertions.Mvc3/RouteDataAssertions.cs @@ -53,14 +53,14 @@ public RouteDataAssertions HaveDataToken(string key, object expectedValue, strin { var subjectTyped = Subject as RouteData; - Execute.Verification + Execute.Assertion .ForCondition(subjectTyped.DataTokens.ContainsKey(key)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.RouteData_DataTokens_ContainsKey, key); var actualValue = subjectTyped.DataTokens[key]; - Execute.Verification + Execute.Assertion .ForCondition(expectedValue.Equals(actualValue)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.RouteData_DataTokens_HaveValue, key, expectedValue, actualValue); @@ -78,14 +78,14 @@ public RouteDataAssertions HaveValue(string key, object expectedValue, string re { var subjectTyped = Subject as RouteData; - Execute.Verification + Execute.Assertion .ForCondition(subjectTyped.Values.ContainsKey(key)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.RouteData_Values_ContainsKey, key); var actualValue = subjectTyped.Values[key]; - Execute.Verification + Execute.Assertion .ForCondition(expectedValue.Equals(actualValue)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.RouteData_Values_HaveValue, key, expectedValue, actualValue); diff --git a/src/FluentAssertions.Mvc3/ViewResultAssertions.cs b/src/FluentAssertions.Mvc3/ViewResultAssertions.cs index e4e32b7..5fa0fde 100644 --- a/src/FluentAssertions.Mvc3/ViewResultAssertions.cs +++ b/src/FluentAssertions.Mvc3/ViewResultAssertions.cs @@ -20,7 +20,7 @@ public ViewResultAssertions WithMasterName(string expectedMasterName, string rea { string actualMasterName = (Subject as ViewResult).MasterName; - Execute.Verification + Execute.Assertion .ForCondition(string.Equals(expectedMasterName, actualMasterName, StringComparison.InvariantCultureIgnoreCase)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.ViewResult_MasterName, expectedMasterName, actualMasterName); diff --git a/src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs b/src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs index a540ecb..a1914fb 100644 --- a/src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs +++ b/src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs @@ -28,7 +28,7 @@ public ViewResultBaseAssertions WithViewName(string expectedViewName, string { string actualViewName = (Subject as ViewResultBase).ViewName; - Execute.Verification + Execute.Assertion .ForCondition(string.Equals(expectedViewName, actualViewName, StringComparison.InvariantCultureIgnoreCase)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.ViewResultBase_ViewName, expectedViewName, actualViewName); @@ -45,14 +45,14 @@ public ViewResultBaseAssertions WithViewData(string key, object expectedValue { ViewDataDictionary actualViewData = (Subject as ViewResultBase).ViewData; - Execute.Verification + Execute.Assertion .ForCondition(actualViewData.ContainsKey(key)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.ViewResultBase_ViewData_ContainsKey, key); var actualValue = actualViewData[key]; - Execute.Verification + Execute.Assertion .ForCondition(actualValue.Equals(expectedValue)) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.ViewResultBase_ViewData_HaveValue, key, expectedValue, actualValue); @@ -70,7 +70,7 @@ public ViewResultBaseAssertions WithTempData(string key, object expectedValue { TempDataDictionary actualTempData = (Subject as ViewResultBase).TempData; - Execute.Verification + Execute.Assertion .ForCondition(actualTempData.ContainsKey(key)) .BecauseOf(reason, reasonArgs) .FailWith("TempData does not contain key of '{0}'", key); @@ -94,9 +94,9 @@ public TModel ModelAs() object model = (Subject as ViewResultBase).Model; if (model == null) - Execute.Verification.FailWith(FailureMessages.ViewResultBase_NullModel, typeof(TModel).Name); + Execute.Assertion.FailWith(FailureMessages.ViewResultBase_NullModel, typeof(TModel).Name); - Execute.Verification + Execute.Assertion .ForCondition(model is TModel) .FailWith("Expected Model to be of type '{0}' but was '{1}'", typeof(TModel).Name, model.GetType().Name); @@ -113,7 +113,7 @@ public ViewResultBaseAssertions WithDefaultViewName(string reason, params obj { string viewName = (Subject as ViewResultBase).ViewName; - Execute.Verification + Execute.Assertion .ForCondition(viewName == string.Empty) .BecauseOf(reason, reasonArgs) .FailWith(FailureMessages.ViewResultBase_WithDefaultViewName, viewName); diff --git a/src/FluentAssertions.Mvc3/packages.config b/src/FluentAssertions.Mvc3/packages.config index a124a98..30d78f5 100644 --- a/src/FluentAssertions.Mvc3/packages.config +++ b/src/FluentAssertions.Mvc3/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj b/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj index 1b4db1b..34e3261 100644 --- a/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj +++ b/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj @@ -32,8 +32,9 @@ 4 - - ..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll + + False + ..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll diff --git a/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.nuspec b/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.nuspec index 1403fb8..7297785 100644 --- a/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.nuspec +++ b/src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.nuspec @@ -6,15 +6,15 @@ $version$ Casey Burns, Kevin Kuszyk Casey Burns, Kevin Kuszyk - http://raw.github.com/kevinkuszyk/FluentAssertions.MVC/master/license.txt - http://github.com/CaseyBurns/FluentAssertions.MVC + http://fluentassertionsmvc.codeplex.com/license + http://fluentassertionsmvc.codeplex.com false - A set of extensions to the Fluent Assertions framework to enable more expressive testing of the MVC applications. + FluentAssertions MVC is a set of MVC focused assertions and helper extensions to the excellent FluentAssertions library. Initial release. Copyright 2013 TDD, TDD, Fluent, Mvc, AspNetMvc - + \ No newline at end of file diff --git a/src/FluentAssertions.Mvc4/packages.config b/src/FluentAssertions.Mvc4/packages.config index a124a98..30d78f5 100644 --- a/src/FluentAssertions.Mvc4/packages.config +++ b/src/FluentAssertions.Mvc4/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 0052f2e..0ea685b 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -6,4 +6,4 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.1.1")] \ No newline at end of file diff --git a/tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj b/tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj index 88ac824..d5e37f8 100644 --- a/tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj +++ b/tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj @@ -33,9 +33,9 @@ TRACE;DEBUG - + False - ..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll @@ -64,14 +64,14 @@ - - - {53589F79-0908-409A-8366-3E18DC637600} FluentAssertions.Mvc3 + + + \ No newline at end of file diff --git a/tests/FluentAssertions.Mvc3.Tests/packages.config b/tests/FluentAssertions.Mvc3.Tests/packages.config index a124a98..30d78f5 100644 --- a/tests/FluentAssertions.Mvc3.Tests/packages.config +++ b/tests/FluentAssertions.Mvc3.Tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/tests/FluentAssertions.Mvc4.Tests/FluentAssertions.Mvc4.Tests.csproj b/tests/FluentAssertions.Mvc4.Tests/FluentAssertions.Mvc4.Tests.csproj index 151b35e..44e5320 100644 --- a/tests/FluentAssertions.Mvc4.Tests/FluentAssertions.Mvc4.Tests.csproj +++ b/tests/FluentAssertions.Mvc4.Tests/FluentAssertions.Mvc4.Tests.csproj @@ -33,8 +33,9 @@ 4 - - ..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll + + False + ..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll False @@ -64,6 +65,9 @@ Helpers\FailureMessageHelper.cs + + PartialViewResultAssertions_Tests.cs + RedirectResultAssertions_Tests.cs diff --git a/tests/FluentAssertions.Mvc4.Tests/packages.config b/tests/FluentAssertions.Mvc4.Tests/packages.config index a124a98..30d78f5 100644 --- a/tests/FluentAssertions.Mvc4.Tests/packages.config +++ b/tests/FluentAssertions.Mvc4.Tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file