Skip to content

Commit

Permalink
Update to Selenium 3.0.1 (#828)
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur- authored and alvarezguille committed Nov 24, 2016
1 parent 0a64088 commit 4bdf2df
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 42 deletions.
2 changes: 1 addition & 1 deletion doc/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h3>Included Software Components</h3>
Vaadin TestBench depends on the following software components:
</p>
<ul>
<li>Selenium 2.53.1 &ndash; Apache License 2.0</li>
<li>Selenium 3.0.1 &ndash; Apache License 2.0</li>
<li>PhantomJSDriver 1.3.0 &ndash; The BSD 2-Clause License</li>
<li>Javassist 3.18.1-GA &ndash; Apache License 2.0</li>
<li>JUnit 4.12 &ndash; Common Public License Version 1.0</li>
Expand Down
31 changes: 5 additions & 26 deletions doc/releasenotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -478,32 +478,11 @@ <h2 id="overview_of_vaadin_testbench">Overview of Vaadin TestBench</h2>
TestBench is based on Selenium 2 and provides a WebDriver based API for controlling different browsers on
multiple platforms.</p>

<h2 id="changes_since_2x">Changes in 4.2.0</h2>

<ul>
<li>Screen comparison is supported for individual elements through TestBenchElement.compareScreen</li>
<li>TestBenchElement can be compared with WebElement using equals()</li>
<li>TestBenchElement has getClassNames() and hasClassName(String) for testing class names</li>
<li>The last matching element can be retrieved using ElementQuery.last()</li>
<li>Removed Vaadin version detection which was broken in Liferay</li>

<li>List selects in multiselect mode can be tested with PhantomJS</li>
<li>waitForVaadin is executed before each element method, eliminating timing issues in some tests</li>
<li>waitForVaadin handles a possible null return value</li>
<li>The hub host name can be overridden using -Dcom.vaadin.testbench.Parameters.hubHostname</li>
<li>The browser name and version to run on locally can be overridden using -Dcom.vaadin.testbench.Parameters.runLocally</li>

<li>
Component Element API changes in vaadin-testbench-api 7.7.4:
<ul>
<li>The input field for a ComboBox can be retrieved using ComboBoxElement.getInputField()</li>
<li>GridElement has getRowCount() to get the number of data rows in the grid</li>
<li>GridElement has getRows() for iterating over all data rows in the grid</li>
<li>State of a checkbox can be checked using CheckBoxElement.isChecked()</li>
<li>Links can be clicked using LinkElement.click()</li>
<li>Link caption is correctly returned using LinkElement.getCaption()</li>
</ul>
</li>
<h2 id="changes_since_2x">Changes in 5.0</h2>

<ul>
<li>Support for Vaadin Framework 8</li>
<li>Selenium upgraded to 3.0.1</li>

</ul>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
import com.vaadin.server.LegacyApplication;
import com.vaadin.server.UIProvider;
import com.vaadin.testbench.TestBenchDriverProxy;
Expand Down Expand Up @@ -713,17 +712,6 @@ public Keyboard getKeyboard() {
return ((HasInputDevices) getDriver()).getKeyboard();
}

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

protected void openDebugLogTab() {

waitUntil(new ExpectedCondition<Boolean>() {
Expand Down
2 changes: 1 addition & 1 deletion vaadin-testbench-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<selenium.version>2.53.1</selenium.version>
<selenium.version>3.0.1</selenium.version>
<snapshot.repository.url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/
</snapshot.repository.url>
</properties>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-standalone</artifactId>
<version>3.0.1</version>
<description>POM was created from install:install-file</description>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-standalone</artifactId>
<versioning>
<release>2.53.0</release>
<release>3.0.1</release>
<versions>
<version>2.53.0</version>
<version>3.0.1</version>
</versions>
<lastUpdated>20160712104631</lastUpdated>
<lastUpdated>20161118133329</lastUpdated>
</versioning>
</metadata>

0 comments on commit 4bdf2df

Please sign in to comment.