From e137c3e2ff9145b6c4e4a32e7e55d0f22b8ba646 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 14 Jun 2026 20:05:01 +0100 Subject: [PATCH] Fixes the UI testing wwwroot --- src/Yavsc.Blogs/Program.cs | 1 - src/Yavsc.Web/Program.cs | 1 + src/Yavsc.Web/Yavsc.Web.csproj | 2 +- test/yavscTests/FirstUIStript.cs | 31 +++++++++++++++++----- test/yavscTests/Mandatory/BatchTests.cs | 2 +- test/yavscTests/Mandatory/Remoting.cs | 2 +- test/yavscTests/Mandatory/Services.cs | 2 +- test/yavscTests/NonRegression/Database.cs | 2 +- test/yavscTests/NonRegression/EMailling.cs | 2 +- test/yavscTests/WebServerFixture.cs | 8 +++--- 10 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/Yavsc.Blogs/Program.cs b/src/Yavsc.Blogs/Program.cs index d3019485..cf3be11a 100644 --- a/src/Yavsc.Blogs/Program.cs +++ b/src/Yavsc.Blogs/Program.cs @@ -14,7 +14,6 @@ using IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Yavsc; using Yavsc.Interface; using Yavsc.Models; using Yavsc.Services; diff --git a/src/Yavsc.Web/Program.cs b/src/Yavsc.Web/Program.cs index 0024558a..5f8065f4 100644 --- a/src/Yavsc.Web/Program.cs +++ b/src/Yavsc.Web/Program.cs @@ -18,6 +18,7 @@ JwtSecurityTokenHandler.DefaultMapInboundClaims = true; var builder = WebApplication.CreateBuilder(args); builder.AddConfiguration("web"); + var authSection = builder.Configuration.GetSection("Authentication"); var issuer = authSection.GetValue("Issuer"); diff --git a/src/Yavsc.Web/Yavsc.Web.csproj b/src/Yavsc.Web/Yavsc.Web.csproj index 0ffd7d38..8881de5d 100644 --- a/src/Yavsc.Web/Yavsc.Web.csproj +++ b/src/Yavsc.Web/Yavsc.Web.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/yavscTests/FirstUIStript.cs b/test/yavscTests/FirstUIStript.cs index 4c9afd4d..fbf8b616 100644 --- a/test/yavscTests/FirstUIStript.cs +++ b/test/yavscTests/FirstUIStript.cs @@ -1,16 +1,35 @@ using System; using OpenQA.Selenium; using OpenQA.Selenium.Chrome; +using OpenQA.Selenium.Firefox; +using Xunit.Abstractions; +using yavscTests; +using yavscTests.ServerFixtures; namespace SeleniumDocs.GettingStarted; -public static class FirstScript -{ - public static void DoTestSeleniumWebSite() - { - IWebDriver driver = new ChromeDriver(); - driver.Navigate().GoToUrl("https://www.selenium.dev/selenium/web/web-form.html"); + [Collection("Yavsc Server")] +public class FirstScript : BaseTestContext +{ + public readonly WebServerFixture _serverFixture; + readonly ITestOutputHelper _output; + + public FirstScript(ITestOutputHelper output, WebServerFixture fixture) : base(output, fixture) + { + _serverFixture = fixture; + this._output = output; + } + + + [Fact] + public void DoTestSeleniumWebSite() + { + var firefoxOptions = new FirefoxOptions(); + firefoxOptions.AcceptInsecureCertificates = true; + + var driver = new FirefoxDriver(firefoxOptions); + driver.Navigate().GoToUrl(_serverFixture.Addresses.FirstOrDefault(u => u.StartsWith("https:"))); var title = driver.Title; diff --git a/test/yavscTests/Mandatory/BatchTests.cs b/test/yavscTests/Mandatory/BatchTests.cs index c0e9990e..134130a7 100644 --- a/test/yavscTests/Mandatory/BatchTests.cs +++ b/test/yavscTests/Mandatory/BatchTests.cs @@ -4,7 +4,7 @@ using Yavsc.Models; using Xunit.Abstractions; using Yavsc.Server.Models.IT.SourceCode; using Microsoft.EntityFrameworkCore; -using isnd.tests; +using yavscTests.ServerFixtures; using Yavsc.Server.Models.IT; namespace yavscTests diff --git a/test/yavscTests/Mandatory/Remoting.cs b/test/yavscTests/Mandatory/Remoting.cs index 3b53eb50..692b599f 100644 --- a/test/yavscTests/Mandatory/Remoting.cs +++ b/test/yavscTests/Mandatory/Remoting.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography.X509Certificates; using System.Net.Security; -using isnd.tests; +using yavscTests.ServerFixtures; using Xunit.Abstractions; using IdentityModel.Client; diff --git a/test/yavscTests/Mandatory/Services.cs b/test/yavscTests/Mandatory/Services.cs index 20ff8a26..9d6f92ab 100644 --- a/test/yavscTests/Mandatory/Services.cs +++ b/test/yavscTests/Mandatory/Services.cs @@ -1,4 +1,4 @@ -using isnd.tests; +using yavscTests.ServerFixtures; using Xunit.Abstractions; namespace yavscTests.Mandatory; diff --git a/test/yavscTests/NonRegression/Database.cs b/test/yavscTests/NonRegression/Database.cs index 02d60b26..1e083dea 100644 --- a/test/yavscTests/NonRegression/Database.cs +++ b/test/yavscTests/NonRegression/Database.cs @@ -1,4 +1,4 @@ -using isnd.tests; +using yavscTests.ServerFixtures; using Xunit.Abstractions; namespace yavscTests.Mandatory diff --git a/test/yavscTests/NonRegression/EMailling.cs b/test/yavscTests/NonRegression/EMailling.cs index 8e35f953..bca7db88 100644 --- a/test/yavscTests/NonRegression/EMailling.cs +++ b/test/yavscTests/NonRegression/EMailling.cs @@ -1,4 +1,4 @@ -using isnd.tests; +using yavscTests.ServerFixtures; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit.Abstractions; diff --git a/test/yavscTests/WebServerFixture.cs b/test/yavscTests/WebServerFixture.cs index b9bbe7d8..73efbd6d 100644 --- a/test/yavscTests/WebServerFixture.cs +++ b/test/yavscTests/WebServerFixture.cs @@ -20,7 +20,7 @@ using Yavsc.Extensions; using Yavsc.Models; using Client = IdentityServer8.EntityFramework.Entities.Client; -namespace isnd.tests +namespace yavscTests.ServerFixtures { [CollectionDefinition("Web server collection")] @@ -120,8 +120,10 @@ namespace isnd.tests var builder = WebApplication.CreateBuilder(); builder.Environment.EnvironmentName = "Development"; // Set ContentRoot to the Yavsc.Org project directory so WebRootPath resolves correctly - var testAssemblyLocation = AppDomain.CurrentDomain.BaseDirectory; - var yavscOrgPath = Path.GetFullPath(Path.Combine(testAssemblyLocation, "../../src/Yavsc.Org")); + var cwd = System.IO.Directory.GetCurrentDirectory(); + var yavscOrgPath = Path.GetFullPath( + Path.Combine(cwd, + "../../../../../src/Yavsc.Org")); builder.Environment.ContentRootPath = yavscOrgPath; builder.Configuration