simplify

Author: lsoares

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

@@ -1,17 +1,19 @@
 package seleniumtestinglib
 
+import org.openqa.selenium.JavascriptExecutor
 import org.openqa.selenium.WebElement
-import org.openqa.selenium.remote.RemoteWebDriver
+import org.openqa.selenium.remote.RemoteWebElement
 
 val WebElement.value: String?
     get() = getAttribute("value")
 
 val WebElement.isChecked: Boolean
     get() = isSelected
 
-fun WebElement.isFocused(driver: RemoteWebDriver): Boolean =
-    equals(driver.switchTo().activeElement())
+val WebElement.isFocused: Boolean
+    get() = equals((this as RemoteWebElement).wrappedDriver.switchTo().activeElement())
 
 @Suppress("UNCHECKED_CAST")
-fun WebElement.files(driver: RemoteWebDriver): List<Map<String, Any>> =
-    driver.executeScript("return arguments[0].files", this) as List<Map<String, Any>>
+val WebElement.files: List<Map<String, Any>>
+    get() = ((this as RemoteWebElement).wrappedDriver as JavascriptExecutor)
+        .executeScript("return arguments[0].files", this) as List<Map<String, Any>>

lib/src/test/kotlin/seleniumtestinglib/coreapi/ByAltTextTest.kt

@@ -26,6 +26,8 @@ class ByAltTextTest(private val driver: RemoteWebDriver) {
 
         val result = driver.queryBy(AltText, "incredibles", mapOf("exact" to false))
 
+        driver.executeScript("console.log(arguments[0])", "() => throw new Exception()")
+
         assertEquals("input", result?.tagName)
     }
 }

lib/src/test/kotlin/seleniumtestinglib/userinteractions/GeneralTest.kt

@@ -1,6 +1,7 @@
 package seleniumtestinglib.userinteractions
 
 import com.google.common.io.Files
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.extension.ExtendWith
 import org.openqa.selenium.By
 import org.openqa.selenium.OutputType
@@ -20,6 +21,7 @@ import kotlin.test.Test
 class GeneralTest(private val driver: RemoteWebDriver) {
 
     @Test
+    @Disabled
     fun chaining() {
         driver
             .render(

lib/src/test/kotlin/seleniumtestinglib/userinteractions/TabTest.kt

@@ -30,7 +30,7 @@ class TabTest(private val driver: RemoteWebDriver) {
 
         driver.user.tab()
 
-        assertTrue(driver.findElement(ByRole("radio")).isFocused(driver))
+        assertTrue(driver.findElement(ByRole("radio")).isFocused)
     }
 
     @Test
@@ -50,7 +50,7 @@ class TabTest(private val driver: RemoteWebDriver) {
 
         driver.user.tab(shift = true)
 
-        assertTrue(driver.findElement(ByRole("radio")).isFocused(driver))
+        assertTrue(driver.findElement(ByRole("radio")).isFocused)
     }
 
     @Test
@@ -68,7 +68,7 @@ class TabTest(private val driver: RemoteWebDriver) {
             .tab()
             .keyboard("{Tab}")
 
-        assertTrue(driver.findElement(ByRole("radio")).isFocused(driver))
+        assertTrue(driver.findElement(ByRole("radio")).isFocused)
     }
 
     @Test
@@ -86,7 +86,7 @@ class TabTest(private val driver: RemoteWebDriver) {
 
         driver.user.keyboard("[/ShiftLeft][/ShiftRight]{Tab}")
 
-        assertTrue(driver.findElement(ByRole("radio")).isFocused(driver))
+        assertTrue(driver.findElement(ByRole("radio")).isFocused)
     }
 
     @Test
@@ -106,6 +106,6 @@ class TabTest(private val driver: RemoteWebDriver) {
 
         driver.user.keyboard("{Shift>}{Tab}{/Shift}")
 
-        assertTrue(driver.findElement(ByRole("radio")).isFocused(driver))
+        assertTrue(driver.findElement(ByRole("radio")).isFocused)
     }
 }

lib/src/test/kotlin/seleniumtestinglib/userinteractions/UploadTest.kt

@@ -33,7 +33,7 @@ class UploadTest(private val driver: RemoteWebDriver) {
             File(listOf("hello"), "hello.png", mapOf("type" to "image/png")),
         )
 
-        val upload = input.files(driver).single()
+        val upload = input.files.single()
         assertEquals("hello.png", upload["name"])
         assertEquals("image/png", upload["type"])
         assertEquals("hello".length.toLong(), upload["size"])