Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix race condition in embedding tests #8507

Merged
merged 3 commits into from
Jun 5, 2020
Merged

Fix race condition in embedding tests #8507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1139cf3
Wait for a shadow root to appear to work around race condition with H…
Jun 5, 2020
27f9895
Update chrome driver to 83.0.4103.39 (#8407)
ZheSun88 Jun 2, 2020
11ed21f
IE compatible version of JS
Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions drivers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
<root>
<windows>
<driver id="googlechrome">
<version id="80.0.3987.106">
<version id="83.0.4103.39">
<bitrate thirtytwobit="true" sixtyfourbit="true">
<filelocation>https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_win32.zip</filelocation>
<hash>40aeb7b0b3a3ea23a139a764b56e172f2fdb90a4</hash>
<filelocation>https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_win32.zip</filelocation>
<hash>e06f7553e68df7eec76a6fd0e1a21317807bf945</hash>
<hashtype>sha1</hashtype>
</bitrate>
</version>
</driver>
</windows>
<linux>
<driver id="googlechrome">
<version id="80.0.3987.106">
<version id="83.0.4103.39">
<bitrate sixtyfourbit="true">
<filelocation>https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_linux64.zip</filelocation>
<hash>0e8848ebca11706768fd748dd0282672acad35ac</hash>
<filelocation>https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip</filelocation>
<hash>fb412fdbf282ec5ceeddb2f6cf700268fde4ee44</hash>
<hashtype>sha1</hashtype>
</bitrate>
</version>
</driver>
</linux>
<osx>
<driver id="googlechrome">
<version id="80.0.3987.106">
<version id="83.0.4103.39">
<bitrate sixtyfourbit="true">
<filelocation>https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_mac64.zip</filelocation>
<hash>3b58b8039f363de3b13a8bea7d4646105fbbd177</hash>
<filelocation>https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_mac64.zip</filelocation>
<hash>5ad2f2fa798095f20a7086b1bad1047fb138fa83</hash>
<hashtype>sha1</hashtype>
</bitrate>
</version>
</driver>
</osx>
</root>
</root>
5 changes: 2 additions & 3 deletions ...-test-assets/src/test/java/com/vaadin/flow/webcomponent/DefaultValueInitializationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...edding-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddedWebComponentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
19 changes: 19 additions & 0 deletions ...ng-test-assets/src/test/java/com/vaadin/flow/webcomponent/EmbeddingChromeBrowserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 })")));
}

}
5 changes: 2 additions & 3 deletions ...g/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FactoryExporterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 1 addition & 2 deletions ...bedding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/FireEventIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions ...ding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/NpmOnlyIndexIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PreserveOnRefreshIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions ...ng/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/PushAnnotationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 1 addition & 2 deletions ...ng/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/UpdatePropertyIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...ding/embedding-test-assets/src/test/java/com/vaadin/flow/webcomponent/WebComponentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down