aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-31 11:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
nicolas.dorier
2025-04-20 23:40:43 +09:00
parent 61782940c5
commit 892dda0d3b
4 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
BTCPayServer.Tests/SeleniumTester.cs
View File

@@ -138,26 +138,37 @@ retry:
}
public IWebElement FindAlertMessage(params StatusMessageModel.StatusSeverity[] severity)
{
var className = string.Join(", ", severity.Select(statusSeverity => $".alert-{StatusMessageModel.ToString(statusSeverity)}"));
IWebElement el;
int retry = 0;
retry:
try
{
var elements = Driver.FindElements(By.CssSelector(className));
el = elements.FirstOrDefault(e => e.Displayed);
if (el is null)
el = elements.FirstOrDefault();
if (el is null)
var className = string.Join(", ", severity.Select(statusSeverity => $".alert-{StatusMessageModel.ToString(statusSeverity)}"));
IWebElement el;
try
{
var elements = Driver.FindElements(By.CssSelector(className));
el = elements.FirstOrDefault(e => e.Displayed);
if (el is null)
el = elements.FirstOrDefault();
if (el is null)
el = Driver.WaitForElement(By.CssSelector(className));
}
catch (NoSuchElementException)
{
el = Driver.WaitForElement(By.CssSelector(className));
}
if (el is null)
throw new NoSuchElementException($"Unable to find {className}");
if (!el.Displayed)
throw new ElementNotVisibleException($"{className} is present, but not displayed: {el.GetAttribute("id")} - Text: {el.Text}");
return el;
}
catch (NoSuchElementException)
// Selenium sometimes sucks...
catch (StaleElementReferenceException) when (retry < 5)
{
el = Driver.WaitForElement(By.CssSelector(className));
retry++;
goto retry;
}
if (el is null)
throw new NoSuchElementException($"Unable to find {className}");
if (!el.Displayed)
throw new ElementNotVisibleException($"{className} is present, but not displayed: {el.GetAttribute("id")} - Text: {el.Text}");
return el;
}
public string Link(string relativeLink)

23
BTCPayServer.Tests/SeleniumTests.cs
View File

@@ -866,6 +866,7 @@ namespace BTCPayServer.Tests
s.Driver.FindElement(By.Id("SaveEmailRules")).Click();
// Ensure that the rule is created
s.FindAlertMessage();
Assert.DoesNotContain("There are no rules yet.", s.Driver.PageSource);
Assert.Contains("invoicecreated@gmail.com", s.Driver.PageSource);
Assert.Contains("Invoice {Invoice.Id} created", s.Driver.PageSource);
@@ -881,6 +882,7 @@ namespace BTCPayServer.Tests
s.Driver.FindElement(By.Id("SaveEmailRules")).Click();
// Validate the second rule is added
s.FindAlertMessage();
Assert.Contains("statuschanged@gmail.com", s.Driver.PageSource);
Assert.Contains("Status changed!", s.Driver.PageSource);
@@ -897,8 +899,29 @@ namespace BTCPayServer.Tests
s.Driver.FindElement(By.Id("SaveEmailRules")).Click();
// Validate that the email is updated in the list of email rules
s.FindAlertMessage();
Assert.Contains("changedagain@gmail.com", s.Driver.PageSource);
Assert.DoesNotContain("statuschanged@gmail.com", s.Driver.PageSource);
// Delete both email rules
var deleteLinks = s.Driver.FindElements(By.XPath("//a[contains(text(), 'Remove')]"));
Assert.True(deleteLinks.Count == 2, "Expected exactly two delete buttons but found a different number.");
deleteLinks[0].Click();
s.Driver.WaitForElement(By.Id("ConfirmInput")).SendKeys("REMOVE");
s.Driver.FindElement(By.Id("ConfirmContinue")).Click();
s.FindAlertMessage();
deleteLinks = s.Driver.FindElements(By.XPath("//a[contains(text(), 'Remove')]")); // Refresh list
Assert.True(deleteLinks.Count == 1, "Expected one delete button remaining.");
deleteLinks[0].Click();
s.Driver.WaitForElement(By.Id("ConfirmInput")).SendKeys("REMOVE");
s.Driver.FindElement(By.Id("ConfirmContinue")).Click();
s.FindAlertMessage();
// Validate that there are no more rules
Assert.Contains("There are no rules yet.", s.Driver.PageSource);
}
[Fact(Timeout = TestTimeout)]

3
BTCPayServer/Controllers/UIStoresController.EmailRules.cs
View File

@@ -72,6 +72,7 @@ namespace BTCPayServer.Controllers
store.SetStoreBlob(blob);
await _storeRepo.UpdateStore(store);
this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully created"]);
return RedirectToAction(nameof(StoreEmailRulesList), new { storeId });
}
@@ -111,6 +112,7 @@ namespace BTCPayServer.Controllers
store.SetStoreBlob(blob);
await _storeRepo.UpdateStore(store);
this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully updated"]);
return RedirectToAction(nameof(StoreEmailRulesList), new { storeId });
}
@@ -128,6 +130,7 @@ namespace BTCPayServer.Controllers
store.SetStoreBlob(blob);
await _storeRepo.UpdateStore(store);
this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully deleted"]);
return RedirectToAction(nameof(StoreEmailRulesList), new { storeId });
}

2
BTCPayServer/Views/UIStores/StoreEmailRulesList.cshtml
View File

@@ -53,7 +53,7 @@
<td class="actions-col" permission="@Policies.CanModifyStoreSettings">
<div class="d-inline-flex align-items-center gap-3">
<a asp-action="StoreEmailRulesEdit" asp-route-storeId="@storeId" asp-route-ruleIndex="@rule.index">Edit</a>
<a asp-action="StoreEmailRulesDelete" asp-route-storeId="@storeId" asp-route-ruleIndex="@rule.index" data-bs-toggle="modal" data-bs-target="#ConfirmModal" data-description="@StringLocalizer["This action will remove the rule with the trigger {0}.", Html.Encode(rule.value.Trigger)]" data-confirm-input="@StringLocalizer["REMOVE"]" text-translate="true">Remove</a>
<a asp-action="StoreEmailRulesDelete" asp-route-storeId="@storeId" asp-route-ruleIndex="@rule.index" data-bs-toggle="modal" data-bs-target="#ConfirmModal" data-description="@ViewLocalizer["This action will remove the rule with the trigger <b>{0}</b>.", Html.Encode(rule.value.Trigger)]" data-confirm-input="@StringLocalizer["REMOVE"]" text-translate="true">Remove</a>
</div>
</td>
</tr>