Skip to content

Commit 9f9149f

Browse files
kevinkuszykkevinkuszyk
authored
Merge pull request #32 from Gimly/aspnet-core
Aspnet core MVC 1 support
2 parents 5146c77 + ebc0f5d commit 9f9149f

File tree

113 files changed

+62821
-39
lines changed

Some content is hidden

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

113 files changed

+62821
-39
lines changed

‎FluentAssertionsMvc.sln‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
77
EndProject
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
ProjectSection(SolutionItems) = preProject
1717
_todo_.txt = _todo_.txt
1818
Contributors.txt = Contributors.txt
19+
global.json = global.json
1920
src\SolutionInfo.cs = src\SolutionInfo.cs
2021
EndProjectSection
2122
EndProject
@@ -41,16 +42,24 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FluentAssertions.Mvc.Tests.
4142
EndProject
4243
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565-1E6E-4AE7-8F02-1911DBA00263}"
4344
EndProject
45+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.xproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
46+
EndProject
47+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.xproj", "{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}"
48+
EndProject
49+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.xproj", "{8156D339-E8DE-4A68-8828-9DA927D2949D}"
50+
EndProject
51+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.xproj", "{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}"
52+
EndProject
4453
Global
4554
GlobalSection(SharedMSBuildProjectFiles) = preSolution
4655
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{0e46fc22-eb6a-431e-bfb3-47fbc4fc500f}*SharedItemsImports = 13
47-
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{aeea0a6d-f5b6-42db-9af0-82164ecca21b}*SharedItemsImports = 13
4856
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{3cb00ff9-3dc2-460f-82e8-ebfb6339247d}*SharedItemsImports = 4
49-
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{e5bff617-46a3-48f7-83aa-bd34376f1ab2}*SharedItemsImports = 4
57+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{53589f79-0908-409a-8366-3e18dc637600}*SharedItemsImports = 4
5058
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{650a92ff-8874-41cd-bcda-be583f3f2638}*SharedItemsImports = 4
59+
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{aeea0a6d-f5b6-42db-9af0-82164ecca21b}*SharedItemsImports = 13
5160
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{b18bfbde-02a0-4db2-afea-e756c177e4ad}*SharedItemsImports = 4
5261
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{b9f72c07-90a8-4a15-815b-7618530ca889}*SharedItemsImports = 4
53-
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{53589f79-0908-409a-8366-3e18dc637600}*SharedItemsImports = 4
62+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{e5bff617-46a3-48f7-83aa-bd34376f1ab2}*SharedItemsImports = 4
5463
EndGlobalSection
5564
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5665
Debug|Any CPU = Debug|Any CPU
@@ -129,6 +138,54 @@ Global
129138
{650A92FF-8874-41CD-BCDA-BE583F3F2638}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
130139
{650A92FF-8874-41CD-BCDA-BE583F3F2638}.Release|Mixed Platforms.Build.0 = Release|Any CPU
131140
{650A92FF-8874-41CD-BCDA-BE583F3F2638}.Release|x86.ActiveCfg = Release|Any CPU
141+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|Any CPU.Build.0 = Debug|Any CPU
143+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
144+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
145+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|x86.ActiveCfg = Debug|Any CPU
146+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Debug|x86.Build.0 = Debug|Any CPU
147+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Any CPU.ActiveCfg = Release|Any CPU
148+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Any CPU.Build.0 = Release|Any CPU
149+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
150+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
151+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
152+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
153+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
155+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
156+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
157+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.ActiveCfg = Debug|Any CPU
158+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.Build.0 = Debug|Any CPU
159+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
160+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.Build.0 = Release|Any CPU
161+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
162+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
163+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.ActiveCfg = Release|Any CPU
164+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.Build.0 = Release|Any CPU
165+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
167+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
168+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
169+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.ActiveCfg = Debug|Any CPU
170+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.Build.0 = Debug|Any CPU
171+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.ActiveCfg = Release|Any CPU
172+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.Build.0 = Release|Any CPU
173+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
174+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
175+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.ActiveCfg = Release|Any CPU
176+
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.Build.0 = Release|Any CPU
177+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
179+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
180+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
181+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.ActiveCfg = Debug|Any CPU
182+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.Build.0 = Debug|Any CPU
183+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
184+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.Build.0 = Release|Any CPU
185+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
186+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
187+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.ActiveCfg = Release|Any CPU
188+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.Build.0 = Release|Any CPU
132189
EndGlobalSection
133190
GlobalSection(SolutionProperties) = preSolution
134191
HideSolutionNode = FALSE
@@ -143,5 +200,9 @@ Global
143200
{650A92FF-8874-41CD-BCDA-BE583F3F2638} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
144201
{0E46FC22-EB6A-431E-BFB3-47FBC4FC500F} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
145202
{AEEA0A6D-F5B6-42DB-9AF0-82164ECCA21B} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
203+
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
204+
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
205+
{8156D339-E8DE-4A68-8828-9DA927D2949D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
206+
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
146207
EndGlobalSection
147208
EndGlobal

‎global.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"projects": [ "src" ]
3+
}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.xproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>80e3d9c6-f6f6-40cf-93a6-bcd7c26118d8</ProjectGuid>
10+
<RootNamespace>FluentAssertions.AspNetCore.Mvc.Sample.Tests</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
14+
</PropertyGroup>
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<ItemGroup>
19+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
20+
</ItemGroup>
21+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
22+
</Project>

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/ProductController_Tests.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
2+
using NUnit.Framework;
3+
4+
namespace FluentAssertions.Mvc.Samples.Tests
5+
{
6+
[TestFixture]
7+
public class ProductController_Tests
8+
{
9+
[Test]
10+
public void List_ShouldReturnView()
11+
{
12+
var controller = new ProductController();
13+
controller.List().Should()
14+
.BeViewResult()
15+
.WithViewName("Index");
16+
}
17+
}
18+
}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyConfiguration("")]
9+
[assembly: AssemblyCompany("")]
10+
[assembly: AssemblyProduct("FluentAssertions.AspNetCore.Mvc.Sample.Tests")]
11+
[assembly: AssemblyTrademark("")]
12+
13+
// Setting ComVisible to false makes the types in this assembly not visible
14+
// to COM components. If you need to access a type in this assembly from
15+
// COM, set the ComVisible attribute to true on that type.
16+
[assembly: ComVisible(false)]
17+
18+
// The following GUID is for the ID of the typelib if this project is exposed to COM
19+
[assembly: Guid("80e3d9c6-f6f6-40cf-93a6-bcd7c26118d8")]

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/project.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "1.0.0-*",
3+
4+
"dependencies": {
5+
"NETStandard.Library": "1.6.0",
6+
"NUnit": "3.4.1",
7+
"dotnet-test-nunit": "3.4.0-beta-1",
8+
"FluentAssertions.AspNetCore.Mvc": "1.0.0-*",
9+
"FluentAssertions.AspNetCore.Mvc.Sample": "1.0.0-*"
10+
},
11+
12+
"testRunner": "nunit",
13+
14+
"frameworks": {
15+
"netcoreapp1.0": {
16+
"imports": [
17+
"dotnet5.6",
18+
"portable-net45+win8"
19+
],
20+
"dependencies": {
21+
"Microsoft.NETCore.App": {
22+
"version": "1.0.0-*",
23+
"type": "platform"
24+
}
25+
}
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)