|
19 | 19 | import java.util.concurrent.TimeUnit; |
20 | 20 |
|
21 | 21 | 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; |
22 | 26 | import org.openqa.selenium.WebElement; |
| 27 | +import org.openqa.selenium.WrapsDriver; |
23 | 28 | import org.openqa.selenium.WrapsElement; |
24 | 29 | import org.openqa.selenium.remote.LocalFileDetector; |
25 | 30 | import org.openqa.selenium.remote.RemoteWebElement; |
| 31 | +import org.openqa.selenium.safari.SafariDriver; |
26 | 32 |
|
27 | 33 | import com.vaadin.testbench.TestBenchElement; |
28 | 34 | import com.vaadin.testbench.elementsbase.Element; |
@@ -63,7 +69,12 @@ public void upload(File file, int maxSeconds) { |
63 | 69 | if (isMaxFilesReached()) { |
64 | 70 | removeFile(0); |
65 | 71 | } |
66 | | - TestBenchElement uploadElement = setLocalFileDetector(); |
| 72 | + TestBenchElement uploadElement; |
| 73 | + if (isLocalDriver(getDriver())) { |
| 74 | + uploadElement = getUploadElement(); |
| 75 | + } else { |
| 76 | + uploadElement = setLocalFileDetector(); |
| 77 | + } |
67 | 78 |
|
68 | 79 | // Element must be focusable for Edge and Firefox |
69 | 80 | Boolean hidden = uploadElement.getPropertyBoolean("hidden"); |
@@ -161,4 +172,13 @@ public void abort() { |
161 | 172 | this); |
162 | 173 | } |
163 | 174 |
|
| 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 | + |
164 | 184 | } |
0 commit comments