✅ : make selenium tests work again

src/main/client/app/pages/modules/modules.vue

@@ -14,6 +14,7 @@
         v-for="module in modules"
         :key="module.id"
         :title="module.name"
+        class="moduleCard"
       >
         <b-card-text>
           <app-cli-badge

src/main/client/app/shared/components/topbar/top-bar-user.vue

@@ -2,7 +2,7 @@
   <b-nav-item-dropdown>
     <template v-slot:button-content>
       <font-awesome-icon :icon="['far', 'user']" />
-      <span>{{ user.username }}</span>
+      <span id="user.name">{{ user.username }}</span>
     </template>
     <b-dropdown-item @click="doLogout">
       <span>Log Out</span>

src/test/java/io/codeka/gaia/e2e/DashboardPage.kt

@@ -1,28 +1,43 @@
 package io.codeka.gaia.e2e
 
+import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
 import org.openqa.selenium.support.FindBy
+import org.openqa.selenium.support.ui.ExpectedCondition
+import org.openqa.selenium.support.ui.ExpectedConditions
+import org.openqa.selenium.support.ui.WebDriverWait
 
 class DashboardPage (val webDriver: WebDriver){
 
     init {
-        if(! webDriver.title.equals("Gaia - A terraform UI")){
+        if(! webDriver.currentUrl.endsWith("/dashboard")){
             throw IllegalStateException("This is not the dashboard page. Current page is ${webDriver.title}")
         }
     }
 
-    @FindBy(className= "modules_count")
+    fun waitForPageLoaded() {
+        val wait = WebDriverWait(webDriver, 10)
+        wait.until(ExpectedConditions.titleIs("Gaia - Dashboard"))
+        wait.until(ExpectedConditions.numberOfElementsToBe(By.className("b-overlay"), 0))
+
+        // getting widget values
+        wait.until(ExpectedConditions.numberOfElementsToBe(By.className("widget-value"), 3))
+
+        val countElements = webDriver.findElements(By.className("widget-value"))
+        modulesCountElement = countElements[0]
+        stacksCountElement = countElements[1]
+        stacksToUpdateCountElement = countElements[2]
+    }
+
     private lateinit var modulesCountElement: WebElement
 
-    @FindBy(className="stacks_count")
     private lateinit var stacksCountElement: WebElement
 
-    @FindBy(className = "stacks_toUpdate_count")
     private lateinit var stacksToUpdateCountElement: WebElement
 
     fun modulesCount() = this.modulesCountElement.text.toInt()
     fun stacksCount() = this.stacksCountElement.text.toInt()
     fun stacksToUpdateCount() = this.stacksToUpdateCountElement.text.toInt()
 
-}
+}

src/test/java/io/codeka/gaia/e2e/JobPage.kt

@@ -17,4 +17,4 @@ class JobPage(webDriver: WebDriver) {
 
     fun jobDetailTitle() : String = jobDetailTitle.text
 
-}
+}

src/test/java/io/codeka/gaia/e2e/LoginPage.kt

@@ -1,16 +1,21 @@
 package io.codeka.gaia.e2e
 
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.openqa.selenium.By
+import org.openqa.selenium.JavascriptExecutor
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
 import org.openqa.selenium.support.FindBy
 import org.openqa.selenium.support.PageFactory
+import org.openqa.selenium.support.ui.ExpectedConditions
+import org.openqa.selenium.support.ui.ExpectedConditions.*
+import org.openqa.selenium.support.ui.WebDriverWait
 
 class LoginPage(val webDriver: WebDriver) {
 
     init {
-        if(! webDriver.currentUrl.contains("login")){
-            throw IllegalStateException("This is not the login page. Current page is ${webDriver.currentUrl}")
-        }
+        val wait = WebDriverWait(webDriver, 10)
+        wait.until { titleIs("Gaia - A terraform UI - Login") }
     }
 
     @FindBy(name="username")
@@ -23,12 +28,15 @@ class LoginPage(val webDriver: WebDriver) {
     lateinit var submitButton: WebElement
 
     fun login(login: String, password: String){
-        if(webDriver.currentUrl.contains("login")){
-            loginInput.sendKeys(login)
-            passwordInput.sendKeys(password)
-            submitButton.click()
-        }
-        return PageFactory.initElements(this.webDriver, DashboardPage::class)
+        loginInput.sendKeys(login)
+        passwordInput.sendKeys(password)
+        submitButton.click()
+
+        // wait for successful login
+        val wait = WebDriverWait(webDriver, 10)
+        wait.until { titleIs("Gaia - A terraform UI").andThen { elementToBeClickable(By.id("user.name")) } }
+
+        assertEquals("admin", webDriver.findElement(By.id("user.name")).text);
     }
 
-}
+}

src/test/java/io/codeka/gaia/e2e/ModulesPage.kt

@@ -3,18 +3,26 @@ package io.codeka.gaia.e2e
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
+import org.openqa.selenium.support.ui.ExpectedConditions
+import org.openqa.selenium.support.ui.WebDriverWait
 
-class ModulesPage (webDriver: WebDriver){
+class ModulesPage (val webDriver: WebDriver){
 
-    private var moduleCards: List<WebElement>
+    private lateinit var moduleCards: List<WebElement>
 
     init {
-        if(! webDriver.title.equals("Gaia - Modules")){
-            throw IllegalStateException("This is not the modules page. Current page is ${webDriver.title}")
+        if(! webDriver.currentUrl.endsWith("/modules")){
+            throw IllegalStateException("This is not the modules page. Current page is ${webDriver.currentUrl}")
         }
-        moduleCards = webDriver.findElements(By.className("card"));
     }
 
     fun modulesCount() = this.moduleCards.size
 
-}
+    fun waitForPageLoaded() {
+        val wait = WebDriverWait(webDriver, 10)
+        wait.until(ExpectedConditions.visibilityOfElementLocated(By.className("moduleCard")))
+
+        moduleCards = webDriver.findElements(By.className("moduleCard"));
+    }
+
+}

src/test/java/io/codeka/gaia/e2e/SeleniumIT.java

@@ -28,10 +28,8 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 @Testcontainers
-
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Tag("e2e")
-@Disabled("Disabled until complete migration of client")
 public class SeleniumIT {
 
     @LocalServerPort
@@ -84,7 +82,8 @@ void loginPage() {
         driver.get(testUrl());
         driver.manage().window().setSize(new Dimension(1280,800));
 
-        LoginPage page = PageFactory.initElements(driver, LoginPage.class);
+        var page = new LoginPage(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, 10), page);
 
         percy.snapshot("Login Page");
 
@@ -93,9 +92,11 @@ void loginPage() {
 
     @Test
     void dashboardPage_showsModuleCount() {
-        driver.get(testUrl()+"/");
+        driver.get(testUrl()+"/dashboard");
 
-        var page = PageFactory.initElements(driver, DashboardPage.class);
+        var page = new DashboardPage(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, 10), page);
+        page.waitForPageLoaded();
 
         assertEquals(3, page.modulesCount());
         assertEquals(1, page.stacksCount());
@@ -108,7 +109,10 @@ void dashboardPage_showsModuleCount() {
     void modulesPage_showsModules() {
         driver.get(testUrl()+"/modules");
 
-        var page = PageFactory.initElements(driver, ModulesPage.class);
+        var page = new ModulesPage(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, 10), page);
+        page.waitForPageLoaded();
+
         assertEquals(3, page.modulesCount());
 
         percy.snapshot("Modules");
@@ -130,7 +134,7 @@ void modulePage_showsModuleDetails() {
 
     @Test
     void stackPage_showsStackDetails() {
-        driver.get(testUrl()+"/stacks/de28a01f-257a-448d-8e1b-00e4e3a41db2");
+        driver.get(testUrl()+"/stacks/de28a01f-257a-448d-8e1b-00e4e3a41db2/edit");
 
         var page = new StackPage(driver);
         PageFactory.initElements(new AjaxElementLocatorFactory(driver, 10), page);
@@ -152,9 +156,13 @@ void jobPage_showsJobDetails() {
         percy.snapshot("Job Details");
     }
 
-    void takeScreenshot() throws IOException {
+    void takeScreenshot() {
         var file = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
         System.out.println(file.getAbsolutePath());
-        FileUtils.copyFileToDirectory(file, new File("./target"));
+        try {
+            FileUtils.copyFileToDirectory(file, new File("./target"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 }