From 45728981d29641ccbb3cfcda36f7d026b83bb13b Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 29 Apr 2024 12:46:08 -0700 Subject: [PATCH] Update launchUrl and tests --- .../WebApi-CSharp/Properties/launchSettings.json | 12 ------------ .../test/Templates.Mvc.Tests/WebApiTemplateTest.cs | 8 +++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Properties/launchSettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Properties/launchSettings.json index 56c43e2c085c..556f129b328c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Properties/launchSettings.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Properties/launchSettings.json @@ -23,11 +23,7 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - //#if (EnableOpenAPI) - "launchUrl": "swagger", - //#else "launchUrl": "weatherforecast", - //#endif "applicationUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -39,11 +35,7 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - //#if (EnableOpenAPI) - "launchUrl": "swagger", - //#else "launchUrl": "weatherforecast", - //#endif "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -53,11 +45,7 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, - //#if (EnableOpenAPI) - "launchUrl": "swagger", - //#else "launchUrl": "weatherforecast", - //#endif "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs index 4c997929354c..d69e93883955 100644 --- a/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs @@ -171,7 +171,7 @@ public async Task WebApiTemplateCSharp_WithoutOpenAPI(bool useProgramMain, bool aspNetProcess.Process.HasExited, ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process)); - await aspNetProcess.AssertNotFound("swagger"); + await aspNetProcess.AssertNotFound("openapi/v1.json"); } [ConditionalTheory] @@ -206,7 +206,7 @@ public async Task WebApiTemplateCSharpNoHttps_WithoutOpenAPI(bool useProgramMain aspNetProcess.Process.HasExited, ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process)); - await aspNetProcess.AssertNotFound("swagger"); + await aspNetProcess.AssertNotFound("openapi/v1.json"); } private async Task PublishAndBuildWebApiTemplate(string languageOverride, string auth, string[] args = null) @@ -260,7 +260,7 @@ private async Task WebApiTemplateCore(string languageOverride, string[] args = n ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process)); await aspNetProcess.AssertOk("weatherforecast"); - await aspNetProcess.AssertOk("swagger"); + await aspNetProcess.AssertOk("openapi/v1.json"); await aspNetProcess.AssertNotFound("/"); } @@ -271,8 +271,6 @@ private async Task WebApiTemplateCore(string languageOverride, string[] args = n ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", project, aspNetProcess.Process)); await aspNetProcess.AssertOk("weatherforecast"); - // Swagger is only available in Development - await aspNetProcess.AssertNotFound("swagger"); await aspNetProcess.AssertNotFound("/"); } }