diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2016-12-15 17:32:46 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2016-12-15 17:32:46 +0200 |
| commit | dc01a9a4d85f78dba63c310fb9dc478cf1d40f8d (patch) | |
| tree | 77d3b5aa8c820bb2a01a4ab2085f0fca0ced88fa | |
| parent | 6185ad5d4e8d81fe9e59580b48343ec9d74bc8dc (diff) | |
| download | vaadin-framework-dc01a9a4d85f78dba63c310fb9dc478cf1d40f8d.tar.gz vaadin-framework-dc01a9a4d85f78dba63c310fb9dc478cf1d40f8d.zip | |
Update to TB 5.0.0.alpha2, add to BOM (#8009)
6 files changed, 11 insertions, 8 deletions
diff --git a/bom/pom.xml b/bom/pom.xml index 35e53ac55d..4788c99576 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,6 +17,7 @@ <properties> <vaadin.spring.version>2.0-SNAPSHOT</vaadin.spring.version> + <vaadin.testbench.version>5.0.0.alpha2</vaadin.testbench.version> </properties> <repositories> @@ -90,7 +91,6 @@ </dependency> <!-- AddOn Dependencies --> - <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-spring-boot-starter</artifactId> @@ -106,6 +106,11 @@ <artifactId>vaadin-spring</artifactId> <version>${vaadin.spring.version}</version> </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-testbench</artifactId> + <version>${vaadin.testbench.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -227,7 +227,7 @@ <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-testbench</artifactId> - <version>5.0.0.alpha1</version> + <version>5.0.0.alpha2</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java index 876f2e7c0b..a183951a29 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java @@ -35,8 +35,7 @@ public class NativeSelectElement extends AbstractSelectElement { } public List<TestBenchElement> getOptions() { - return wrapElements(selectElement.getOptions(), - getTestBenchCommandExecutor()); + return wrapElements(selectElement.getOptions(), getCommandExecutor()); } public void selectByText(String text) throws ReadOnlyException { diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java index 733ddb5a8a..28432fade9 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java @@ -11,8 +11,7 @@ public class TableElement extends com.vaadin.testbench.elements.TableElement { getCollapseMenuToggle().click(); WebElement cm = getDriver() .findElement(By.xpath("//*[@id='PID_VAADIN_CM']")); - return wrapElement(cm, getTestBenchCommandExecutor()) - .wrap(CollapseMenu.class); + return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class); } public static class CollapseMenu extends ContextMenuElement { diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 15da194adb..fa0005a552 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -122,7 +122,7 @@ <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="build -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="5.0.0.alpha1" conf="build-provided -> default" /> + rev="5.0.0.alpha2" conf="build-provided -> default" /> <!-- This should be removed once tests have been updated to use lang3 --> <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="build -> default" /> diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java index 7e7a267d63..362dcaffcd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java @@ -118,7 +118,7 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest { } private String getHiddenText(WebElement element) { - return (String) getTestBenchCommandExecutor() + return (String) getCommandExecutor() .executeScript("return arguments[0].innerHTML", element); } } |