From f8ea9db471725337e1a063eddec94720f51851f5 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 18:28:11 +0200 Subject: [PATCH 1/9] Fixing UI testing problem --- .../ShortcutsUITestContextExtensions.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs index 0119802e3..27778078d 100644 --- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs +++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs @@ -646,10 +646,18 @@ private static bool IsAdminTheme(IManifestInfo manifest) => manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(value: ManifestConstants.AdminTag)); private static async Task PermissionExistsAsync( - IEnumerable permissionProviders, string permissionName) => - (await Task.WhenAll(permissionProviders.Select(provider => provider.GetPermissionsAsync()))) - .SelectMany(permissions => permissions) - .Any(permission => permission.Name == permissionName); + IEnumerable permissionProviders, string permissionName) + { + var permissions = permissionProviders.ToAsyncEnumerable(); + await foreach (var provider in permissions) + { + var providerPermissions = await provider.GetPermissionsAsync(); + if (providerPermissions.Any(permission => permission.Name == permissionName)) + return true; + } + + return false; + } private static Task UsingScopeAsync( UITestContext context, From 85dcea71d1c12b17b255d1800f0311367bb37c45 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 19:40:53 +0200 Subject: [PATCH 2/9] Trying to fix NuGet publish --- .github/workflows/publish-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index 4b26cfcf9..a16af4884 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -7,6 +7,6 @@ on: jobs: publish-nuget: - uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/WALMA-133 secrets: API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }} From e447d197b95263166ceb02a5cbb567552f63a571 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 19:46:14 +0200 Subject: [PATCH 3/9] Fixing branch name --- .github/workflows/publish-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index a16af4884..60a047da3 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -7,6 +7,6 @@ on: jobs: publish-nuget: - uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/WALMA-133 + uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/WALMA-144 secrets: API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }} From 3793829999287ee39732a83b3a57b75128c25535 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 21:22:37 +0200 Subject: [PATCH 4/9] Reverting --- .github/workflows/publish-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index 60a047da3..4b26cfcf9 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -7,6 +7,6 @@ on: jobs: publish-nuget: - uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/WALMA-144 + uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev secrets: API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }} From 9d864a9d1d306622fd9424634602bf8c2017ea1c Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 21:26:19 +0200 Subject: [PATCH 5/9] Workaround --- .../Lombiq.Tests.UI.Shortcuts.csproj | 4 ++-- Lombiq.Tests.UI/Lombiq.Tests.UI.csproj | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj index 571b9d3ce..dc3e73887 100644 --- a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj +++ b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj @@ -45,11 +45,11 @@ - + - + diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj index a7bea2578..235c18b37 100644 --- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj +++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj @@ -91,17 +91,17 @@ - + - - + + - + @@ -111,7 +111,7 @@ - + true portable true From 53b32700238362e80a87ad1d6556624bbb3eba12 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Thu, 25 Apr 2024 21:29:37 +0200 Subject: [PATCH 6/9] Revert "Workaround" This reverts commit 9d864a9d1d306622fd9424634602bf8c2017ea1c. --- .../Lombiq.Tests.UI.Shortcuts.csproj | 4 ++-- Lombiq.Tests.UI/Lombiq.Tests.UI.csproj | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj index dc3e73887..571b9d3ce 100644 --- a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj +++ b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj @@ -45,11 +45,11 @@ - + - + diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj index 235c18b37..a7bea2578 100644 --- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj +++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj @@ -91,17 +91,17 @@ - + - - + + - + @@ -111,7 +111,7 @@ - + true portable true From 588e8de093e5ba0a972447e990cc6f4b3ebdbd7e Mon Sep 17 00:00:00 2001 From: Szabolcs Deme <80963259+DemeSzabolcs@users.noreply.github.com> Date: Fri, 26 Apr 2024 23:09:17 +0200 Subject: [PATCH 7/9] Update Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: József Horváth --- Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs index 27778078d..e99b64b9e 100644 --- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs +++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs @@ -646,7 +646,8 @@ private static bool IsAdminTheme(IManifestInfo manifest) => manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(value: ManifestConstants.AdminTag)); private static async Task PermissionExistsAsync( - IEnumerable permissionProviders, string permissionName) + IEnumerable permissionProviders, + string permissionName) { var permissions = permissionProviders.ToAsyncEnumerable(); await foreach (var provider in permissions) From ee6a90a2ba4c5676ffa4b6a4da203f6f2fda4ea4 Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Sat, 27 Apr 2024 14:16:32 +0200 Subject: [PATCH 8/9] Trying Edge for tests --- Lombiq.Tests.UI/Attributes/ChromeAttribute.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs b/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs index b31f469f2..894d05f1e 100644 --- a/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs +++ b/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs @@ -4,5 +4,5 @@ namespace Lombiq.Tests.UI.Attributes; public sealed class ChromeAttribute : BrowserAttributeBase { - protected override Browser Browser => Browser.Chrome; + protected override Browser Browser => Browser.Edge; } From b2110c927a58e6246fc7b03aca1e61b944ddce7b Mon Sep 17 00:00:00 2001 From: Szabolcs Deme Date: Sat, 27 Apr 2024 17:05:13 +0200 Subject: [PATCH 9/9] Revert "Trying Edge for tests" This reverts commit ee6a90a2ba4c5676ffa4b6a4da203f6f2fda4ea4. --- Lombiq.Tests.UI/Attributes/ChromeAttribute.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs b/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs index 894d05f1e..b31f469f2 100644 --- a/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs +++ b/Lombiq.Tests.UI/Attributes/ChromeAttribute.cs @@ -4,5 +4,5 @@ namespace Lombiq.Tests.UI.Attributes; public sealed class ChromeAttribute : BrowserAttributeBase { - protected override Browser Browser => Browser.Edge; + protected override Browser Browser => Browser.Chrome; }