From 3fd16114c96025b806a34e9ec45ba52cfe6e7af9 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 8 Nov 2025 11:14:09 +0100 Subject: [PATCH 1/4] Added TryRetryFindToast helper --- .../Helper/AppHelper.cs | 31 +++++++++++++++++++ .../InventoryPageTests.cs | 16 ++-------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs index a0d6563..db0715b 100644 --- a/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs +++ b/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs @@ -65,4 +65,35 @@ public static class AppHelper submit.Click(); Thread.Sleep(250); } + + public static bool TryRetryFindToast(ChromeDriver driver) + { + int retryCounter = 0; + retry: + try + { + + IWebElement successToast = driver.FindElement(By.CssSelector("#toastContainer div.bg-success")); + if (successToast.Displayed) + { + return true; + } + } + catch (Exception) { } + try + { + IWebElement failToast = driver.FindElement(By.CssSelector("#toastContainer div.bg-danger")); + if (failToast.Displayed) + { + return false; + } + } + catch (Exception) { } + if (++retryCounter < 5) + { + Thread.Sleep(250); + goto retry; + } + return false; + } } \ No newline at end of file diff --git a/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs b/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs index dbd1568..f9c247c 100644 --- a/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs +++ b/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs @@ -77,13 +77,7 @@ public class InventoryPageTests : IDisposable IWebElement okButton = _driver.FindElement(By.CssSelector("#viewAssetModal button.btn.btn-primary[data-bs-dismiss=\"modal\"]")); okButton.Click(); Thread.Sleep(500); - IWebElement successToast = _driver.FindElement(By.CssSelector("#toastContainer div.bg-success")); - Assert.True(successToast.Displayed); - try - { - IWebElement failToast = _driver.FindElement(By.CssSelector("#toastContainer div.bg-danger")); - Assert.False(failToast.Displayed); - } catch (Exception) {} + Assert.True(AppHelper.TryRetryFindToast(_driver)); } [Fact] @@ -104,13 +98,7 @@ public class InventoryPageTests : IDisposable IWebElement okButton = _driver.FindElement(By.CssSelector("#updateAssetModal button.btn.btn-warning[type=\"submit\"]")); okButton.Click(); Thread.Sleep(500); - IWebElement successToast = _driver.FindElement(By.CssSelector("#toastContainer div.bg-success")); - Assert.True(successToast.Displayed); - try - { - IWebElement failToast = _driver.FindElement(By.CssSelector("#toastContainer div.bg-danger")); - Assert.False(failToast.Displayed); - } catch (Exception) {} + Assert.True(AppHelper.TryRetryFindToast(_driver)); } [Fact] From 1b95cf4d3bb68260ea6411cff66231a73318d644 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 9 Nov 2025 20:28:46 +0100 Subject: [PATCH 2/4] Fixed renaming group identifier not working --- src/Views/Home/Groups.cshtml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index e01dc6a..aa765f6 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -324,7 +324,7 @@
-
+
@@ -383,10 +383,10 @@ document.addEventListener('DOMContentLoaded', () => { const updateButtons = document.querySelectorAll('.btn-update'); const updateModal = document.getElementById('updateGroupModal'); const updateForm = document.getElementById('updateGroupForm'); - + var groupId; updateModal.addEventListener('show.bs.modal', async event => { const button = event.relatedTarget; - const groupId = button.getAttribute('data-group-id'); + groupId = button.getAttribute('data-group-id'); updateForm.reset(); @@ -441,6 +441,10 @@ document.addEventListener('DOMContentLoaded', () => { jsonData.Description.Permissions = permissions; jsonData.Description.DisplayName = jsonData.DisplayName; jsonData.DisplayName = null; + jsonData.NewCn = jsonData.Cn; + jsonData.Cn = groupId; + buttons = $(`button[data-group-id=\"${jsonData.Cn}\"]`); + buttons.each(i => buttons[i].setAttribute("data-group-id", jsonData.NewCn)); try { const response = await fetch('/Groups/Update', { method: 'PATCH', From 0002be08aa49aa533e9122cd1199e10cc4c5f819 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 9 Nov 2025 20:35:05 +0100 Subject: [PATCH 3/4] Renamed TryRefindToast to TryRefindSuccessToast --- tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs | 9 +++++++-- tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs index db0715b..71109c9 100644 --- a/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs +++ b/tests/Berufsschule_HAM.E2ETests/Helper/AppHelper.cs @@ -66,10 +66,10 @@ public static class AppHelper Thread.Sleep(250); } - public static bool TryRetryFindToast(ChromeDriver driver) + public static bool TryRetryFindSuccessToast(ChromeDriver driver) { int retryCounter = 0; - retry: + retry: try { @@ -96,4 +96,9 @@ public static class AppHelper } return false; } + + public static bool CheckboxGetState(IWebElement webElement) + { + return webElement.GetAttribute("checked") == "true"; + } } \ No newline at end of file diff --git a/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs b/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs index f9c247c..48e1d5c 100644 --- a/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs +++ b/tests/Berufsschule_HAM.E2ETests/InventoryPageTests.cs @@ -77,7 +77,7 @@ public class InventoryPageTests : IDisposable IWebElement okButton = _driver.FindElement(By.CssSelector("#viewAssetModal button.btn.btn-primary[data-bs-dismiss=\"modal\"]")); okButton.Click(); Thread.Sleep(500); - Assert.True(AppHelper.TryRetryFindToast(_driver)); + Assert.True(AppHelper.TryRetryFindSuccessToast(_driver)); } [Fact] @@ -98,7 +98,7 @@ public class InventoryPageTests : IDisposable IWebElement okButton = _driver.FindElement(By.CssSelector("#updateAssetModal button.btn.btn-warning[type=\"submit\"]")); okButton.Click(); Thread.Sleep(500); - Assert.True(AppHelper.TryRetryFindToast(_driver)); + Assert.True(AppHelper.TryRetryFindSuccessToast(_driver)); } [Fact] From a35657ffb123db7ed619b47a9eef95cc61d28fa7 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 9 Nov 2025 20:35:20 +0100 Subject: [PATCH 4/4] Added Groups E2E tests --- .../GroupsPageTests.cs | 58 +++++++++++++ .../Helper/GroupsHelper.cs | 83 +++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs create mode 100644 tests/Berufsschule_HAM.E2ETests/Helper/GroupsHelper.cs diff --git a/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs b/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs new file mode 100644 index 0000000..c280cd6 --- /dev/null +++ b/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs @@ -0,0 +1,58 @@ +using Berufsschule_HAM.E2ETests.Helper; +using OpenQA.Selenium; +using OpenQA.Selenium.Chrome; +using System.Diagnostics; + +namespace Berufsschule_HAM.E2ETests; + +public class GroupsPageTests : IDisposable +{ + private readonly ChromeDriver _driver; + public Uri serverUri; + public string serverUrl; + public Process serverProcess; + + public GroupsPageTests() + { + serverUrl = AppHelper.ServerUrl; + serverUri = AppHelper.ServerUri; + Task app = AppHelper.StartApp(serverUrl); + _driver = AppHelper.GetChromeDriver(); + serverProcess = app.Result; + } + + [Fact] + public void GroupsPage_ShouldShowButton() + { + AppHelper.Login(_driver); + GroupsHelper.NavigateToGroupsPage(_driver); + _driver.FindElement(By.CssSelector("button[data-bs-target=\"#createGroupModal\"]")); + } + + [Fact] + public void GroupsPage_ShouldShowCreateViewModal() + { + AppHelper.Login(_driver); + GroupsHelper.NavigateToGroupsPage(_driver); + List ids = ["cn", "displayname", "canInventorize", "canManageAssets", "canManageUsers", "canManageGroups", "canManageLocations", "canManageSettings"]; + List css = ["#createGroupForm .btn-primary", "#createGroupForm .btn-secondary"]; + ids.ForEach(id => _driver.FindElement(By.Id(id))); + css.ForEach(selector => _driver.FindElement(By.CssSelector(selector))); + } + + [Fact] + public void GroupsPage_ShouldCreateAndUpdateAndDeleteGroup() + { + AppHelper.Login(_driver); + GroupsHelper.NavigateToGroupsPage(_driver); + GroupsHelper.CreateGroup(_driver, "RESERVED_TEST", "TEST GROUP", true, true, true, true, true, true); + GroupsHelper.UpdateGroup(_driver, "RESERVED_TEST", "RESERVED_TEST2", "TEST GROUP", false, false, false, false, false, false); + GroupsHelper.UpdateGroup(_driver, "RESERVED_TEST2", "RESERVED_TEST", "TEST GROUP", true, true, true, true, true, true); + GroupsHelper.DeleteGroup(_driver, "RESERVED_TEST"); + } + public void Dispose() + { + _driver.Quit(); + serverProcess.Kill(); + } +} diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/GroupsHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/GroupsHelper.cs new file mode 100644 index 0000000..16af3dc --- /dev/null +++ b/tests/Berufsschule_HAM.E2ETests/Helper/GroupsHelper.cs @@ -0,0 +1,83 @@ +using System.Diagnostics; +using System.Net; +using OpenQA.Selenium; +using OpenQA.Selenium.Chrome; +using OpenQA.Selenium.Support.UI; + +namespace Berufsschule_HAM.E2ETests.Helper; + +public static class GroupsHelper +{ + public static void CreateGroup(ChromeDriver driver, string cn, string displayName, bool canInventorize, bool canManageAssets, bool canManageUsers, bool canManageGroups, bool canManageLocations, bool canManageSettings) + { + NavigateToGroupsPage(driver); + IWebElement createGroupButton = driver.FindElement(By.CssSelector("button[data-bs-target=\"#createGroupModal\"]")); + createGroupButton.Click(); + Thread.Sleep(500); + driver.FindElement(By.Id("cn")).SendKeys(cn); + driver.FindElement(By.Id("displayname")).SendKeys(displayName); + if (canInventorize) driver.FindElement(By.Id("canInventorize")).Click(); + if (canManageAssets) driver.FindElement(By.Id("canManageAssets")).Click(); + if (canManageUsers) driver.FindElement(By.Id("canManageUsers")).Click(); + if (canManageGroups) driver.FindElement(By.Id("canManageGroups")).Click(); + if (canManageLocations) driver.FindElement(By.Id("canManageLocations")).Click(); + if (canManageSettings) driver.FindElement(By.Id("canManageSettings")).Click(); + IWebElement createButton = driver.FindElement(By.CssSelector("#createGroupForm .btn-primary")); + createButton.Click(); + Assert.True(AppHelper.TryRetryFindSuccessToast(driver)); + } + + public static void UpdateGroup(ChromeDriver driver, string cn, string newCn, string displayName, bool canInventorize, bool canManageAssets, bool canManageUsers, bool canManageGroups, bool canManageLocations, bool canManageSettings) + { + NavigateToGroupsPage(driver); + IWebElement updateGroupButton = driver.FindElement(By.CssSelector($"button[data-group-id=\"{cn}\"].btn-update")); + updateGroupButton.Click(); + Thread.Sleep(500); + var cnInput = driver.FindElement(By.CssSelector("input#groupId")); + cnInput.Click(); + cnInput.Clear(); + cnInput.SendKeys(newCn); + + IWebElement displayNameInput = driver.FindElement(By.Id("dn")); + displayNameInput.Click(); + displayNameInput.Clear(); + displayNameInput.SendKeys(displayName); + Dictionary selectors = new() + { + ["#updateGroupForm #canInventorize"] = canInventorize, + ["#updateGroupForm #canManageAssets"] = canManageAssets, + ["#updateGroupForm #canManageUsers"] = canManageUsers, + ["#updateGroupForm #canManageGroups"] = canManageGroups, + ["#updateGroupForm #canManageLocations"] = canManageLocations, + ["#updateGroupForm #canManageSettings"] = canManageSettings + }; + selectors.ToList().ForEach(kvp => + { + string name = kvp.Key; + bool value = kvp.Value; + IWebElement input = driver.FindElement(By.CssSelector(name)); + if (value != AppHelper.CheckboxGetState(input)) input.Click(); + }); + IWebElement updateButton = driver.FindElement(By.CssSelector("#updateGroupForm .btn-warning")); + updateButton.Click(); + Assert.True(AppHelper.TryRetryFindSuccessToast(driver)); + } + + + public static void DeleteGroup(ChromeDriver driver, string cn) + { + NavigateToGroupsPage(driver); + IWebElement deleteButton = driver.FindElement(By.CssSelector($"button[data-group-id=\"{cn}\"].btn-delete")); + deleteButton.Click(); + Thread.Sleep(1000); + driver.FindElement(By.Id("deleteModal")); + IWebElement deleteConfirmButton = driver.FindElement(By.CssSelector("#deleteModal .btn-danger")); + deleteConfirmButton.Click(); + Assert.True(AppHelper.TryRetryFindSuccessToast(driver)); + } + + public static void NavigateToGroupsPage(ChromeDriver driver) + { + driver.Navigate().GoToUrl(new Uri(AppHelper.ServerUri, "/Home/Groups")); + } +} \ No newline at end of file