Skip to content

Commit ce85257

Browse files
authored
fix: Fix UploadElement with local drivers and Selenium 4 (#2667)
Fixes #2633
1 parent e6b2b92 commit ce85257

1 file changed

Lines changed: 21 additions & 1 deletion

File tree

  • vaadin-upload-flow-parent/vaadin-upload-testbench/src/main/java/com/vaadin/flow/component/upload/testbench

‎vaadin-upload-flow-parent/vaadin-upload-testbench/src/main/java/com/vaadin/flow/component/upload/testbench/UploadElement.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@
1919
import java.util.concurrent.TimeUnit;
2020

2121
import org.openqa.selenium.WebDriver.Timeouts;
22+
import org.openqa.selenium.chrome.ChromeDriver;
23+
import org.openqa.selenium.chromium.ChromiumDriver;
24+
import org.openqa.selenium.firefox.FirefoxDriver;
25+
import org.openqa.selenium.WebDriver;
2226
import org.openqa.selenium.WebElement;
27+
import org.openqa.selenium.WrapsDriver;
2328
import org.openqa.selenium.WrapsElement;
2429
import org.openqa.selenium.remote.LocalFileDetector;
2530
import org.openqa.selenium.remote.RemoteWebElement;
31+
import org.openqa.selenium.safari.SafariDriver;
2632

2733
import com.vaadin.testbench.TestBenchElement;
2834
import com.vaadin.testbench.elementsbase.Element;
@@ -63,7 +69,12 @@ public void upload(File file, int maxSeconds) {
6369
if (isMaxFilesReached()) {
6470
removeFile(0);
6571
}
66-
TestBenchElement uploadElement = setLocalFileDetector();
72+
TestBenchElement uploadElement;
73+
if (isLocalDriver(getDriver())) {
74+
uploadElement = getUploadElement();
75+
} else {
76+
uploadElement = setLocalFileDetector();
77+
}
6778

6879
// Element must be focusable for Edge and Firefox
6980
Boolean hidden = uploadElement.getPropertyBoolean("hidden");
@@ -161,4 +172,13 @@ public void abort() {
161172
this);
162173
}
163174

175+
private static boolean isLocalDriver(WebDriver driver) {
176+
while (driver instanceof WrapsDriver) {
177+
driver = ((WrapsDriver) driver).getWrappedDriver();
178+
}
179+
return driver instanceof ChromiumDriver
180+
|| driver instanceof FirefoxDriver
181+
|| driver instanceof SafariDriver;
182+
}
183+
164184
}

0 commit comments

Comments
 (0)