Minor 3.x Updates (dotnet-architecture#339)

ardalis · web-flow · commit fa8839e1d8d2 · 2019-12-18T16:59:25.000-05:00
* remove unnecessary call

* Refactoring test fixture
diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln
@@ -21,6 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "tests\Fu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0BD72BEA-EF42-4B72-8B69-12A39EC76FBA}"
 	ProjectSection(SolutionItems) = preProject
+		docker-compose.override.yml = docker-compose.override.yml
 		docker-compose.yml = docker-compose.yml
 		README.md = README.md
 	EndProjectSection
diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs
@@ -123,7 +123,6 @@ public void ConfigureServices(IServiceCollection services)
                 options.Conventions.AuthorizePage("/Basket/Checkout");
             });
             services.AddControllersWithViews();
-            services.AddControllers();
 
             services.AddHttpContextAccessor();
             
diff --git a/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs b/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.eShopWeb.Web;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,9 +11,9 @@
 namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
 {
     [Collection("Sequential")]
-    public class AccountControllerSignIn : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class AccountControllerSignIn : IClassFixture<WebTestFixture>
     {
-        public AccountControllerSignIn(CustomWebApplicationFactory<Startup> factory)
+        public AccountControllerSignIn(WebTestFixture factory)
         {
             Client = factory.CreateClient(new WebApplicationFactoryClientOptions
             {
diff --git a/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs b/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.eShopWeb.Web;
-using Microsoft.eShopWeb.Web.ViewModels;
+﻿using Microsoft.eShopWeb.Web.ViewModels;
 using Newtonsoft.Json;
 using System.Linq;
 using System.Net.Http;
@@ -9,9 +8,9 @@
 namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
 {
     [Collection("Sequential")]
-    public class ApiCatalogControllerList : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class ApiCatalogControllerList : IClassFixture<WebTestFixture>
     {
-        public ApiCatalogControllerList(CustomWebApplicationFactory<Startup> factory)
+        public ApiCatalogControllerList(WebTestFixture factory)
         {
             Client = factory.CreateClient();
         }
diff --git a/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs
@@ -1,14 +1,13 @@
-﻿using Microsoft.eShopWeb.Web;
-using System.Net.Http;
+﻿using System.Net.Http;
 using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
 {
     [Collection("Sequential")]
-    public class CatalogControllerIndex : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class CatalogControllerIndex : IClassFixture<WebTestFixture>
     {
-        public CatalogControllerIndex(CustomWebApplicationFactory<Startup> factory)
+        public CatalogControllerIndex(WebTestFixture factory)
         {
             Client = factory.CreateClient();
         }
diff --git a/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.eShopWeb.Web;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -8,9 +7,9 @@
 namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
 {
     [Collection("Sequential")]
-    public class OrderIndexOnGet : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class OrderIndexOnGet : IClassFixture<WebTestFixture>
     {
-        public OrderIndexOnGet(CustomWebApplicationFactory<Startup> factory)
+        public OrderIndexOnGet(WebTestFixture factory)
         {
             Client = factory.CreateClient(new WebApplicationFactoryClientOptions
             {
diff --git a/tests/FunctionalTests/Web/Pages/BasketPageCheckout.cs b/tests/FunctionalTests/Web/Pages/BasketPageCheckout.cs
@@ -1,9 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
-using Microsoft.eShopWeb.Web;
+using Microsoft.eShopWeb.FunctionalTests.Web;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -12,9 +10,9 @@
 namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages
 {
     [Collection("Sequential")]
-    public class BasketPageCheckout : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class BasketPageCheckout : IClassFixture<WebTestFixture>
     {
-        public BasketPageCheckout(CustomWebApplicationFactory<Startup> factory)
+        public BasketPageCheckout(WebTestFixture factory)
         {
             Client = factory.CreateClient(new WebApplicationFactoryClientOptions
             {
diff --git a/tests/FunctionalTests/Web/Pages/HomePageOnGet.cs b/tests/FunctionalTests/Web/Pages/HomePageOnGet.cs
@@ -1,15 +1,14 @@
-﻿using Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
-using Microsoft.eShopWeb.Web;
+﻿using Microsoft.eShopWeb.FunctionalTests.Web;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages
 {
     [Collection("Sequential")]
-    public class HomePageOnGet : IClassFixture<CustomWebApplicationFactory<Startup>>
+    public class HomePageOnGet : IClassFixture<WebTestFixture>
     {
-        public HomePageOnGet(CustomWebApplicationFactory<Startup> factory)
+        public HomePageOnGet(WebTestFixture factory)
         {
             Client = factory.CreateClient();
         }
diff --git a/tests/FunctionalTests/Web/WebTestFixture.cs b/tests/FunctionalTests/Web/WebTestFixture.cs
@@ -9,10 +9,9 @@
 using Microsoft.Extensions.Logging;
 using System;
 
-namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
+namespace Microsoft.eShopWeb.FunctionalTests.Web
 {
-    public class CustomWebApplicationFactory<TStartup>
-    : WebApplicationFactory<Startup>
+    public class WebTestFixture : WebApplicationFactory<Startup>
     {
         protected override void ConfigureWebHost(IWebHostBuilder builder)
         {
@@ -53,7 +52,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                     var loggerFactory = scopedServices.GetRequiredService<ILoggerFactory>();
 
                     var logger = scopedServices
-                        .GetRequiredService<ILogger<CustomWebApplicationFactory<TStartup>>>();
+                        .GetRequiredService<ILogger<WebTestFixture>>();
 
                     // Ensure the database is created.
                     db.Database.EnsureCreated();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc.Testing;`
`2`		`-using Microsoft.eShopWeb.Web;`
`3`	`2`	`using System;`
`4`	`3`	`using System.Collections.Generic;`
`5`	`4`	`using System.Linq;`
`@@ -12,9 +11,9 @@`
`12`	`11`	`namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers`
`13`	`12`	`{`
`14`	`13`	`[Collection("Sequential")]`
`15`		`- public class AccountControllerSignIn : IClassFixture<CustomWebApplicationFactory<Startup>>`
	`14`	`+ public class AccountControllerSignIn : IClassFixture<WebTestFixture>`
`16`	`15`	`{`
`17`		`- public AccountControllerSignIn(CustomWebApplicationFactory<Startup> factory)`
	`16`	`+ public AccountControllerSignIn(WebTestFixture factory)`
`18`	`17`	`{`
`19`	`18`	`Client = factory.CreateClient(new WebApplicationFactoryClientOptions`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Microsoft.eShopWeb.Web;`
`2`		`-using Microsoft.eShopWeb.Web.ViewModels;`
	`1`	`+using Microsoft.eShopWeb.Web.ViewModels;`
`3`	`2`	`using Newtonsoft.Json;`
`4`	`3`	`using System.Linq;`
`5`	`4`	`using System.Net.Http;`
`@@ -9,9 +8,9 @@`
`9`	`8`	`namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers`
`10`	`9`	`{`
`11`	`10`	`[Collection("Sequential")]`
`12`		`- public class ApiCatalogControllerList : IClassFixture<CustomWebApplicationFactory<Startup>>`
	`11`	`+ public class ApiCatalogControllerList : IClassFixture<WebTestFixture>`
`13`	`12`	`{`
`14`		`- public ApiCatalogControllerList(CustomWebApplicationFactory<Startup> factory)`
	`13`	`+ public ApiCatalogControllerList(WebTestFixture factory)`
`15`	`14`	`{`
`16`	`15`	`Client = factory.CreateClient();`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`		`-using Microsoft.eShopWeb.Web;`
`2`		`-using System.Net.Http;`
	`1`	`+using System.Net.Http;`
`3`	`2`	`using System.Threading.Tasks;`
`4`	`3`	`using Xunit;`
`5`	`4`
`6`	`5`	`namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers`
`7`	`6`	`{`
`8`	`7`	`[Collection("Sequential")]`
`9`		`- public class CatalogControllerIndex : IClassFixture<CustomWebApplicationFactory<Startup>>`
	`8`	`+ public class CatalogControllerIndex : IClassFixture<WebTestFixture>`
`10`	`9`	`{`
`11`		`- public CatalogControllerIndex(CustomWebApplicationFactory<Startup> factory)`
	`10`	`+ public CatalogControllerIndex(WebTestFixture factory)`
`12`	`11`	`{`
`13`	`12`	`Client = factory.CreateClient();`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc.Testing;`
`2`		`-using Microsoft.eShopWeb.FunctionalTests.Web.Controllers;`
`3`		`-using Microsoft.eShopWeb.Web;`
	`2`	`+using Microsoft.eShopWeb.FunctionalTests.Web;`
`4`	`3`	`using System.Collections.Generic;`
`5`	`4`	`using System.Linq;`
`6`		`-using System.Net;`
`7`	`5`	`using System.Net.Http;`
`8`	`6`	`using System.Text.RegularExpressions;`
`9`	`7`	`using System.Threading.Tasks;`
`@@ -12,9 +10,9 @@`
`12`	`10`	`namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages`
`13`	`11`	`{`
`14`	`12`	`[Collection("Sequential")]`
`15`		`- public class BasketPageCheckout : IClassFixture<CustomWebApplicationFactory<Startup>>`
	`13`	`+ public class BasketPageCheckout : IClassFixture<WebTestFixture>`
`16`	`14`	`{`
`17`		`- public BasketPageCheckout(CustomWebApplicationFactory<Startup> factory)`
	`15`	`+ public BasketPageCheckout(WebTestFixture factory)`
`18`	`16`	`{`
`19`	`17`	`Client = factory.CreateClient(new WebApplicationFactoryClientOptions`
`20`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`		`-using Microsoft.eShopWeb.FunctionalTests.Web.Controllers;`
`2`		`-using Microsoft.eShopWeb.Web;`
	`1`	`+using Microsoft.eShopWeb.FunctionalTests.Web;`
`3`	`2`	`using System.Net.Http;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`	`using Xunit;`
`6`	`5`
`7`	`6`	`namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages`
`8`	`7`	`{`
`9`	`8`	`[Collection("Sequential")]`
`10`		`- public class HomePageOnGet : IClassFixture<CustomWebApplicationFactory<Startup>>`
	`9`	`+ public class HomePageOnGet : IClassFixture<WebTestFixture>`
`11`	`10`	`{`
`12`		`- public HomePageOnGet(CustomWebApplicationFactory<Startup> factory)`
	`11`	`+ public HomePageOnGet(WebTestFixture factory)`
`13`	`12`	`{`
`14`	`13`	`Client = factory.CreateClient();`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,9 @@`
`9`	`9`	`using Microsoft.Extensions.Logging;`
`10`	`10`	`using System;`
`11`	`11`
`12`		`-namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers`
	`12`	`+namespace Microsoft.eShopWeb.FunctionalTests.Web`
`13`	`13`	`{`
`14`		`- public class CustomWebApplicationFactory<TStartup>`
`15`		`- : WebApplicationFactory<Startup>`
	`14`	`+ public class WebTestFixture : WebApplicationFactory<Startup>`
`16`	`15`	`{`
`17`	`16`	`protected override void ConfigureWebHost(IWebHostBuilder builder)`
`18`	`17`	`{`
`@@ -53,7 +52,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)`
`53`	`52`	`var loggerFactory = scopedServices.GetRequiredService<ILoggerFactory>();`
`54`	`53`
`55`	`54`	`var logger = scopedServices`
`56`		`- .GetRequiredService<ILogger<CustomWebApplicationFactory<TStartup>>>();`
	`55`	`+ .GetRequiredService<ILogger<WebTestFixture>>();`
`57`	`56`
`58`	`57`	`// Ensure the database is created.`
`59`	`58`	`db.Database.EnsureCreated();`