diff --git a/drivers.xml b/drivers.xml index 51d1c8b12f3..b602e4e757c 100644 --- a/drivers.xml +++ b/drivers.xml @@ -2,10 +2,10 @@ - + - https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_win32.zip - 40aeb7b0b3a3ea23a139a764b56e172f2fdb90a4 + https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_win32.zip + e06f7553e68df7eec76a6fd0e1a21317807bf945 sha1 @@ -13,10 +13,10 @@ - + - https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_linux64.zip - 0e8848ebca11706768fd748dd0282672acad35ac + https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip + fb412fdbf282ec5ceeddb2f6cf700268fde4ee44 sha1 @@ -24,13 +24,13 @@ - + - https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_mac64.zip - 3b58b8039f363de3b13a8bea7d4646105fbbd177 + https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_mac64.zip + 5ad2f2fa798095f20a7086b1bad1047fb138fa83 sha1 - \ No newline at end of file + diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/DefaultValueInitializationIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/DefaultValueInitializationIT.java index 6d2a6456622..e55e11c6365 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/DefaultValueInitializationIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/DefaultValueInitializationIT.java @@ -19,9 +19,8 @@ import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.flow.testutil.ChromeBrowserTest; - -public class DefaultValueInitializationIT extends ChromeBrowserTest implements HasById{ +public class DefaultValueInitializationIT extends EmbeddingChromeBrowserTest + implements HasById { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddedWebComponentIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddedWebComponentIT.java index 1f9d7068b71..0214d20875b 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddedWebComponentIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddedWebComponentIT.java @@ -19,10 +19,10 @@ import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class EmbeddedWebComponentIT extends ChromeBrowserTest implements HasById { +public class EmbeddedWebComponentIT extends EmbeddingChromeBrowserTest + implements HasById { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddingChromeBrowserTest.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddingChromeBrowserTest.java new file mode 100644 index 00000000000..965088f6b56 --- /dev/null +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddingChromeBrowserTest.java @@ -0,0 +1,19 @@ +package com.vaadin.flow.webcomponent; + +import com.vaadin.flow.testutil.ChromeBrowserTest; + +public abstract class EmbeddingChromeBrowserTest extends ChromeBrowserTest { + + @Override + protected void open() { + super.open(); + + // Wait for at least one shadow root to appear. This is to avoid race + // conditions where the test starts before the shadow root has been + // attached #8329 + this.waitUntil((driver) -> Boolean.TRUE + .equals(this.getCommandExecutor().executeScript( + "return Array.prototype.slice.call(document.getElementsByTagName(\"*\")).some(function (x) { return !!x.shadowRoot })"))); + } + +} diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FactoryExporterIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FactoryExporterIT.java index fc6cba457e8..21d417ec460 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FactoryExporterIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FactoryExporterIT.java @@ -20,9 +20,8 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.flow.testutil.ChromeBrowserTest; - -public class FactoryExporterIT extends ChromeBrowserTest implements HasById { +public class FactoryExporterIT extends EmbeddingChromeBrowserTest + implements HasById { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FireEventIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FireEventIT.java index d3461345428..def2c95eaea 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FireEventIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FireEventIT.java @@ -21,14 +21,13 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; import static com.vaadin.flow.webcomponent.FireEventComponent.OptionsType.Bubble_Cancel; import static com.vaadin.flow.webcomponent.FireEventComponent.OptionsType.Bubble_NoCancel; import static com.vaadin.flow.webcomponent.FireEventComponent.OptionsType.NoBubble_NoCancel; -public class FireEventIT extends ChromeBrowserTest implements HasById { +public class FireEventIT extends EmbeddingChromeBrowserTest implements HasById { private static final String N1 = "number1"; private static final String N2 = "number2"; private static final String SUM = "sum"; diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/NpmOnlyIndexIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/NpmOnlyIndexIT.java index a432a04b5ce..1924d1674e9 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/NpmOnlyIndexIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/NpmOnlyIndexIT.java @@ -22,10 +22,9 @@ import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class NpmOnlyIndexIT extends ChromeBrowserTest { +public class NpmOnlyIndexIT extends EmbeddingChromeBrowserTest { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PreserveOnRefreshIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PreserveOnRefreshIT.java index ab5d9c37133..b9f1a8c3249 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PreserveOnRefreshIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PreserveOnRefreshIT.java @@ -21,10 +21,10 @@ import org.openqa.selenium.By; import org.openqa.selenium.Keys; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class PreserveOnRefreshIT extends ChromeBrowserTest implements HasById { +public class PreserveOnRefreshIT extends EmbeddingChromeBrowserTest + implements HasById { private static final String MODIFIED = "modified"; private static final String UNMODIFIED = "unmodified"; private static final String NO_PRESERVE = "nopreserve"; diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PushAnnotationIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PushAnnotationIT.java index abe9b63f13a..a774d5c4c67 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PushAnnotationIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PushAnnotationIT.java @@ -18,10 +18,9 @@ import org.junit.Assert; import org.junit.Test; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class PushAnnotationIT extends ChromeBrowserTest { +public class PushAnnotationIT extends EmbeddingChromeBrowserTest { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/UpdatePropertyIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/UpdatePropertyIT.java index 6e4df0833cc..8670e8ccfb8 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/UpdatePropertyIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/UpdatePropertyIT.java @@ -19,10 +19,9 @@ import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class UpdatePropertyIT extends ChromeBrowserTest implements HasById { +public class UpdatePropertyIT extends EmbeddingChromeBrowserTest implements HasById { @Override protected String getTestPath() { diff --git a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/WebComponentIT.java b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/WebComponentIT.java index dea5d9f4311..ff6956a922f 100644 --- a/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/WebComponentIT.java +++ b/flow-tests/test-embedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/WebComponentIT.java @@ -19,10 +19,10 @@ import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; -public class WebComponentIT extends ChromeBrowserTest implements HasById { +public class WebComponentIT extends EmbeddingChromeBrowserTest + implements HasById { @Override protected String getTestPath() {