From 17faebfa30476a8ef3020f2efe76474a82e8d26c Mon Sep 17 00:00:00 2001 From: Erik Pique Date: Tue, 6 Aug 2019 08:51:17 +0200 Subject: [PATCH] remove mvc routing spa --- .../CampaignScenarios.cs | 1 + .../MarketingScenarioBase.cs | 18 ++---------------- .../UserLocationRoleScenarios.cs | 1 + src/Web/WebSPA/Startup.cs | 16 ++++------------ 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs b/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs index f2643e998..3742b80c6 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs +++ b/src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs @@ -9,6 +9,7 @@ using Xunit; namespace Marketing.FunctionalTests { + [Collection("Sequential")] public class CampaignScenarios : CampaignScenarioBase { diff --git a/src/Services/Marketing/Marketing.FunctionalTests/MarketingScenarioBase.cs b/src/Services/Marketing/Marketing.FunctionalTests/MarketingScenarioBase.cs index fdee81ce3..2ae78237c 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/MarketingScenarioBase.cs +++ b/src/Services/Marketing/Marketing.FunctionalTests/MarketingScenarioBase.cs @@ -20,13 +20,9 @@ namespace Marketing.FunctionalTests public TestServer CreateServer() { - - Console.WriteLine(" Creating test server"); var path = Assembly.GetAssembly(typeof(MarketingScenarioBase)) .Location; - Console.WriteLine(" Creating builder"); - var hostBuilder = new WebHostBuilder() .UseContentRoot(Path.GetDirectoryName(path)) .ConfigureAppConfiguration(cb => @@ -36,38 +32,28 @@ namespace Marketing.FunctionalTests }) .CaptureStartupErrors(true) .UseStartup(); - - Console.WriteLine(" Created builder"); var testServer = new TestServer(hostBuilder); - using (var scope = testServer.Services.CreateScope()) + using (var scope = testServer.Services.CreateScope()) { var services = scope.ServiceProvider; var logger = services.GetRequiredService>(); var settings = services.GetRequiredService>(); logger.LogError("connectionString " + settings.Value.ConnectionString); - Console.WriteLine("connectionString " + settings.Value.ConnectionString); } testServer.Host - .RemoveDbContext() .MigrateDbContext((context, services) => { var logger = services.GetService>(); - logger.LogError("Migrating MarketingContextSeed"); + logger.LogError("Migrating MarketingContextSeed"); new MarketingContextSeed() .SeedAsync(context, logger) .Wait(); - }); - Console.WriteLine(" Thread to sleep"); - - Thread.Sleep(5000); - Console.WriteLine(" Thread after"); - return testServer; } diff --git a/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs b/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs index b8ee38e17..fe76923e0 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs +++ b/src/Services/Marketing/Marketing.FunctionalTests/UserLocationRoleScenarios.cs @@ -8,6 +8,7 @@ using Xunit; namespace Marketing.FunctionalTests { + [Collection("Sequential")] public class UserLocationRoleScenarios : UserLocationRoleScenariosBase { diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs index 431ea5fbb..7e6c374f7 100644 --- a/src/Web/WebSPA/Startup.cs +++ b/src/Web/WebSPA/Startup.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; @@ -26,12 +25,8 @@ namespace eShopConContainers.WebSPA public IConfiguration Configuration { get; } - private IHostingEnvironment _hostingEnv; - - public Startup(IHostingEnvironment env) + public Startup() { - _hostingEnv = env; - var localPath = new Uri(Configuration["ASPNETCORE_URLS"])?.LocalPath ?? "/"; Configuration["BaseUrl"] = localPath; } @@ -48,8 +43,6 @@ namespace eShopConContainers.WebSPA .AddUrlGroup(new Uri(Configuration["MarketingUrlHC"]), name: "marketingapigw-check", tags: new string[] { "marketingapigw" }) .AddUrlGroup(new Uri(Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" }); - services.AddControllers(); - services.Configure(Configuration); if (Configuration.GetValue("IsClusterEnv") == bool.TrueString) @@ -62,16 +55,13 @@ namespace eShopConContainers.WebSPA } services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN"); - - services.AddMvc() - .SetCompatibilityVersion(CompatibilityVersion.Version_3_0) + services.AddControllers() .AddJsonOptions(options => { options.JsonSerializerOptions.PropertyNameCaseInsensitive = true; }); } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery) { @@ -102,6 +92,7 @@ namespace eShopConContainers.WebSPA WebContextSeed.Seed(app, env, loggerFactory); var pathBase = Configuration["PATH_BASE"]; + if (!string.IsNullOrEmpty(pathBase)) { loggerFactory.CreateLogger().LogDebug("Using PATH BASE '{pathBase}'", pathBase); @@ -127,6 +118,7 @@ namespace eShopConContainers.WebSPA app.UseRouting(); app.UseEndpoints(endpoints => { + endpoints.MapControllers(); endpoints.MapHealthChecks("/liveness", new HealthCheckOptions { Predicate = r => r.Name.Contains("self")