Merge pull request #4 from testla-project/bugfix/utils_nullcheck

Bugfix/utils nullcheck

Author: munichbughunter

src/main/java/testla/web/Utils.java

@@ -44,7 +44,7 @@ private Locator getLocatorFromLocator(Locator locator, String selector, @Nullabl
     }
 
     /**
-     * Wait until the given locator has the given state. default state is visible if no state is specified. timeout optional.
+     * Wait until the given locator has the given state. Default state is visible if no state is specified. Timeout optional.
      *
      * @param locator - the locator
      * @param timeout - timeout can be null
@@ -65,6 +65,14 @@ private void waitForLocator(Locator locator, @Nullable Double timeout, @Nullable
      * @return Locator - the locator found on the page
      */
     public Locator recursiveLocatorLookup(Page page, String selector, SelectorOptions options) {
+        // double check if this method was somehow called with options == null.
+        // if this is really the case, just resolve the locator, wait for it to be visible and return it.
+        if (options == null) {
+            Locator locator = getPageLocator(page, selector, null);
+            waitForLocator(locator, null, null);
+            return locator;
+        }
+
         // replace selector placeholders if present.
         if (options.replacements != null) {
             selector = replacePlaceholders(selector, options.replacements);

src/test/java/WebTest.java

@@ -7,14 +7,12 @@
 import com.microsoft.playwright.options.SameSiteAttribute;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 import testla.screenplay.actor.Actor;
 import testla.web.SelectorOptions;
 import testla.web.SelectorOptionsState;
 import testla.web.SubSelector;
-import testla.web.Utils;
 import testla.web.abilities.BrowseTheWeb;
 import testla.web.actions.Add;
 import testla.web.actions.Check;
@@ -58,13 +56,6 @@ void getPage() {
         actorPage = (Page) actor.states("page");
     }
 
-    // @Test // will fail
-    @Disabled
-    void placeholderTest() {
-        Utils utils = new Utils();
-        utils.recursiveLocatorLookup(null, "id=[%s]", new SelectorOptions().setReplacements("title"));
-    }
-
 
     @Test
     void navigateTest() {
@@ -75,6 +66,7 @@ void navigateTest() {
         assertThat(actorPage).hasURL("https://www.google.de/");
     }
 
+    // also tests placeholders
     @Test
     void dragAndDropTest() {
         actor.attemptsTo(
@@ -86,7 +78,8 @@ void dragAndDropTest() {
 
         // execute the drag
         actor.attemptsTo(
-                DragAndDrop.execute("[id='column-a']", "[id='column-b']")
+                DragAndDrop.execute("[id='column-%s']", "[id='column-b']",
+                        new SelectorOptions().setReplacements("a"), null)
         );
         // after Drag: Box B is on the Left
         assertThat(actorPage.locator("[id='column-a'] header")).hasText("B");