summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2016-06-02 15:30:49 +0300
committerVaadin Code Review <review@vaadin.com>2016-07-14 09:19:58 +0000
commitcb031ed350cdf0369d0fbe4b2364629c52c90279 (patch)
treeb4e65e1e07a61277d8dcde61916faa6e2953652b /uitest
parent261cc183e8309c826afd7bf3dc85fa63d02b17f1 (diff)
downloadvaadin-framework-cb031ed350cdf0369d0fbe4b2364629c52c90279.tar.gz
vaadin-framework-cb031ed350cdf0369d0fbe4b2364629c52c90279.zip
GridLayoutDetailsRowTest to work with PhantomJS
Change-Id: Id88508acf416c162e0107a7ca1ebcf7ba376a63a
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
index 9ec54471b0..5fe2ff0cc3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
@@ -18,16 +18,12 @@ package com.vaadin.tests.components.grid;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.number.IsCloseTo.closeTo;
-import java.util.List;
-
import org.junit.Test;
import org.openqa.selenium.By;
-import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridLayoutElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.parallel.Browser;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -39,15 +35,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
@TestCategory("grid")
public class GridLayoutDetailsRowTest extends MultiBrowserTest {
- @Override
- public List<DesiredCapabilities> getBrowsersToTest() {
- List<DesiredCapabilities> browsersToTest = super.getBrowsersToTest();
- // for some reason PhantomJS doesn't find the label even if it detects
- // the presence
- browsersToTest.remove(Browser.PHANTOMJS.getDesiredCapabilities());
- return browsersToTest;
- }
-
@Test
public void testLabelHeights() {
openTestURL();
@@ -55,7 +42,7 @@ public class GridLayoutDetailsRowTest extends MultiBrowserTest {
GridElement grid = $(GridElement.class).first();
- grid.getRow(2).click();
+ grid.getRow(2).click(5, 5);
waitForElementPresent(By.id("lbl2"));
GridLayoutElement gridLayout = $(GridLayoutElement.class).first();