Skip to content
Snippets Groups Projects
Commit 5d2c66bf authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#677 - fixed selenium tests

parent 3f3befa6
Branches
Tags
No related merge requests found
Pipeline #6634 passed
......@@ -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";
......
......@@ -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);
......
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment