Skip to content

Commit 466f50a

Browse files
ivaylokenovivaylokenov
committed
Renamed Routes to Routing to be consistent with Microsoft naming
1 parent 9a7b23a commit 466f50a

File tree

46 files changed

+7505
-230
lines changed

Some content is hidden

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

46 files changed

+7505
-230
lines changed

‎MyTested.AspNetCore.Mvc.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyTested.AspNetCore.Mvc.Abs
7272
EndProject
7373
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyTested.AspNetCore.Mvc.Configuration", "src\MyTested.AspNetCore.Mvc.Configuration\MyTested.AspNetCore.Mvc.Configuration.xproj", "{C4D78D04-D99C-48D7-9339-1E2D0F616A4C}"
7474
EndProject
75+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyTested.AspNetCore.Mvc.Http", "src\MyTested.AspNetCore.Mvc.Http\MyTested.AspNetCore.Mvc.Http.xproj", "{5B60F95F-8A87-4166-8C75-1328E7063365}"
76+
EndProject
7577
Global
7678
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7779
Debug|Any CPU = Debug|Any CPU
@@ -186,6 +188,10 @@ Global
186188
{C4D78D04-D99C-48D7-9339-1E2D0F616A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
187189
{C4D78D04-D99C-48D7-9339-1E2D0F616A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
188190
{C4D78D04-D99C-48D7-9339-1E2D0F616A4C}.Release|Any CPU.Build.0 = Release|Any CPU
191+
{5B60F95F-8A87-4166-8C75-1328E7063365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
192+
{5B60F95F-8A87-4166-8C75-1328E7063365}.Debug|Any CPU.Build.0 = Debug|Any CPU
193+
{5B60F95F-8A87-4166-8C75-1328E7063365}.Release|Any CPU.ActiveCfg = Release|Any CPU
194+
{5B60F95F-8A87-4166-8C75-1328E7063365}.Release|Any CPU.Build.0 = Release|Any CPU
189195
EndGlobalSection
190196
GlobalSection(SolutionProperties) = preSolution
191197
HideSolutionNode = FALSE
@@ -220,5 +226,6 @@ Global
220226
{1309FBA5-F93D-4F4B-9819-63D298B837FF} = {D140FA14-A6C2-4279-8A41-35BC55279DA8}
221227
{0346A33A-BB28-4F3C-B788-2CF8C00CA048} = {09353A03-2B0C-496B-8EB1-2CB6A22D758B}
222228
{C4D78D04-D99C-48D7-9339-1E2D0F616A4C} = {09353A03-2B0C-496B-8EB1-2CB6A22D758B}
229+
{5B60F95F-8A87-4166-8C75-1328E7063365} = {09353A03-2B0C-496B-8EB1-2CB6A22D758B}
223230
EndGlobalSection
224231
EndGlobal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Here are some random examples of what the fluent testing API is capable of:
9696
```c#
9797
// tests a route for correct controller, action and resolved route values
9898
MyMvc
99-
.Routes()
99+
.Routing()
100100
.ShouldMap(request => request
101101
.WithLocation("/My/Action/1")
102102
.WithMethod(HttpMethod.Post)

‎samples/ApplicationParts/ApplicationParts.Test/RouteTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class RouteTest
1010
public void HomeIndexShouldMatchCorrectController()
1111
{
1212
MyMvc
13-
.Routes()
13+
.Routing()
1414
.ShouldMap("/")
1515
.To<HomeController>(c => c.Index());
1616
}

‎samples/ApplicationParts/ApplicationParts.Test/project.lock.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4183,6 +4183,7 @@
41834183
"MyTested.AspNetCore.Mvc.Caching": "1.0.0",
41844184
"MyTested.AspNetCore.Mvc.Core": "1.0.0",
41854185
"MyTested.AspNetCore.Mvc.EntityFrameworkCore": "1.0.0",
4186+
"MyTested.AspNetCore.Mvc.Http": "1.0.0",
41864187
"MyTested.AspNetCore.Mvc.Options": "1.0.0",
41874188
"MyTested.AspNetCore.Mvc.Session": "1.0.0",
41884189
"MyTested.AspNetCore.Mvc.ViewFeatures": "1.0.0"
@@ -4281,6 +4282,19 @@
42814282
"netstandard1.6/MyTested.AspNetCore.Mvc.EntityFrameworkCore.dll": {}
42824283
}
42834284
},
4285+
"MyTested.AspNetCore.Mvc.Http/1.0.0-preview-final": {
4286+
"type": "project",
4287+
"framework": ".NETStandard,Version=v1.6",
4288+
"dependencies": {
4289+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
4290+
},
4291+
"compile": {
4292+
"netstandard1.6/MyTested.AspNetCore.Mvc.Http.dll": {}
4293+
},
4294+
"runtime": {
4295+
"netstandard1.6/MyTested.AspNetCore.Mvc.Http.dll": {}
4296+
}
4297+
},
42844298
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
42854299
"type": "project",
42864300
"framework": ".NETStandard,Version=v1.4",
@@ -10841,6 +10855,11 @@
1084110855
"path": "../../../src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/project.json",
1084210856
"msbuildProject": "../../../src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.xproj"
1084310857
},
10858+
"MyTested.AspNetCore.Mvc.Http/1.0.0-preview-final": {
10859+
"type": "project",
10860+
"path": "../../../src/MyTested.AspNetCore.Mvc.Http/project.json",
10861+
"msbuildProject": "../../../src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.xproj"
10862+
},
1084410863
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
1084510864
"type": "project",
1084610865
"path": "../../../src/MyTested.AspNetCore.Mvc.Licensing/project.json",

‎samples/MusicStore/MusicStore.Test/Routes/CheckoutRouteTest.cs‎ renamed to ‎samples/MusicStore/MusicStore.Test/Routing/CheckoutRouteTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MusicStore.Test.Routes
1+
namespace MusicStore.Test.Routing
22
{
33
using System.Threading;
44
using Models;
@@ -12,7 +12,7 @@ public class CheckoutRouteTest
1212
public void GetAddressAndPaymentShouldBeRoutedCorrectly()
1313
{
1414
MyMvc
15-
.Routes()
15+
.Routing()
1616
.ShouldMap(request => request
1717
.WithLocation("/Checkout/AddressAndPayment")
1818
.WithAuthenticatedUser())
@@ -33,7 +33,7 @@ public void PostAddressAndPaymentShouldBeRoutedCorrectly()
3333
var email = "[email protected]";
3434

3535
MyMvc
36-
.Routes()
36+
.Routing()
3737
.ShouldMap(request => request
3838
.WithMethod(HttpMethod.Post)
3939
.WithLocation("/Checkout/AddressAndPayment")
@@ -74,7 +74,7 @@ public void PostAddressAndPaymentShouldBeRoutedCorrectly()
7474
public void GetCompleteShouldBeRoutedCorrectly()
7575
{
7676
MyMvc
77-
.Routes()
77+
.Routing()
7878
.ShouldMap(request => request
7979
.WithLocation("/Checkout/Complete/1")
8080
.WithAuthenticatedUser())

‎samples/MusicStore/MusicStore.Test/Routes/HomeRouteTest.cs‎ renamed to ‎samples/MusicStore/MusicStore.Test/Routing/HomeRouteTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MusicStore.Test.Routes
1+
namespace MusicStore.Test.Routing
22
{
33
using Microsoft.Extensions.Caching.Memory;
44
using Models;
@@ -12,7 +12,7 @@ public class HomeRouteTest
1212
public void GetIndexShouldBeRoutedCorrectly()
1313
{
1414
MyMvc
15-
.Routes()
15+
.Routing()
1616
.ShouldMap("/Home/Index")
1717
.To<HomeController>(c => c.Index(
1818
With.Any<MusicStoreContext>(),
@@ -23,7 +23,7 @@ public void GetIndexShouldBeRoutedCorrectly()
2323
public void GetErrorShouldBeRoutedCorrectly()
2424
{
2525
MyMvc
26-
.Routes()
26+
.Routing()
2727
.ShouldMap("/Home/Error")
2828
.To<HomeController>(c => c.Error());
2929
}
@@ -32,7 +32,7 @@ public void GetErrorShouldBeRoutedCorrectly()
3232
public void GetStatusCodeShouldBeRoutedCorrectly()
3333
{
3434
MyMvc
35-
.Routes()
35+
.Routing()
3636
.ShouldMap("/Home/StatusCodePage")
3737
.To<HomeController>(c => c.StatusCodePage());
3838
}
@@ -41,7 +41,7 @@ public void GetStatusCodeShouldBeRoutedCorrectly()
4141
public void GetAccessDeniedShouldBeRoutedCorrectly()
4242
{
4343
MyMvc
44-
.Routes()
44+
.Routing()
4545
.ShouldMap("/Home/AccessDenied")
4646
.To<HomeController>(c => c.AccessDenied());
4747
}

‎samples/MusicStore/MusicStore.Test/Routes/ShoppingCartRouteTest.cs‎ renamed to ‎samples/MusicStore/MusicStore.Test/Routing/ShoppingCartRouteTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MusicStore.Test.Routes
1+
namespace MusicStore.Test.Routing
22
{
33
using MusicStore.Controllers;
44
using MyTested.AspNetCore.Mvc;
@@ -11,7 +11,7 @@ public class ShoppingCartRouteTest
1111
public void IndexShouldBeRoutedCorrectly()
1212
{
1313
MyMvc
14-
.Routes()
14+
.Routing()
1515
.ShouldMap("/ShoppingCart/Index")
1616
.To<ShoppingCartController>(c => c.Index());
1717
}
@@ -20,7 +20,7 @@ public void IndexShouldBeRoutedCorrectly()
2020
public void AddToCartShouldBeRoutedCorrectly()
2121
{
2222
MyMvc
23-
.Routes()
23+
.Routing()
2424
.ShouldMap("/ShoppingCart/AddToCart/1")
2525
.To<ShoppingCartController>(c => c.AddToCart(1));
2626
}
@@ -29,7 +29,7 @@ public void AddToCartShouldBeRoutedCorrectly()
2929
public void RemoveFromCartShouldBeRoutedCorrectly()
3030
{
3131
MyMvc
32-
.Routes()
32+
.Routing()
3333
.ShouldMap(request => request
3434
.WithMethod(HttpMethod.Post)
3535
.WithLocation("/ShoppingCart/RemoveFromCart/1")

‎samples/MusicStore/MusicStore.Test/Routes/StoreRouteTests.cs‎ renamed to ‎samples/MusicStore/MusicStore.Test/Routing/StoreRouteTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MusicStore.Test.Routes
1+
namespace MusicStore.Test.Routing
22
{
33
using Microsoft.Extensions.Caching.Memory;
44
using MusicStore.Controllers;
@@ -11,7 +11,7 @@ public class StoreRouteTests
1111
public void IndexShouldBeRoutedCorrectly()
1212
{
1313
MyMvc
14-
.Routes()
14+
.Routing()
1515
.ShouldMap("/Store/Index")
1616
.To<StoreController>(c => c.Index());
1717
}
@@ -20,7 +20,7 @@ public void IndexShouldBeRoutedCorrectly()
2020
public void BrowseShouldBeRoutedCorrectly()
2121
{
2222
MyMvc
23-
.Routes()
23+
.Routing()
2424
.ShouldMap("/Store/Browse?genre=Disco")
2525
.To<StoreController>(c => c.Browse("Disco"));
2626
}
@@ -29,7 +29,7 @@ public void BrowseShouldBeRoutedCorrectly()
2929
public void DetailsShouldBeRoutedCorrectly()
3030
{
3131
MyMvc
32-
.Routes()
32+
.Routing()
3333
.ShouldMap("/Store/Details/1")
3434
.To<StoreController>(c => c.Details(With.Any<IMemoryCache>(), 1)); ;
3535
}

‎samples/MusicStore/MusicStore.Test/project.lock.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4326,6 +4326,7 @@
43264326
"MyTested.AspNetCore.Mvc.Caching": "1.0.0",
43274327
"MyTested.AspNetCore.Mvc.Core": "1.0.0",
43284328
"MyTested.AspNetCore.Mvc.EntityFrameworkCore": "1.0.0",
4329+
"MyTested.AspNetCore.Mvc.Http": "1.0.0",
43294330
"MyTested.AspNetCore.Mvc.Options": "1.0.0",
43304331
"MyTested.AspNetCore.Mvc.Session": "1.0.0",
43314332
"MyTested.AspNetCore.Mvc.ViewFeatures": "1.0.0"
@@ -4424,6 +4425,19 @@
44244425
"netstandard1.6/MyTested.AspNetCore.Mvc.EntityFrameworkCore.dll": {}
44254426
}
44264427
},
4428+
"MyTested.AspNetCore.Mvc.Http/1.0.0-preview-final": {
4429+
"type": "project",
4430+
"framework": ".NETStandard,Version=v1.6",
4431+
"dependencies": {
4432+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
4433+
},
4434+
"compile": {
4435+
"netstandard1.6/MyTested.AspNetCore.Mvc.Http.dll": {}
4436+
},
4437+
"runtime": {
4438+
"netstandard1.6/MyTested.AspNetCore.Mvc.Http.dll": {}
4439+
}
4440+
},
44274441
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
44284442
"type": "project",
44294443
"framework": ".NETStandard,Version=v1.4",
@@ -6676,6 +6690,7 @@
66766690
"MyTested.AspNetCore.Mvc.Caching": "1.0.0",
66776691
"MyTested.AspNetCore.Mvc.Core": "1.0.0",
66786692
"MyTested.AspNetCore.Mvc.EntityFrameworkCore": "1.0.0",
6693+
"MyTested.AspNetCore.Mvc.Http": "1.0.0",
66796694
"MyTested.AspNetCore.Mvc.Options": "1.0.0",
66806695
"MyTested.AspNetCore.Mvc.Session": "1.0.0",
66816696
"MyTested.AspNetCore.Mvc.ViewFeatures": "1.0.0"
@@ -6774,6 +6789,19 @@
67746789
"net451/MyTested.AspNetCore.Mvc.EntityFrameworkCore.dll": {}
67756790
}
67766791
},
6792+
"MyTested.AspNetCore.Mvc.Http/1.0.0-preview-final": {
6793+
"type": "project",
6794+
"framework": ".NETFramework,Version=v4.5.1",
6795+
"dependencies": {
6796+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
6797+
},
6798+
"compile": {
6799+
"net451/MyTested.AspNetCore.Mvc.Http.dll": {}
6800+
},
6801+
"runtime": {
6802+
"net451/MyTested.AspNetCore.Mvc.Http.dll": {}
6803+
}
6804+
},
67776805
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
67786806
"type": "project",
67796807
"framework": ".NETFramework,Version=v4.5.1",
@@ -13469,6 +13497,11 @@
1346913497
"path": "../../../src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/project.json",
1347013498
"msbuildProject": "../../../src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.xproj"
1347113499
},
13500+
"MyTested.AspNetCore.Mvc.Http/1.0.0-preview-final": {
13501+
"type": "project",
13502+
"path": "../../../src/MyTested.AspNetCore.Mvc.Http/project.json",
13503+
"msbuildProject": "../../../src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.xproj"
13504+
},
1347213505
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
1347313506
"type": "project",
1347413507
"path": "../../../src/MyTested.AspNetCore.Mvc.Licensing/project.json",

‎src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Application/ApplicationConfigurationBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public IApplicationConfigurationBuilder WithApplication(Action<IApplicationBuild
4646
/// <inheritdoc />
4747
public IApplicationConfigurationBuilder WithRoutes(Action<IRouteBuilder> routes)
4848
{
49-
TestApplication.AdditionalRoutes += routes;
49+
TestApplication.AdditionalRouting += routes;
5050
return this;
5151
}
5252
}

0 commit comments

Comments
 (0)