Change-Id: Ib3f88b6aca37ebb1962b4692df0c4ba11fe92bc2tags/8.0.0.alpha8
@@ -227,7 +227,7 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-testbench</artifactId> | |||
<version>4.1.0</version> | |||
<version>5.0.0.alpha1</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> |
@@ -35,7 +35,8 @@ public class NativeSelectElement extends AbstractSelectElement { | |||
} | |||
public List<TestBenchElement> getOptions() { | |||
return wrapElements(selectElement.getOptions(), getCommandExecutor()); | |||
return wrapElements(selectElement.getOptions(), | |||
getTestBenchCommandExecutor()); | |||
} | |||
public void selectByText(String text) throws ReadOnlyException { |
@@ -11,7 +11,8 @@ public class TableElement extends com.vaadin.testbench.elements.TableElement { | |||
getCollapseMenuToggle().click(); | |||
WebElement cm = getDriver() | |||
.findElement(By.xpath("//*[@id='PID_VAADIN_CM']")); | |||
return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class); | |||
return wrapElement(cm, getTestBenchCommandExecutor()) | |||
.wrap(CollapseMenu.class); | |||
} | |||
public static class CollapseMenu extends ContextMenuElement { |
@@ -59,7 +59,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; | |||
import org.openqa.selenium.support.ui.ExpectedConditions; | |||
import org.openqa.selenium.support.ui.WebDriverWait; | |||
import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; | |||
import com.vaadin.server.LegacyApplication; | |||
import com.vaadin.server.UIProvider; | |||
import com.vaadin.testbench.TestBenchDriverProxy; | |||
@@ -833,14 +832,7 @@ public abstract class AbstractTB3Test extends ParallelTest { | |||
} | |||
public void hitButton(String id) { | |||
if (BrowserUtil.isPhantomJS(getDesiredCapabilities())) { | |||
driver.findElement(By.id(id)).click(); | |||
} else { | |||
WebDriverBackedSelenium selenium = new WebDriverBackedSelenium( | |||
driver, driver.getCurrentUrl()); | |||
selenium.keyPress("id=" + id, "\\13"); | |||
} | |||
driver.findElement(By.id(id)).click(); | |||
} | |||
protected void openDebugLogTab() { |
@@ -108,7 +108,7 @@ | |||
<exclude org="org.eclipse.jetty.orbit"></exclude> | |||
</dependency> | |||
<dependency org="junit" name="junit" rev="4.11" | |||
<dependency org="junit" name="junit" rev="4.12" | |||
conf="build -> default" /> | |||
<dependency org="org.hamcrest" name="hamcrest-all" | |||
rev="1.3" conf="build->default" /> | |||
@@ -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="4.1.0" conf="build-provided -> default" /> | |||
rev="5.0.0.alpha1" 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" /> |
@@ -26,6 +26,7 @@ import com.vaadin.testbench.TestBenchElement; | |||
import com.vaadin.testbench.customelements.TableElement; | |||
import com.vaadin.testbench.elements.ButtonElement; | |||
import com.vaadin.testbench.elements.TableElement.ContextMenuElement; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.tests.tb3.MultiBrowserTest; | |||
public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest { | |||
@@ -62,8 +63,8 @@ public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest { | |||
} | |||
private void contextClick(TestBenchElement e) { | |||
if (e.isPhantomJS()) { | |||
JavascriptExecutor js = e.getCommandExecutor(); | |||
if (BrowserUtil.isPhantomJS(getDesiredCapabilities())) { | |||
JavascriptExecutor js = (JavascriptExecutor) getDriver(); | |||
String scr = "var element=arguments[0];" | |||
+ "var ev = document.createEvent('HTMLEvents');" | |||
+ "ev.initEvent('contextmenu', true, false);" |
@@ -86,7 +86,7 @@ public class MemoryLeakTableTest extends MultiBrowserTest { | |||
private void scrollTable(TableElement tbl, int value) { | |||
WebElement actualElement = tbl | |||
.findElement(By.className("v-table-body-wrapper")); | |||
JavascriptExecutor js = tbl.getCommandExecutor(); | |||
JavascriptExecutor js = (JavascriptExecutor) getDriver(); | |||
js.executeScript("arguments[0].scrollTop = " + value, actualElement); | |||
} | |||
} |