expose Firefox Function and Regex

lsoares · lsoares · commit 5518c39d7433 · 2024-02-28T23:43:07.000Z
diff --git a/lib/src/main/kotlin/seleniumtestinglib/Core.kt b/lib/src/main/kotlin/seleniumtestinglib/Core.kt
@@ -19,19 +19,18 @@ abstract class TL(
 
     @Suppress("unchecked_cast")
     override fun findElements(context: SearchContext): List<WebElement> {
-        context.jsExecutor.ensureScript("testing-library.js", "screen?.queryAllByTestId")
-        return context.jsExecutor.executeScript(
-            buildString {
-                append("return screen.queryAllBy$by(")
-                append(textMatch.escaped)
-                options
-                    .filterValues { it != null }
-                    .takeIf(Map<String, Any?>::isNotEmpty)
-                    ?.escaped
-                    ?.let { append(", $it") }
-                append(")")
-            }
-        ) as List<WebElement>
+        context.jsExecutor.ensureScript("testing-library.js", "window.screen?.queryAllByTestId")
+        val script = buildString {
+            append("return window.screen.queryAllBy$by(")
+            append(textMatch.escaped)
+            options
+                .filterValues { it != null }
+                .takeIf(Map<String, Any?>::isNotEmpty)
+                ?.escaped
+                ?.let { append(", $it") }
+            append(")")
+        }
+        return context.jsExecutor.executeScript(script) as List<WebElement>
     }
 
     private val SearchContext.jsExecutor get() = (getWebDriver(this) as JavascriptExecutor)
diff --git a/lib/src/main/resources/testing-library.js b/lib/src/main/resources/testing-library.js
diff --git a/lib/src/test/kotlin/seleniumtestinglib/driver.kt b/lib/src/test/kotlin/seleniumtestinglib/driver.kt
@@ -12,4 +12,4 @@ fun RemoteWebDriver.render(body: String): User {
 }
 
 fun String.asDataUrl() =
-    """data:text/html;charset=utf-8,<html><body>${this}</body></html>"""
+    """data:text/html;charset=utf-8,<html><body>$this</body></html>"""
diff --git a/testing-library/src/testing-library.js b/testing-library/src/testing-library.js
@@ -2,3 +2,6 @@ import {screen, fireEvent} from '@testing-library/dom'
 
 window.screen = screen
 window.fireEvent = fireEvent
+
+window.__TL__Function = Function
+window.__TL__RegExp = RegExp

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ fun RemoteWebDriver.render(body: String): User {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`fun String.asDataUrl() =`
`15`		`- """data:text/html;charset=utf-8,<html><body>${this}</body></html>"""`
	`15`	`+ """data:text/html;charset=utf-8,<html><body>$this</body></html>"""`