aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump selenium container (#6071)

Browse Source
This commit is contained in:
Nicolas Dorier
2024-06-28 17:32:55 +09:00
committed by GitHub
parent 6a5bc99a55
commit c56b660c92
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="../Build/Common.csproj" /> <Import Project="../Build/Common.csproj" />
<PropertyGroup> <PropertyGroup>
<NoWarn>$(NoWarn),xUnit1031</NoWarn> <NoWarn>$(NoWarn),xUnit1031</NoWarn>
@@ -31,7 +31,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" /> <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
<PackageReference Include="Selenium.Support" Version="4.1.1" /> <PackageReference Include="Selenium.Support" Version="4.1.1" />
<PackageReference Include="Selenium.WebDriver" Version="4.1.1" /> <PackageReference Include="Selenium.WebDriver" Version="4.22.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" /> <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" />
<PackageReference Include="xunit" Version="2.6.6" /> <PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"> <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">

1
BTCPayServer.Tests/FastTests.cs
View File

@@ -49,7 +49,6 @@ using NBXplorer.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using OpenQA.Selenium.DevTools.V100.DOMSnapshot;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
using StoreData = BTCPayServer.Data.StoreData; using StoreData = BTCPayServer.Data.StoreData;

1
BTCPayServer.Tests/UtilitiesTests.cs
View File

@@ -18,7 +18,6 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using OpenQA.Selenium; using OpenQA.Selenium;
using OpenQA.Selenium.Chrome; using OpenQA.Selenium.Chrome;
using OpenQA.Selenium.DevTools.V100.Network;
using OpenQA.Selenium.Support.UI; using OpenQA.Selenium.Support.UI;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;

2
BTCPayServer.Tests/docker-compose.altcoins.yml
View File

@@ -90,7 +90,7 @@ services:
- merchant_lnd - merchant_lnd
selenium: selenium:
image: selenium/standalone-chrome:101.0 image: selenium/standalone-chrome:125.0
extra_hosts: extra_hosts:
- "tests:172.23.0.18" - "tests:172.23.0.18"
expose: expose:

2
BTCPayServer.Tests/docker-compose.yml
View File

@@ -87,7 +87,7 @@ services:
- merchant_lnd - merchant_lnd
selenium: selenium:
image: selenium/standalone-chrome:101.0 image: selenium/standalone-chrome:125.0
extra_hosts: extra_hosts:
- "tests:172.23.0.18" - "tests:172.23.0.18"
expose: expose:

17
BTCPayServer/Plugins/PluginManager.cs
View File

@@ -258,12 +258,27 @@ namespace BTCPayServer.Plugins
private static IEnumerable<IBTCPayServerPlugin> GetPluginInstancesFromAssembly(Assembly assembly) private static IEnumerable<IBTCPayServerPlugin> GetPluginInstancesFromAssembly(Assembly assembly)
{ {
return assembly.GetTypes().Where(type => return GetTypesNotCrash(assembly).Where(type =>
typeof(IBTCPayServerPlugin).IsAssignableFrom(type) && type != typeof(PluginService.AvailablePlugin) && typeof(IBTCPayServerPlugin).IsAssignableFrom(type) && type != typeof(PluginService.AvailablePlugin) &&
!type.IsAbstract). !type.IsAbstract).
Select(type => (IBTCPayServerPlugin)Activator.CreateInstance(type, Array.Empty<object>())); Select(type => (IBTCPayServerPlugin)Activator.CreateInstance(type, Array.Empty<object>()));
} }
private static IEnumerable<Type> GetTypesNotCrash(Assembly assembly)
{
try
{
// Strange crash with selenium
if (assembly.FullName.Contains("Selenium", StringComparison.OrdinalIgnoreCase))
return Array.Empty<Type>();
return assembly.GetTypes();
}
catch(ReflectionTypeLoadException ex)
{
return ex.Types.Where(t => t is not null).ToArray();
}
}
private static IBTCPayServerPlugin GetPluginInstanceFromAssembly(string pluginIdentifier, Assembly assembly) private static IBTCPayServerPlugin GetPluginInstanceFromAssembly(string pluginIdentifier, Assembly assembly)
{ {
return GetPluginInstancesFromAssembly(assembly).FirstOrDefault(plugin => plugin.Identifier == pluginIdentifier); return GetPluginInstancesFromAssembly(assembly).FirstOrDefault(plugin => plugin.Identifier == pluginIdentifier);