Skip to content

Commit a3758b1

Browse files
AlexArchiveAlexArchive
committed
Merge pull request #35 from TestStack/mvc5-support
Added direct support for MVC5, pulled out MVC3 and MVC4 projects
2 parents 8e7818d + d0047ff commit a3758b1

File tree

163 files changed

+22508
-28837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+22508
-28837
lines changed

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ Installation
1818

1919
You can install this library using NuGet into your Test Library; it will automatically reference System.Web and System.Web.Mvc (via NuGet packages, sorry it also installs a heap of other dependencies - it would be cool if Microsoft provided a package with just the MVC dll!) for you.
2020

21-
If you are using ASP.NET MVC 4 then:
21+
If you are using ASP.NET MVC 5 (.NET 4.5+) then:
2222

2323
Install-Package TestStack.FluentMVCTesting
2424

25-
If you are using ASP.NET MVC 3 then:
25+
If you are using ASP.NET MVC 4 (.NET 4.0+) then:
26+
27+
Install-Package TestStack.FluentMVCTesting.Mvc4
28+
29+
If you are using ASP.NET MVC 3 (.NET 4.0+) then:
2630

2731
Install-Package TestStack.FluentMVCTesting.Mvc3
2832

‎Samples/TestStack.FluentMVCTesting.Sample.Tests/Controllers/AccountControllerTests.cs‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj‎

Lines changed: 107 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,107 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{F36BC506-1076-49BF-A1A4-A76D6560AA64}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>TestStack.FluentMVCTesting.Sample.Tests</RootNamespace>
11-
<AssemblyName>TestStack.FluentMVCTesting.Sample.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35-
<Private>True</Private>
36-
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
37-
</Reference>
38-
<Reference Include="NSubstitute">
39-
<HintPath>..\..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll</HintPath>
40-
</Reference>
41-
<Reference Include="nunit.framework">
42-
<HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
43-
</Reference>
44-
<Reference Include="System" />
45-
<Reference Include="System.Core" />
46-
<Reference Include="System.Web" />
47-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<Private>True</Private>
49-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
50-
</Reference>
51-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<Private>True</Private>
53-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
54-
</Reference>
55-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<Private>True</Private>
57-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
58-
</Reference>
59-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<Private>True</Private>
61-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
62-
</Reference>
63-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<Private>True</Private>
65-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
66-
</Reference>
67-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<Private>True</Private>
69-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Xml.Linq" />
72-
<Reference Include="System.Data.DataSetExtensions" />
73-
<Reference Include="Microsoft.CSharp" />
74-
<Reference Include="System.Data" />
75-
<Reference Include="System.Xml" />
76-
</ItemGroup>
77-
<ItemGroup>
78-
<Compile Include="Controllers\AccountControllerTests.cs" />
79-
<Compile Include="Controllers\ProductControllerTests.cs" />
80-
<Compile Include="Properties\AssemblyInfo.cs" />
81-
</ItemGroup>
82-
<ItemGroup>
83-
<None Include="packages.config" />
84-
</ItemGroup>
85-
<ItemGroup>
86-
<ProjectReference Include="..\TestStack.FluentMVCTesting.Sample\TestStack.FluentMVCTesting.Sample.csproj">
87-
<Project>{0BD41AAC-8155-4328-A1A2-CB634430BB39}</Project>
88-
<Name>TestStack.FluentMVCTesting.Sample</Name>
89-
</ProjectReference>
90-
<ProjectReference Include="..\..\TestStack.FluentMVCTesting\TestStack.FluentMVCTesting.csproj">
91-
<Project>{152ca00f-18d3-4cf5-8ca0-2c5b70cbea19}</Project>
92-
<Name>TestStack.FluentMVCTesting</Name>
93-
</ProjectReference>
94-
</ItemGroup>
95-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
97-
Other similar extension points exist, see Microsoft.Common.targets.
98-
<Target Name="BeforeBuild">
99-
</Target>
100-
<Target Name="AfterBuild">
101-
</Target>
102-
-->
103-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{F36BC506-1076-49BF-A1A4-A76D6560AA64}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>TestStack.FluentMVCTesting.Sample.Tests</RootNamespace>
11+
<AssemblyName>TestStack.FluentMVCTesting.Sample.Tests</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<TargetFrameworkProfile />
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="Microsoft.Web.Infrastructure">
38+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
39+
<Private>True</Private>
40+
</Reference>
41+
<Reference Include="NSubstitute, Version=1.7.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
42+
<SpecificVersion>False</SpecificVersion>
43+
<HintPath>..\..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll</HintPath>
44+
</Reference>
45+
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
48+
</Reference>
49+
<Reference Include="System" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="System.Web" />
52+
<Reference Include="System.Web.Helpers">
53+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="System.Web.Mvc">
57+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
60+
<Reference Include="System.Web.Razor">
61+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
62+
<Private>True</Private>
63+
</Reference>
64+
<Reference Include="System.Web.WebPages">
65+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="System.Web.WebPages.Deployment">
69+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
72+
<Reference Include="System.Web.WebPages.Razor">
73+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="System.Xml.Linq" />
77+
<Reference Include="System.Data.DataSetExtensions" />
78+
<Reference Include="Microsoft.CSharp" />
79+
<Reference Include="System.Data" />
80+
<Reference Include="System.Xml" />
81+
</ItemGroup>
82+
<ItemGroup>
83+
<Compile Include="Controllers\ProductControllerTests.cs" />
84+
<Compile Include="Properties\AssemblyInfo.cs" />
85+
</ItemGroup>
86+
<ItemGroup>
87+
<None Include="packages.config" />
88+
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="..\..\TestStack.FluentMVCTesting\TestStack.FluentMVCTesting.csproj">
91+
<Project>{152ca00f-18d3-4cf5-8ca0-2c5b70cbea19}</Project>
92+
<Name>TestStack.FluentMVCTesting</Name>
93+
</ProjectReference>
94+
<ProjectReference Include="..\TestStack.FluentMVCTesting.Sample\TestStack.FluentMVCTesting.Sample.csproj">
95+
<Project>{fd292b9e-1493-428f-8af6-f7cf9cf463c5}</Project>
96+
<Name>TestStack.FluentMVCTesting.Sample</Name>
97+
</ProjectReference>
98+
</ItemGroup>
99+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101+
Other similar extension points exist, see Microsoft.Common.targets.
102+
<Target Name="BeforeBuild">
103+
</Target>
104+
<Target Name="AfterBuild">
105+
</Target>
106+
-->
107+
</Project>

‎Samples/TestStack.FluentMVCTesting.Sample.Tests/app.config‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="DotNetOpenAuth.AspNet" publicKeyToken="2780ccd10d57b246" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="DotNetOpenAuth.Core" publicKeyToken="2780ccd10d57b246" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
20+
</dependentAssembly>
21+
</assemblyBinding>
22+
</runtime>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎Samples/TestStack.FluentMVCTesting.Sample.Tests/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
6-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
7-
<package id="NSubstitute" version="1.6.1.0" targetFramework="net40" />
8-
<package id="NUnit" version="2.6.2" targetFramework="net40" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
6+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
7+
<package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
8+
<package id="NUnit" version="2.6.3" targetFramework="net45" />
99
</packages>

0 commit comments

Comments
 (0)