Merge pull request #197 from OndrejKotek/HAL-1910

HAL-1910 Fix/migrate tests-hal-basic tests of testsuite.next
hal · Nov 22, 2023 · bae3e34 · bae3e34
2 parents fd20c14 + eacbf20
commit bae3e34
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@
 *.testsuite.properties
 target
 testsuite.properties
-work
+work
+.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/CustomConsoleTitleTest.java b/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/CustomConsoleTitleTest.java
@@ -342,7 +342,8 @@ public void testEmptyInput() {
 
         setTitleAndReloadPage("");
 
-        Assert.assertEquals(HAL_MANAGEMENT_CONSOLE, browser.getTitle());
+        // The default title is derived by browser from ts.html that is used in the test suite instead of index.html
+        Assert.assertEquals(HAL_TEST_SUITE, browser.getTitle());
     }
 
     /**

diff --git a/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/HomePageTest.java b/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/HomePageTest.java
@@ -66,7 +66,6 @@ public void modules() {
         assertTrue(containsModule("Configuration"));
         assertTrue(containsModule("Runtime"));
         assertTrue(containsModule("Access Control"));
-        assertTrue(containsModule("Patching"));
 
         By selector = ByJQuery.selector(".eap-home-module-header > h2" + contains("Need Help?"));
         assertTrue(page.getRootContainer().findElement(selector).isDisplayed());

diff --git a/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/TakeTourTest.java b/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/TakeTourTest.java
@@ -84,9 +84,9 @@ public void standaloneWizardNavigation() throws Exception {
             .verifyNext(ACCESS_CONTROL_TITLE, "By default, EAP uses simple access controls",
                     finderPlace(NameTokens.ACCESS_CONTROL, null))
             .verifyNext(ACCESS_CONTROL_TITLE, "Add and assign roles to users and groups.",
-                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, "users")))
+                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-" + "users")))
             .verifyNext(ACCESS_CONTROL_TITLE, "Manage the list of roles",
-                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, "roles")))
+                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-" + "roles")))
             .verifyFinish();
         }
     }