From c4b7f86458bc609868634f10b262652ca3dcc355 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 26 Feb 2023 21:55:46 +0100
Subject: [PATCH] fixed selenium tests
---
.../budgetmaster/accounts/AccountController.java | 2 +-
.../src/main/resources/templates/helpers/iconSelect.ftl | 6 +++---
.../budgetmaster/integration/selenium/ChartTest.java | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index ad7e06092..123d873c2 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -78,7 +78,7 @@ public class AccountController extends BaseController
{
final StringBuffer requestURL = request.getRequestURL();
final String baseUrl = requestURL.substring(0, requestURL.length() - request.getRequestURI().length());
- referer = baseUrl + "/transactions/";
+ referer = baseUrl + "/transactions";
}
if(referer.contains(ACCOUNT_SELECTED_INDICATOR))
diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
index db0caf5d6..e8e2c572e 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
@@ -79,14 +79,14 @@
<#assign hasImageIcon=item.getIconReference()?? && item.getIconReference().isImageIcon()/>
<#if hasImageIcon>
- <#assign selectedImageID=item.getIconReference().getImage().getID()?c/>
+ <#assign availableImagesUrl='/media/getAvailableImages/' + item.getIconReference().getImage().getID()?c/>
<#else>
- <#assign selectedImageID=""/>
+ <#assign availableImagesUrl='/media/getAvailableImages'/>
</#if>
<@progressIndicator/>
- <div class="row" id="available-images" data-url="<@s.url '/media/getAvailableImages/' + selectedImageID/>">
+ <div class="row" id="available-images" data-url="<@s.url availableImagesUrl/>">
</div>
</#macro>
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
index 94cdcee31..36d8594d1 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
@@ -385,6 +385,7 @@ class ChartTest extends SeleniumTestBase
wait = new WebDriverWait(driver, Duration.ofSeconds(5));
wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("matchingTransactionsTitle")));
+ ((JavascriptExecutor) driver).executeScript("arguments[0].scrollIntoView(true);", driver.findElement(By.id("matchingTransactionsTitle")));
assertThat(driver.findElements(By.className("search-result"))).hasSizeGreaterThan(0);
}
--
GitLab