@@ -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> |
@@ -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 { |
@@ -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 { |
@@ -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" /> |
@@ -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); | |||
} | |||
} |