Fix integration tests

ReubenBond · ReubenBond · commit 3858d7ccf770 · 2023-05-09T07:05:39.000-07:00
diff --git a/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs b/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs
@@ -45,7 +45,7 @@ protected override IHost CreateHost(IHostBuilder builder)
             {
                 var directory = Path.GetDirectoryName(typeof(BasketScenarioBase).Assembly.Location)!;
 
-                c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+                c.AddJsonFile(Path.Combine(directory, "appsettings.Basket.json"), optional: false);
             });
 
             return base.CreateHost(builder);
diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="appsettings.json">
+    <Content Include="appsettings.Basket.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/src/Services/Basket/Basket.FunctionalTests/appsettings.Basket.json b/src/Services/Basket/Basket.FunctionalTests/appsettings.Basket.json
diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
@@ -7,15 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="appsettings.json" />
+    <None Remove="appsettings.Catalog.json" />
     <None Remove="Setup\CatalogBrands.csv" />
     <None Remove="Setup\CatalogItems.csv" />
     <None Remove="Setup\CatalogItems.zip" />
     <None Remove="Setup\CatalogTypes.csv" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="appsettings.json">
+    <Content Include="appsettings.Catalog.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Setup\CatalogBrands.csv">
diff --git a/src/Services/Catalog/Catalog.FunctionalTests/CatalogScenarioBase.cs b/src/Services/Catalog/Catalog.FunctionalTests/CatalogScenarioBase.cs
@@ -1,15 +1,10 @@
-﻿using Microsoft.AspNetCore.Mvc.Testing;
+﻿using System;
+using Microsoft.AspNetCore.Mvc.Testing;
 
 namespace Catalog.FunctionalTests;
 
 public class CatalogScenariosBase 
 {
-    public TestServer CreateServer()
-    {
-        var factory = new CatalogApplication();
-        return factory.Server;
-    }
-
     private class CatalogApplication : WebApplicationFactory<Program>
     {
         protected override IHost CreateHost(IHostBuilder builder)
@@ -18,13 +13,19 @@ protected override IHost CreateHost(IHostBuilder builder)
             {
                 var directory = Path.GetDirectoryName(typeof(CatalogScenariosBase).Assembly.Location)!;
 
-                c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+                c.AddJsonFile(Path.Combine(directory, "appsettings.Catalog.json"), optional: false);
             });
 
             return base.CreateHost(builder);
         }
     }
 
+    public TestServer CreateServer()
+    {
+        var factory = new CatalogApplication();
+        return factory.Server;
+    }
+
     public static class Get
     {
         private const int PageIndex = 0;
diff --git a/src/Services/Catalog/Catalog.FunctionalTests/appsettings.Catalog.json b/src/Services/Catalog/Catalog.FunctionalTests/appsettings.Catalog.json
@@ -4,7 +4,7 @@
   "PicBaseUrl": "http://localhost:5101/api/v1/catalog/items/[0]/pic/",
 
   "ConnectionStrings": {
-    "CatalogDb": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true"
+    "CatalogDB": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true"
   },
 
   "EventBus": {
diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs
@@ -5,7 +5,7 @@
 builder.Services.AddControllersWithViews();
 
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
-    options.UseSqlServer(builder.Configuration.GetConnectionString("IdentityDb")));
+    options.UseSqlServer(builder.Configuration.GetConnectionString("IdentityDB")));
 
 builder.Services.AddIdentity<ApplicationUser, IdentityRole>()
         .AddEntityFrameworkStores<ApplicationDbContext>()
@@ -30,7 +30,7 @@
 
 builder.Services.AddHealthChecks()
         .AddSqlServer(_ =>
-            builder.Configuration.GetRequiredConnectionString("IdentityDb"),
+            builder.Configuration.GetRequiredConnectionString("IdentityDB"),
             name: "IdentityDB-check",
             tags: new string[] { "IdentityDB" });
 
diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs
@@ -7,7 +7,7 @@ public static IServiceCollection AddHealthChecks(this IServiceCollection service
         var hcBuilder = services.AddHealthChecks();
 
         hcBuilder.AddSqlServer(_ =>
-                configuration.GetRequiredConnectionString("OrderingDb"),
+                configuration.GetRequiredConnectionString("OrderingDB"),
                 name: "OrderingTaskDB-check",
                 tags: new string[] { "live", "ready" });
 
@@ -19,7 +19,7 @@ public static IServiceCollection AddApplicationOptions(this IServiceCollection s
         return services.Configure<BackgroundTaskSettings>(configuration)
                 .Configure<BackgroundTaskSettings>(o =>
         {
-            o.ConnectionString = configuration.GetRequiredConnectionString("OrderingDb");
+            o.ConnectionString = configuration.GetRequiredConnectionString("OrderingDB");
         });
     }
 }
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="appsettings.json">
+    <Content Include="appsettings.Ordering.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarioBase.cs b/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarioBase.cs
@@ -14,16 +14,16 @@ public TestServer CreateServer()
 
         protected override IHost CreateHost(IHostBuilder builder)
         {
-            builder.ConfigureServices(servies =>
+            builder.ConfigureServices(services =>
             {
-                servies.AddSingleton<IStartupFilter, AuthStartupFilter>();
+                services.AddSingleton<IStartupFilter, AuthStartupFilter>();
             });
 
             builder.ConfigureAppConfiguration(c =>
             {
                 var directory = Path.GetDirectoryName(typeof(OrderingScenarioBase).Assembly.Location)!;
 
-                c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+                c.AddJsonFile(Path.Combine(directory, "appsettings.Ordering.json"), optional: false);
             });
 
             return base.CreateHost(builder);
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/appsettings.Ordering.json b/src/Services/Ordering/Ordering.FunctionalTests/appsettings.Ordering.json
@@ -1,6 +1,6 @@
 ﻿{
   "ConnectionStrings": {
-    "OrderingDb": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true",
+    "OrderingDB": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true",
     "EventBus": "localhost"
   },
   "CheckUpdateTime": "30000",
diff --git a/src/Services/Webhooks/Webhooks.API/Extensions/Extensions.cs b/src/Services/Webhooks/Webhooks.API/Extensions/Extensions.cs
@@ -4,7 +4,7 @@ public static IServiceCollection AddDbContexts(this IServiceCollection services,
     {
         services.AddDbContext<WebhooksContext>(options =>
         {
-            options.UseSqlServer(configuration.GetRequiredConnectionString("WebHooksDb"),
+            options.UseSqlServer(configuration.GetRequiredConnectionString("WebHooksDB"),
                                 sqlServerOptionsAction: sqlOptions =>
                                 {
                                     sqlOptions.MigrationsAssembly(typeof(Program).Assembly.FullName);
@@ -23,7 +23,7 @@ public static IServiceCollection AddHealthChecks(this IServiceCollection service
 
         hcBuilder
             .AddSqlServer(_ =>
-                configuration.GetRequiredConnectionString("WebHooksDb"),
+                configuration.GetRequiredConnectionString("WebHooksDB"),
                 name: "WebhooksApiDb-check",
                 tags: new string[] { "ready" });
 
diff --git a/src/Services/Webhooks/Webhooks.API/appsettings.Development.json b/src/Services/Webhooks/Webhooks.API/appsettings.Development.json
@@ -7,6 +7,6 @@
     }
   },
   "ConnectionStrings": {
-    "WebHooksDb": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;TrustServerCertificate=true"
+    "WebHooksDB": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;TrustServerCertificate=true"
   }
 }
diff --git a/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj b/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj
@@ -53,12 +53,6 @@
     <ProjectReference Include="..\..\..\Web\WebMVC\WebMVC.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Services\Locations\appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
diff --git a/src/Web/WebSPA/Client/yarn.lock b/src/Web/WebSPA/Client/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override IHost CreateHost(IHostBuilder builder)`
`45`	`45`	`{`
`46`	`46`	`var directory = Path.GetDirectoryName(typeof(BasketScenarioBase).Assembly.Location)!;`
`47`	`47`
`48`		`- c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);`
	`48`	`+ c.AddJsonFile(Path.Combine(directory, "appsettings.Basket.json"), optional: false);`
`49`	`49`	`});`
`50`	`50`
`51`	`51`	`return base.CreateHost(builder);`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,10 @@`
`1`		`-using Microsoft.AspNetCore.Mvc.Testing;`
	`1`	`+using System;`
	`2`	`+using Microsoft.AspNetCore.Mvc.Testing;`
`2`	`3`
`3`	`4`	`namespace Catalog.FunctionalTests;`
`4`	`5`
`5`	`6`	`public class CatalogScenariosBase`
`6`	`7`	`{`
`7`		`- public TestServer CreateServer()`
`8`		`- {`
`9`		`- var factory = new CatalogApplication();`
`10`		`- return factory.Server;`
`11`		`- }`
`12`		`-`
`13`	`8`	`private class CatalogApplication : WebApplicationFactory<Program>`
`14`	`9`	`{`
`15`	`10`	`protected override IHost CreateHost(IHostBuilder builder)`
`@@ -18,13 +13,19 @@ protected override IHost CreateHost(IHostBuilder builder)`
`18`	`13`	`{`
`19`	`14`	`var directory = Path.GetDirectoryName(typeof(CatalogScenariosBase).Assembly.Location)!;`
`20`	`15`
`21`		`- c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);`
	`16`	`+ c.AddJsonFile(Path.Combine(directory, "appsettings.Catalog.json"), optional: false);`
`22`	`17`	`});`
`23`	`18`
`24`	`19`	`return base.CreateHost(builder);`
`25`	`20`	`}`
`26`	`21`	`}`
`27`	`22`
	`23`	`+ public TestServer CreateServer()`
	`24`	`+ {`
	`25`	`+ var factory = new CatalogApplication();`
	`26`	`+ return factory.Server;`
	`27`	`+ }`
	`28`	`+`
`28`	`29`	`public static class Get`
`29`	`30`	`{`
`30`	`31`	`private const int PageIndex = 0;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public static IServiceCollection AddHealthChecks(this IServiceCollection service`
`7`	`7`	`var hcBuilder = services.AddHealthChecks();`
`8`	`8`
`9`	`9`	`hcBuilder.AddSqlServer(_ =>`
`10`		`- configuration.GetRequiredConnectionString("OrderingDb"),`
	`10`	`+ configuration.GetRequiredConnectionString("OrderingDB"),`
`11`	`11`	`name: "OrderingTaskDB-check",`
`12`	`12`	`tags: new string[] { "live", "ready" });`
`13`	`13`
`@@ -19,7 +19,7 @@ public static IServiceCollection AddApplicationOptions(this IServiceCollection s`
`19`	`19`	`return services.Configure<BackgroundTaskSettings>(configuration)`
`20`	`20`	`.Configure<BackgroundTaskSettings>(o =>`
`21`	`21`	`{`
`22`		`- o.ConnectionString = configuration.GetRequiredConnectionString("OrderingDb");`
	`22`	`+ o.ConnectionString = configuration.GetRequiredConnectionString("OrderingDB");`
`23`	`23`	`});`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,16 @@ public TestServer CreateServer()`
`14`	`14`
`15`	`15`	`protected override IHost CreateHost(IHostBuilder builder)`
`16`	`16`	`{`
`17`		`- builder.ConfigureServices(servies =>`
	`17`	`+ builder.ConfigureServices(services =>`
`18`	`18`	`{`
`19`		`- servies.AddSingleton<IStartupFilter, AuthStartupFilter>();`
	`19`	`+ services.AddSingleton<IStartupFilter, AuthStartupFilter>();`
`20`	`20`	`});`
`21`	`21`
`22`	`22`	`builder.ConfigureAppConfiguration(c =>`
`23`	`23`	`{`
`24`	`24`	`var directory = Path.GetDirectoryName(typeof(OrderingScenarioBase).Assembly.Location)!;`
`25`	`25`
`26`		`- c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);`
	`26`	`+ c.AddJsonFile(Path.Combine(directory, "appsettings.Ordering.json"), optional: false);`
`27`	`27`	`});`
`28`	`28`
`29`	`29`	`return base.CreateHost(builder);`