Fix Locator.WaitFor for detached and hidden states

common/frame.go

@@ -490,6 +490,18 @@ func (f *Frame) waitForSelector(selector string, opts *FrameWaitForSelectorOptio
 	return handle, nil
 }
 
+func (f *Frame) waitFor(selector string, opts *FrameWaitForSelectorOptions) error {
+	f.log.Debugf("Frame:waitFor", "fid:%s furl:%q sel:%q", f.ID(), f.URL(), selector)
+
+	document, err := f.document()
+	if err != nil {
+		return err
+	}
+
+	_, err = document.waitForSelector(f.ctx, selector, opts)
+	return err
+}
+
 // AddScriptTag is not implemented.
 func (f *Frame) AddScriptTag(opts goja.Value) {
 	k6ext.Panic(f.ctx, "Frame.AddScriptTag() has not been implemented yet")

common/js/injected_script.js

@@ -889,11 +889,11 @@ class InjectedScript {
         case "attached":
           return element ? element : continuePolling;
         case "detached":
-          return !element ? undefined : continuePolling;
+          return !element ? true : continuePolling;
         case "visible":
           return visible ? element : continuePolling;
         case "hidden":
-          return !visible ? undefined : continuePolling;
+          return !visible ? element : continuePolling;
       }
     };
 

common/locator.go

@@ -620,6 +620,5 @@ func (l *Locator) WaitFor(opts goja.Value) {
 
 func (l *Locator) waitFor(opts *FrameWaitForSelectorOptions) error {
 	opts.Strict = true
-	_, err := l.frame.waitForSelector(l.selector, opts)
-	return err
+	return l.frame.waitFor(l.selector, opts)
 }

tests/locator_test.go

@@ -17,6 +17,12 @@ import (
 // Note:
 // We skip adding t.Parallel to subtests because goja or our code might race.
 
+type jsFrameWaitForSelectorOpts struct {
+	jsFrameBaseOpts
+
+	State string
+}
+
 func TestLocator(t *testing.T) {
 	t.Parallel()
 
@@ -173,9 +179,36 @@ func TestLocator(t *testing.T) {
 			},
 		},
 		{
-			"WaitFor", func(tb *testBrowser, p api.Page) {
-				timeout := tb.toGojaValue(jsFrameBaseOpts{Timeout: "100"})
-				require.NotPanics(t, func() { p.Locator("#link", nil).WaitFor(timeout) })
+			"WaitFor state:visible", func(tb *testBrowser, p api.Page) {
+				opts := tb.toGojaValue(jsFrameBaseOpts{Timeout: "100"})
+				require.NotPanics(t, func() { p.Locator("#link", nil).WaitFor(opts) })
+			},
+		},
+		{
+			"WaitFor state:attached", func(tb *testBrowser, p api.Page) {
+				opts := tb.toGojaValue(jsFrameWaitForSelectorOpts{
+					jsFrameBaseOpts: jsFrameBaseOpts{Timeout: "100"},
+					State:           "attached",
+				})
+				require.NotPanics(t, func() { p.Locator("#link", nil).WaitFor(opts) })
+			},
+		},
+		{
+			"WaitFor state:hidden", func(tb *testBrowser, p api.Page) {
+				opts := tb.toGojaValue(jsFrameWaitForSelectorOpts{
+					jsFrameBaseOpts: jsFrameBaseOpts{Timeout: "100"},
+					State:           "hidden",
+				})
+				require.NotPanics(t, func() { p.Locator("#inputHiddenText", nil).WaitFor(opts) })
+			},
+		},
+		{
+			"WaitFor state:detached", func(tb *testBrowser, p api.Page) {
+				opts := tb.toGojaValue(jsFrameWaitForSelectorOpts{
+					jsFrameBaseOpts: jsFrameBaseOpts{Timeout: "100"},
+					State:           "detached",
+				})
+				require.NotPanics(t, func() { p.Locator("#nonExistingElement", nil).WaitFor(opts) })
 			},
 		},
 	}

tests/static/locators.html

@@ -12,6 +12,7 @@
     <input id="inputCheckbox" type="checkbox" />
     <input type="checkbox" />
     <input id="inputText" type="text" value="something" />
+    <input id="inputHiddenText" type="text" hidden="true">
     <div id="divHello"><span>hello</span></div>
     <div><span>bye</span></div>
     <textarea>text area</textarea>
@@ -40,4 +41,4 @@
     </script>
 </body>
 
-</html>
+</html>