simplify

Author: lsoares

lib/src/main/kotlin/seleniumtestinglib/Core.kt

@@ -22,14 +22,13 @@ abstract class TL(
         context.jsExecutor.ensureScript("testing-library.js", "screen?.queryAllByTestId")
         return context.jsExecutor.executeScript(
             buildString {
-                append("return screen.queryAllBy")
-                append("$by(${textMatch.escaped}")
-                if (options.filterValues { it != null }.isNotEmpty()) append(",")
+                append("return screen.queryAllBy$by(")
+                append(textMatch.escaped)
                 options
                     .filterValues { it != null }
                     .takeIf(Map<String, Any?>::isNotEmpty)
                     ?.escaped
-                    ?.let { append(it) }
+                    ?.let { append(", $it") }
                 append(")")
             }
         ) as List<WebElement>

lib/src/test/kotlin/seleniumtestinglib/jestdom/RequiredTest.kt

@@ -2,7 +2,7 @@ package seleniumtestinglib.jestdom
 
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
-import org.openqa.selenium.By
+import org.openqa.selenium.By.cssSelector
 import seleniumtestinglib.driver
 import seleniumtestinglib.expect
 import seleniumtestinglib.isRequired
@@ -30,7 +30,7 @@ class RequiredTest {
     fun required(html: String) {
         driver.render(html)
 
-        val element = driver.findElement(By.cssSelector("input,select,textarea,div"))
+        val element = driver.findElement(cssSelector("input,select,textarea,div"))
         assertTrue(element.isRequired)
         expect(element).toBeRequired()
     }
@@ -47,7 +47,7 @@ class RequiredTest {
     fun `not required`(html: String) {
         driver.render(html)
 
-        val element = driver.findElement(By.cssSelector("input,div"))
+        val element = driver.findElement(cssSelector("input,div"))
         assertFalse(element.isRequired)
         expect(element).not.toBeRequired()
     }