From e897108d8f1c8af9d22daeb029bdca7c7646aeb2 Mon Sep 17 00:00:00 2001 From: Joshua Rodriguez Date: Tue, 26 Mar 2024 17:10:18 -0700 Subject: [PATCH] Interfaces fixes and test fixes(?) --- .../java/jpl/cws/test/integration/ui/InitiatorsTestIT.java | 5 ++++- .../test/java/jpl/cws/test/integration/ui/LoadTestIT.java | 5 ++++- .../java/jpl/cws/test/integration/ui/WorkersTestIT.java | 6 +++++- cws-ui/src/main/webapp/css/deployments.css | 2 +- install/cws-ui/navbar.ftl | 2 +- install/cws-ui/processes.ftl | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java index d10dcb2b..8156dacf 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java @@ -130,7 +130,10 @@ public void runStartInitiatorTest() throws IOException { driver.findElement(By.id("saveXmlBtn")).click(); waitForElementID("saveConfirmBtn"); - driver.findElement(By.id("saveConfirmBtn")).click(); + WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn")); + + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn); + saveConfirmBtn.click(); wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn"))); diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java index 48fae506..196bd15f 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java @@ -177,7 +177,10 @@ public void runStartLoadTest() throws IOException { driver.findElement(By.id("saveXmlBtn")).click(); waitForElementID("saveConfirmBtn"); - driver.findElement(By.id("saveConfirmBtn")).click(); + WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn")); + + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn); + saveConfirmBtn.click(); wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn"))); diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java index 09b64d32..76b56e11 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java @@ -268,7 +268,11 @@ public void runThreadLimitTest() throws IOException { waitForElementID("saveConfirmBtn"); log.info("Clicking on 'Save Confirm' button."); - driver.findElement(By.id("saveConfirmBtn")).click(); + WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn")); + + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn); + + saveConfirmBtn.click(); wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn"))); diff --git a/cws-ui/src/main/webapp/css/deployments.css b/cws-ui/src/main/webapp/css/deployments.css index 40cfe293..fa7b511b 100644 --- a/cws-ui/src/main/webapp/css/deployments.css +++ b/cws-ui/src/main/webapp/css/deployments.css @@ -200,7 +200,7 @@ display: flex; flex-direction: row; justify-content: center; - align-items: stretch; + align-items: center; align-content: space-between; gap: 10px; } diff --git a/install/cws-ui/navbar.ftl b/install/cws-ui/navbar.ftl index 4d337e00..2ceafa33 100644 --- a/install/cws-ui/navbar.ftl +++ b/install/cws-ui/navbar.ftl @@ -9,7 +9,7 @@