From 5d2c66bf974dd04ed7225b3c6b9fad8ab43a301d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 23 Jul 2022 20:57:30 +0200
Subject: [PATCH] #677 - fixed selenium tests
---
.../budgetmaster/transactions/TransactionController.java | 6 ------
.../src/main/resources/static/js/transactions.js | 3 ++-
.../integration/selenium/settings/BackupSettingsTest.java | 6 +-----
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 1465be91e..c8f919d1f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -46,11 +46,6 @@ import static java.time.temporal.TemporalAdjusters.lastDayOfMonth;
@RequestMapping(Mappings.TRANSACTIONS)
public class TransactionController extends BaseController
{
- private static class ModelAttributes
- {
- public static final String KEYWORD = "keyword";
- }
-
private static class ReturnValues
{
public static final String ALL_ENTITIES = "transactions/transactions";
@@ -62,7 +57,6 @@ public class TransactionController extends BaseController
public static final String REDIRECT_NEW_TRANSACTION = "redirect:/transactions/newTransaction/normal";
public static final String NEW_TRANSACTION = "transactions/newTransactionNormal";
public static final String CHANGE_TYPE = "transactions/changeTypeModal";
- public static final String KEYWORD_WARNING = "transactions/transactionNameKeywordWarningModal";
}
private static final String CONTINUE = "continue";
diff --git a/BudgetMasterServer/src/main/resources/static/js/transactions.js b/BudgetMasterServer/src/main/resources/static/js/transactions.js
index cfdcc2c4e..995433503 100644
--- a/BudgetMasterServer/src/main/resources/static/js/transactions.js
+++ b/BudgetMasterServer/src/main/resources/static/js/transactions.js
@@ -385,7 +385,8 @@ function convertDateWithoutDots(dateString)
function validateForm(isSaveAndContinue = false, allowEmptyAmount = false, skipKeywordCheck = false)
{
// name (keyword check)
- let isExpenditure = document.getElementById('input-isPayment').value === "1";
+ let isExpenditureSwitch = document.getElementById('input-isPayment');
+ let isExpenditure = isExpenditureSwitch !== null && isExpenditureSwitch.value === "1";
if(!skipKeywordCheck && isExpenditure)
{
let nameContainsKeywords = checkNameForKeywords(isSaveAndContinue);
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
index a8d58060b..bcb5ffc16 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
@@ -90,11 +90,7 @@ class BackupSettingsTest extends SeleniumTestBase
driver.findElements(By.cssSelector("#backupSettingsContainer button")).get(1).click();
wait = new WebDriverWait(driver, Duration.ofSeconds(5));
- wait.until(ExpectedConditions.visibilityOfElementLocated(By.className("toast")));
-
- // assert
- assertThat(driver.findElement(By.className("toast")).getText())
- .contains("Error saving settings");
+ wait.until(ExpectedConditions.attributeContains(By.id("settings-backup-auto-days"), "data-tooltip", "greater than 0"));
assertThat(driver.findElement(By.cssSelector("#backupSettingsContainerHeader .collapsible-header-button")).isDisplayed())
.isTrue();
--
GitLab