From 1ffbab73383e9a57178575b1819069a1d299595c Mon Sep 17 00:00:00 2001 From: Nicolas Dorier Date: Thu, 3 Oct 2024 15:16:21 +0900 Subject: [PATCH] Small improvements to make development of plugins easier (#6270) --- BTCPayServer.Tests/BTCPayServerTester.cs | 2 ++ BTCPayServer.Tests/SeleniumTester.cs | 7 +++++-- BTCPayServer/Extensions/SettingsRepositoryExtensions.cs | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/BTCPayServer.Tests/BTCPayServerTester.cs b/BTCPayServer.Tests/BTCPayServerTester.cs index 24aafef04..7b953957e 100644 --- a/BTCPayServer.Tests/BTCPayServerTester.cs +++ b/BTCPayServer.Tests/BTCPayServerTester.cs @@ -162,6 +162,8 @@ namespace BTCPayServer.Tests HttpClient.BaseAddress = ServerUri; Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development"); var confBuilder = new DefaultConfiguration() { Logger = LoggerProvider.CreateLogger("Console") }.CreateConfigurationBuilder(new[] { "--datadir", _Directory, "--conf", confPath, "--disable-registration", DisableRegistration ? "true" : "false" }); + // This make sure that tests work outside of this assembly (ie, test project it a plugin) + confBuilder.SetBasePath(Directory.GetCurrentDirectory()); #if DEBUG confBuilder.AddJsonFile("appsettings.dev.json", true, false); #endif diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs index c5abcd41e..38c37fb4d 100644 --- a/BTCPayServer.Tests/SeleniumTester.cs +++ b/BTCPayServer.Tests/SeleniumTester.cs @@ -132,11 +132,11 @@ retry: /// Because for some reason, the selenium container can't resolve the tests container domain name /// public Uri ServerUri; - internal IWebElement FindAlertMessage(StatusMessageModel.StatusSeverity severity = StatusMessageModel.StatusSeverity.Success) + public IWebElement FindAlertMessage(StatusMessageModel.StatusSeverity severity = StatusMessageModel.StatusSeverity.Success) { return FindAlertMessage(new[] { severity }); } - internal IWebElement FindAlertMessage(params StatusMessageModel.StatusSeverity[] severity) + public IWebElement FindAlertMessage(params StatusMessageModel.StatusSeverity[] severity) { var className = string.Join(", ", severity.Select(statusSeverity => $".alert-{StatusMessageModel.ToString(statusSeverity)}")); IWebElement el; @@ -182,10 +182,13 @@ retry: Driver.FindElement(By.Id("RegisterButton")).Click(); Driver.AssertNoError(); CreatedUser = usr; + Password = "123456"; return usr; } string CreatedUser; + public string Password { get; private set; } + public TestAccount AsTestAccount() { return new TestAccount(Server) { RegisterDetails = new Models.AccountViewModels.RegisterViewModel() { Password = "123456", Email = CreatedUser } }; diff --git a/BTCPayServer/Extensions/SettingsRepositoryExtensions.cs b/BTCPayServer/Extensions/SettingsRepositoryExtensions.cs index a675e38da..e1a71fb21 100644 --- a/BTCPayServer/Extensions/SettingsRepositoryExtensions.cs +++ b/BTCPayServer/Extensions/SettingsRepositoryExtensions.cs @@ -23,7 +23,7 @@ public static class SettingsRepositoryExtensions } return new IssuerKey(issuerKey); } - internal static AESKey FixedKey() + public static AESKey FixedKey() { byte[] v = new byte[16]; v[0] = 1;