Skip to content

Upgrade Fluent Assertions to v2.1 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 29, 2013
Merged

Upgrade Fluent Assertions to v2.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
549a770
License and project site urls updated.
kevinkuszyk Feb 15, 2013
d577d4d
Added missing PartialViewResultAssertions tests to MVC4 project.
kevinkuszyk Feb 15, 2013
bc85366
Nuget package updated to limit Fluent Assertions dependency to < 2.1.
kevinkuszyk Aug 28, 2013
11e383f
Version bumped to 0.1.1.
kevinkuszyk Aug 28, 2013
b5edc1d
Upgraded Fluent Assertions to v2.1 and fixed breaking changed where E…
kevinkuszyk Aug 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
<Reference Include="EntityFramework">
<HintPath>..\..\packages\EntityFramework.4.1.10331.0\lib\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/FluentAssertions.Mvc3.Samples/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="4.1.10331.0" />
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
<package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
<package id="jQuery" version="1.5.1" />
<package id="jQuery.UI.Combined" version="1.8.11" />
<package id="jQuery.Validation" version="1.8.0" />
Expand Down
12 changes: 6 additions & 6 deletions src/FluentAssertions.Mvc3/ActionResultAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/FluentAssertions.Mvc3/ContentResultAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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));
Expand All @@ -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()));
Expand Down
10 changes: 5 additions & 5 deletions src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<DocumentationFile>..\..\bin\Release\FluentAssertions.Mvc3.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
Expand Down Expand Up @@ -83,15 +83,15 @@
<Compile Include="ViewResultAssertions.cs" />
<Compile Include="ViewResultBaseAssertions.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FailureMessages.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>FailureMessages.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>
8 changes: 4 additions & 4 deletions src/FluentAssertions.Mvc3/FluentAssertions.Mvc3.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<version>$version$</version>
<authors>Casey Burns, Kevin Kuszyk</authors>
<owners>Casey Burns, Kevin Kuszyk</owners>
<licenseUrl>http://raw.github.com/kevinkuszyk/FluentAssertions.MVC/master/license.txt</licenseUrl>
<projectUrl>http://github.com/CaseyBurns/FluentAssertions.MVC</projectUrl>
<licenseUrl>http://fluentassertionsmvc.codeplex.com/license</licenseUrl>
<projectUrl>http://fluentassertionsmvc.codeplex.com</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A set of extensions to the Fluent Assertions framework to enable more expressive testing of the MVC applications.</description>
<description>FluentAssertions MVC is a set of MVC focused assertions and helper extensions to the excellent FluentAssertions library.</description>
<releaseNotes>Initial release.</releaseNotes>
<copyright>Copyright 2013</copyright>
<tags>TDD, TDD, Fluent, Mvc, AspNetMvc</tags>
<dependencies>
<dependency id="FluentAssertions" version="2.0.0.1" />
<dependency id="FluentAssertions" version="[2.0.0.1,2.1)" />
</dependencies>
</metadata>
</package>
4 changes: 2 additions & 2 deletions src/FluentAssertions.Mvc3/RedirectResultAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
12 changes: 10 additions & 2 deletions src/FluentAssertions.Mvc3/RedirectToRouteAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -94,5 +94,13 @@ public RedirectToRouteAssertions WithArea(string expectedArea, string reason, pa
WithRouteValue("Area", expectedArea, reason, reasonArgs);
return this;
}

/// <summary>
/// Returns the type of the subject the assertion applies on.
/// </summary>
protected override string Context
{
get { return "RedirectToRouteResult"; }
}
}
}
8 changes: 4 additions & 4 deletions src/FluentAssertions.Mvc3/RouteDataAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/FluentAssertions.Mvc3/ViewResultAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public ViewResultBaseAssertions<T> 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);
Expand All @@ -45,14 +45,14 @@ public ViewResultBaseAssertions<T> 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);
Expand All @@ -70,7 +70,7 @@ public ViewResultBaseAssertions<T> 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);
Expand All @@ -94,9 +94,9 @@ public TModel ModelAs<TModel>()
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);

Expand All @@ -113,7 +113,7 @@ public ViewResultBaseAssertions<T> 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);
Expand Down
2 changes: 1 addition & 1 deletion src/FluentAssertions.Mvc3/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
<package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
</packages>
5 changes: 3 additions & 2 deletions src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions">
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
<Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
8 changes: 4 additions & 4 deletions src/FluentAssertions.Mvc4/FluentAssertions.Mvc4.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<version>$version$</version>
<authors>Casey Burns, Kevin Kuszyk</authors>
<owners>Casey Burns, Kevin Kuszyk</owners>
<licenseUrl>http://raw.github.com/kevinkuszyk/FluentAssertions.MVC/master/license.txt</licenseUrl>
<projectUrl>http://github.com/CaseyBurns/FluentAssertions.MVC</projectUrl>
<licenseUrl>http://fluentassertionsmvc.codeplex.com/license</licenseUrl>
<projectUrl>http://fluentassertionsmvc.codeplex.com</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A set of extensions to the Fluent Assertions framework to enable more expressive testing of the MVC applications.</description>
<description>FluentAssertions MVC is a set of MVC focused assertions and helper extensions to the excellent FluentAssertions library.</description>
<releaseNotes>Initial release.</releaseNotes>
<copyright>Copyright 2013</copyright>
<tags>TDD, TDD, Fluent, Mvc, AspNetMvc</tags>
<dependencies>
<dependency id="FluentAssertions" version="2.0.0.1" />
<dependency id="FluentAssertions" version="[2.0.0.1,2.1)" />
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion src/FluentAssertions.Mvc4/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
<package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion src/SolutionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyVersion("0.1.1")]
10 changes: 5 additions & 5 deletions tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
<HintPath>..\..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Web" />
Expand Down Expand Up @@ -64,14 +64,14 @@
<Compile Include="ViewResultAssertions_Tests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\FluentAssertions.Mvc3\FluentAssertions.Mvc3.csproj">
<Project>{53589F79-0908-409A-8366-3E18DC637600}</Project>
<Name>FluentAssertions.Mvc3</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>
Loading