Changed the library to be a part of TestStack

robdmoore · robdmoore · commit d2d8f8e26a6f · 2012-12-31T11:50:45.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ _ReSharper*
 *.log
 */NUnit*/tools
 */NhibernateProfiler*/tools
-packages
+packages
+*.DotSettings
diff --git a/FluentMVCTesting/robdmoore.snk b/FluentMVCTesting/robdmoore.snk
diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
-﻿Fluent MVC Testing
+﻿TestStack.FluentMVCTesting
 ====================================
 
-This library provides a fluent interface for creating terse and expressive tests against ASP.NET MVC controllers.
+This library provides a fluent interface for creating terse and expressive tests against ASP.NET MVC controllers. This library is part of [TestStack](http://teststack.github.com/).
 
 This library is testing framework agnostic, so you can combine it with the testing library of your choice (e.g. NUnit, xUnit, etc.).
 
 The library is compatible with the AAA testing methodology, although it combines the Act and Assert parts together (but you can also have other assertions after the Fluent assertion). See the code examples below for more information.
 
-The motivation behind this library is to provide a way to test MVC actions quickly, tersely and maintainably. Most examples I find on MVC controller testing are incredibly verbose, repetitive and time-consuming to write and maintain. Given how quickly you can write controller actions and how simple they are (assuming you are following best practices and keeping them lean) the time to test them generally isn't worth it given you can glance at most of your controller actions and know they are right or wrong instantly. This library aims to make the time to implement the tests inconsequential and then the value your tests are providing is worth it. The other problem that I've noticed with most examples of controller testing is that there are a lot of magic strings being used to test view and action names; this library also aims to (where possible) utilise the type system to resolve a lot of those magic strings, thus ensuring your tests are more maintainable and require less re-work when you perform major refactoring of your code.
+The motivation behind this library is to provide a way to test MVC actions quickly, tersely and maintainably. Most examples we find on MVC controller testing are incredibly verbose, repetitive and time-consuming to write and maintain. Given how quickly you can write controller actions and how simple they are (assuming you are following best practices and keeping them lean) the time to test them generally isn't worth it given you can glance at most of your controller actions and know they are right or wrong instantly. This library aims to make the time to implement the tests inconsequential and then the value your tests are providing is worth it. The other problem that we've noticed with most examples of controller testing is that there are a lot of magic strings being used to test view and action names; this library also aims to (where possible) utilise the type system to resolve a lot of those magic strings, thus ensuring your tests are more maintainable and require less re-work when you perform major refactoring of your code.
 
-I came up with this library after using the [MVCContrib.TestHelper](http://mvccontrib.codeplex.com/wikipage?title=TestHelper) library for quite a while, but becoming frustrated with it; the library was initially created during an [experiment I conducted](http://robdmoore.id.au/blog/2011/03/14/terse-controller-testing-with-asp-net-mvc/) to try and create terse controller tests. I (and my team) have been using the library for over a year on a number of projects for the company that I work for.
+This library was inspired by the [MVCContrib.TestHelper](http://mvccontrib.codeplex.com/wikipage?title=TestHelper) library.
 
 Installation
 ------------
@@ -18,11 +18,11 @@ You can install this library using NuGet into your Test Library; it will automat
 
 If you are using ASP.NET MVC 4 then:
 
-    Install-Package FluentMVCTesting
+    Install-Package TestStack.FluentMVCTesting
 
 If you are using ASP.NET MVC 3 then:
 
-    Install-Package FluentMVCTesting.Mvc3
+    Install-Package TestStack.FluentMVCTesting.Mvc3
 
 Known Issues
 ------------
@@ -162,7 +162,7 @@ If you are redirecting to an action in another controller, then there are two sy
     // Or, if you want to check a partial is returned
     _controller.WithCallTo(c => c.Index()).ShouldRenderPartialView("ViewName");
 
-Unfortunately, I couldn't think of a way to get rid of the magic strings here so where possible use the default ones above.
+Unfortunately, we couldn't think of a way to get rid of the magic strings here so where possible use the default ones above.
 
 See below for model testing.
 
@@ -264,4 +264,4 @@ You can chain the error property checks after any of these checks (you can only
 Any questions, comments or additions?
 --------------------------
 
-Leave an issue on the GitHub project or a comment on my [blog](http://robdmoore.id.au/blog/2012/05/29/fluentmvctesting-fluent-terse-and-maintainable-asp-net-mvc-controller-testing/). Also, feel free to send through a pull request.
+Leave an issue on the [GitHub project](https://github.com/TestStack/TestStack.FluentMVCTesting/issues) or send a [pull request](https://github.com/TestStack/TestStack.FluentMVCTesting/pulls).
diff --git a/TestStack.FluentMVCTesting.Mvc3/FluentMVCTesting.Mvc3.nuspec b/TestStack.FluentMVCTesting.Mvc3/FluentMVCTesting.Mvc3.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>
-       FluentMVCTesting.Mvc3
+       TestStack.FluentMVCTesting.Mvc3
     </id>
     <version>
        1.0.0
@@ -11,7 +11,8 @@
        Robert Moore
     </authors>
     <description>
-       Fluent library for testing ASP.NET MVC controllers. ASP.NET MVC 3 version; install FluentMVCTesting if you are using MVC4.
+      Simple, terse, fluent unit testing of ASP.NET MVC Controllers.
+      ASP.NET MVC 3 version; install FluentMVCTesting if you are using MVC4.
     </description>
     <projectUrl>
        http://github.com/robdmoore/FluentMVCTesting
diff --git a/TestStack.FluentMVCTesting.Mvc3/Properties/AssemblyInfo.cs b/TestStack.FluentMVCTesting.Mvc3/Properties/AssemblyInfo.cs
diff --git a/TestStack.FluentMVCTesting.Mvc3/TestStack.FluentMVCTesting.Mvc3.csproj b/TestStack.FluentMVCTesting.Mvc3/TestStack.FluentMVCTesting.Mvc3.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{17E643B6-0448-4E6F-A8D8-D726154D73E1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FluentMVCTesting</RootNamespace>
-    <AssemblyName>FluentMVCTesting.Mvc3</AssemblyName>
+    <RootNamespace>TestStack.FluentMVCTesting</RootNamespace>
+    <AssemblyName>TestStack.FluentMVCTesting.Mvc3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -36,7 +36,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\FluentMvcTesting\robdmoore.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\TestStack.FluentMvcTesting\TestStack.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -77,29 +77,29 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\FluentMvcTesting\ControllerExtensions.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\ControllerExtensions.cs">
       <Link>ControllerExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\FluentMvcTesting\ControllerResultTest.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\ControllerResultTest.cs">
       <Link>ControllerResultTest.cs</Link>
     </Compile>
-    <Compile Include="..\FluentMvcTesting\Exceptions.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\Exceptions.cs">
       <Link>Exceptions.cs</Link>
     </Compile>
-    <Compile Include="..\FluentMvcTesting\ModelErrorTest.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\ModelErrorTest.cs">
       <Link>ModelErrorTest.cs</Link>
     </Compile>
-    <Compile Include="..\FluentMvcTesting\ModelTest.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\ModelTest.cs">
       <Link>ModelTest.cs</Link>
     </Compile>
-    <Compile Include="..\FluentMvcTesting\ViewResultTest.cs">
+    <Compile Include="..\TestStack.FluentMvcTesting\ViewResultTest.cs">
       <Link>ViewResultTest.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\FluentMvcTesting\robdmoore.snk">
-      <Link>robdmoore.snk</Link>
+    <None Include="..\TestStack.FluentMvcTesting\TestStack.snk">
+      <Link>TestStack.snk</Link>
     </None>
     <None Include="FluentMVCTesting.Mvc3.nuspec" />
     <None Include="packages.config" />
diff --git a/TestStack.FluentMVCTesting.Mvc3/packages.config b/TestStack.FluentMVCTesting.Mvc3/packages.config
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerExtensionsTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerExtensionsTests.cs
@@ -1,7 +1,7 @@
-﻿using FluentMVCTesting.Tests.TestControllers;
-using NUnit.Framework;
+﻿using NUnit.Framework;
+using TestStack.FluentMVCTesting.Tests.TestControllers;
 
-namespace FluentMVCTesting.Tests
+namespace TestStack.FluentMVCTesting.Tests
 {
     [TestFixture]
     class ControllerExtensionsShould
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs
@@ -3,10 +3,10 @@
 using System.Linq.Expressions;
 using System.Net;
 using System.Web.Mvc;
-using FluentMVCTesting.Tests.TestControllers;
 using NUnit.Framework;
+using TestStack.FluentMVCTesting.Tests.TestControllers;
 
-namespace FluentMVCTesting.Tests
+namespace TestStack.FluentMVCTesting.Tests
 {
     [TestFixture]
     class ControllerResultTestShould
diff --git a/TestStack.FluentMVCTesting.Tests/ModelErrorTestTests.cs b/TestStack.FluentMVCTesting.Tests/ModelErrorTestTests.cs
@@ -5,7 +5,7 @@
 using NSubstitute;
 using NUnit.Framework;
 
-namespace FluentMVCTesting.Tests
+namespace TestStack.FluentMVCTesting.Tests
 {
     class ModelErrorTestMetadata : Tuple<string, string, string, ModelErrorTestCall>
     {
diff --git a/TestStack.FluentMVCTesting.Tests/ModelTestTests.cs b/TestStack.FluentMVCTesting.Tests/ModelTestTests.cs
@@ -1,6 +1,6 @@
 ﻿using NUnit.Framework;
 
-namespace FluentMVCTesting.Tests
+namespace TestStack.FluentMVCTesting.Tests
 {
     [TestFixture]
     class ModelTestShould
diff --git a/TestStack.FluentMVCTesting.Tests/Properties/AssemblyInfo.cs b/TestStack.FluentMVCTesting.Tests/Properties/AssemblyInfo.cs
diff --git a/TestStack.FluentMVCTesting.Tests/TestControllers/ControllerExtensionsController.cs b/TestStack.FluentMVCTesting.Tests/TestControllers/ControllerExtensionsController.cs
@@ -1,6 +1,6 @@
 ﻿using System.Web.Mvc;
 
-namespace FluentMVCTesting.Tests.TestControllers
+namespace TestStack.FluentMVCTesting.Tests.TestControllers
 {
     class ControllerExtensionsController : Controller
     {
diff --git a/TestStack.FluentMVCTesting.Tests/TestControllers/ControllerResultTestController.cs b/TestStack.FluentMVCTesting.Tests/TestControllers/ControllerResultTestController.cs
@@ -1,6 +1,6 @@
 ﻿using System.Web.Mvc;
 
-namespace FluentMVCTesting.Tests.TestControllers
+namespace TestStack.FluentMVCTesting.Tests.TestControllers
 {
     class ControllerResultTestController : Controller
     {
diff --git a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{4DCC907C-A08A-4139-BB6B-2D34B21F318B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FluentMVCTesting.Tests</RootNamespace>
-    <AssemblyName>FluentMVCTesting.Tests</AssemblyName>
+    <RootNamespace>TestStack.FluentMVCTesting.Tests</RootNamespace>
+    <AssemblyName>TestStack.FluentMVCTesting.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -90,9 +90,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FluentMVCTesting\FluentMVCTesting.csproj">
+    <ProjectReference Include="..\TestStack.FluentMVCTesting\TestStack.FluentMVCTesting.csproj">
       <Project>{152CA00F-18D3-4CF5-8CA0-2C5B70CBEA19}</Project>
-      <Name>FluentMVCTesting</Name>
+      <Name>TestStack.FluentMVCTesting</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/TestStack.FluentMVCTesting.Tests/ViewResultTestTests.cs b/TestStack.FluentMVCTesting.Tests/ViewResultTestTests.cs
@@ -1,7 +1,7 @@
 ﻿using System.Web.Mvc;
 using NUnit.Framework;
 
-namespace FluentMVCTesting.Tests
+namespace TestStack.FluentMVCTesting.Tests
 {
     [TestFixture]
     class ViewResultTestShould
diff --git a/TestStack.FluentMVCTesting.Tests/packages.config b/TestStack.FluentMVCTesting.Tests/packages.config
diff --git a/TestStack.FluentMVCTesting.sln b/TestStack.FluentMVCTesting.sln
@@ -1,11 +1,11 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentMVCTesting", "FluentMVCTesting\FluentMVCTesting.csproj", "{152CA00F-18D3-4CF5-8CA0-2C5B70CBEA19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting", "TestStack.FluentMVCTesting\TestStack.FluentMVCTesting.csproj", "{152CA00F-18D3-4CF5-8CA0-2C5B70CBEA19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentMVCTesting.Tests", "FluentMVCTesting.Tests\FluentMVCTesting.Tests.csproj", "{4DCC907C-A08A-4139-BB6B-2D34B21F318B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting.Tests", "TestStack.FluentMVCTesting.Tests\TestStack.FluentMVCTesting.Tests.csproj", "{4DCC907C-A08A-4139-BB6B-2D34B21F318B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentMVCTesting.Mvc3", "FluentMVCTesting.Mvc3\FluentMVCTesting.Mvc3.csproj", "{17E643B6-0448-4E6F-A8D8-D726154D73E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting.Mvc3", "TestStack.FluentMVCTesting.Mvc3\TestStack.FluentMVCTesting.Mvc3.csproj", "{17E643B6-0448-4E6F-A8D8-D726154D73E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{21EA5DD6-9360-4966-AE7C-FC2329AAE01F}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using System.Web.Mvc;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
     public static class ControllerExtensions
     {
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest.cs b/TestStack.FluentMvcTesting/ControllerResultTest.cs
@@ -6,7 +6,7 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
     public class ControllerResultTest<T> where T : Controller
     {
diff --git a/TestStack.FluentMvcTesting/Exceptions.cs b/TestStack.FluentMvcTesting/Exceptions.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
 
     public class ActionResultAssertionException : Exception
diff --git a/TestStack.FluentMvcTesting/FluentMVCTesting.nuspec b/TestStack.FluentMvcTesting/FluentMVCTesting.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>
-       FluentMVCTesting 
+      TestStack.FluentMVCTesting
     </id>
     <version>
        1.0.0
@@ -11,7 +11,8 @@
        Robert Moore
     </authors>
     <description>
-       Fluent library for testing ASP.NET MVC controllers. ASP.NET MVC 4 version; install FluentMVCTesting.Mvc3 if you are using MVC 3.
+       Simple, terse, fluent unit testing of ASP.NET MVC Controllers.
+       ASP.NET MVC 4 version; install FluentMVCTesting.Mvc3 if you are using MVC 3.
     </description>
     <projectUrl>
        http://github.com/robdmoore/FluentMVCTesting
diff --git a/TestStack.FluentMvcTesting/ModelErrorTest.cs b/TestStack.FluentMvcTesting/ModelErrorTest.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using System.Web.Mvc;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
     public interface IModelErrorTest<TModel>
     {
diff --git a/TestStack.FluentMvcTesting/ModelTest.cs b/TestStack.FluentMvcTesting/ModelTest.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using System.Web.Mvc;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
     public interface IModelTest<TModel>
     {
diff --git a/TestStack.FluentMvcTesting/Properties/AssemblyInfo.cs b/TestStack.FluentMvcTesting/Properties/AssemblyInfo.cs
diff --git a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{152CA00F-18D3-4CF5-8CA0-2C5B70CBEA19}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FluentMVCTesting</RootNamespace>
-    <AssemblyName>FluentMVCTesting</AssemblyName>
+    <RootNamespace>TestStack.FluentMVCTesting</RootNamespace>
+    <AssemblyName>TestStack.FluentMVCTesting</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -36,7 +36,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>robdmoore.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>TestStack.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -88,7 +88,7 @@
   <ItemGroup>
     <None Include="FluentMVCTesting.nuspec" />
     <None Include="packages.config" />
-    <None Include="robdmoore.snk" />
+    <None Include="TestStack.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
diff --git a/TestStack.FluentMvcTesting/TestStack.snk b/TestStack.FluentMvcTesting/TestStack.snk
diff --git a/TestStack.FluentMvcTesting/ViewResultTest.cs b/TestStack.FluentMvcTesting/ViewResultTest.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Web.Mvc;
 
-namespace FluentMVCTesting
+namespace TestStack.FluentMVCTesting
 {
     public class ViewResultTest
     {
diff --git a/TestStack.FluentMvcTesting/packages.config b/TestStack.FluentMvcTesting/packages.config

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using NSubstitute;`
`6`	`6`	`using NUnit.Framework;`
`7`	`7`
`8`		`-namespace FluentMVCTesting.Tests`
	`8`	`+namespace TestStack.FluentMVCTesting.Tests`
`9`	`9`	`{`
`10`	`10`	`class ModelErrorTestMetadata : Tuple<string, string, string, ModelErrorTestCall>`
`11`	`11`	`{`