diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceView.java b/flow-tests/test-dev-mode/src/main/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceView.java similarity index 100% rename from flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceView.java rename to flow-tests/test-dev-mode/src/main/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceView.java diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceIT.java b/flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceIT.java similarity index 100% rename from flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceIT.java rename to flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/ExceptionStacktraceIT.java diff --git a/flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/template/AbstractAttachExistingElementByIdIT.java b/flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/template/AbstractAttachExistingElementByIdIT.java index 9757ca5edd1..c28527a00b7 100644 --- a/flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/template/AbstractAttachExistingElementByIdIT.java +++ b/flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/template/AbstractAttachExistingElementByIdIT.java @@ -21,6 +21,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.flow.testutil.ChromeBrowserTest; +import com.vaadin.testbench.TestBenchElement; public abstract class AbstractAttachExistingElementByIdIT extends ChromeBrowserTest { @@ -39,7 +40,8 @@ protected void assertTemplate(String id, String initialLabelText, Assert.assertEquals("Text from input Harley!", getLabel(id).getText()); // Reset values to defaults - getInShadowRoot(findElement(By.id(id)), By.id("button")).click(); + $(TestBenchElement.class).id(id).$(TestBenchElement.class).id("button") + .click(); Assert.assertEquals("default", getLabel(id).getText()); } diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/WebComponentsIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/WebComponentsIT.java index c1f35aa0890..a79331877ef 100644 --- a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/WebComponentsIT.java +++ b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/WebComponentsIT.java @@ -26,6 +26,7 @@ import org.openqa.selenium.logging.LogEntry; import com.vaadin.flow.testutil.ChromeBrowserTest; +import com.vaadin.testbench.parallel.BrowserUtil; public class WebComponentsIT extends ChromeBrowserTest { @@ -37,6 +38,11 @@ public void testPolyfillLoaded() { .anyMatch(element -> element.getAttribute("src") .endsWith("webcomponents-loader.js"))); + if (BrowserUtil.isIE(getDesiredCapabilities())) { + // Console logs are not available from IE11 + return; + } + LogEntries logs = driver.manage().logs().get("browser"); if (logs != null) { Optional anyError = StreamSupport diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/template/AttachExistingDomElementByIdIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/template/AttachExistingDomElementByIdIT.java index c4be3083db1..4361dd2dccb 100644 --- a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/template/AttachExistingDomElementByIdIT.java +++ b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/template/AttachExistingDomElementByIdIT.java @@ -41,7 +41,7 @@ protected void assertTemplate(String id, String initialLabelText, Assert.assertEquals(placeholder, input.getAttribute("placeholder")); input.sendKeys("Harley!"); - input.sendKeys(Keys.ENTER); + input.sendKeys(Keys.TAB); Assert.assertEquals("Text from input Harley!", getLabel(id).getText()); diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/webcomponent/PaperInputIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/webcomponent/PaperInputIT.java index d3d960ecf80..790571d631e 100644 --- a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/webcomponent/PaperInputIT.java +++ b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/webcomponent/PaperInputIT.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.openqa.selenium.By; +import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import com.vaadin.flow.testutil.ChromeBrowserTest; @@ -31,12 +32,13 @@ public void paperInputIsFunctional() { WebElement input = findElement(By.tagName("paper-input")); String originalValue = input.getAttribute("value"); - input.sendKeys("bar"); + input.sendKeys(Keys.END + "bar"); List updateValueElements = findElements( By.className("update-value")); WebElement lastUpdateValue = updateValueElements .get(updateValueElements.size() - 1); - org.junit.Assert.assertEquals(originalValue + "bar", lastUpdateValue.getText()); + org.junit.Assert.assertEquals(originalValue + "bar", + lastUpdateValue.getText()); } }