]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fix a Grid test failure on Firefox
authorMika Murtojarvi <mika@vaadin.com>
Tue, 19 May 2015 09:55:50 +0000 (12:55 +0300)
committerVaadin Code Review <review@vaadin.com>
Wed, 20 May 2015 08:21:53 +0000 (08:21 +0000)
Change-Id: I3d6ab2abd146a53ee0d93b1d738ae7a3379c4ff5

uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java

index 63d031bc85578d08a83efbfb8f70e7b6afbc3ee4..8465906801d0cfa5749d5c05f22e4336c06bbf5d 100644 (file)
@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
@@ -39,20 +40,20 @@ public class DisabledGridClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "State", "Selection mode", "single");
 
         GridRowElement row = getGridElement().getRow(0);
-        row.click();
+        GridCellElement cell = getGridElement().getCell(0, 0);
+        cell.click();
         assertFalse("disabled row should not be selected", row.isSelected());
-
     }
 
     @Test
     public void testEditorOpening() {
         selectMenuPath("Component", "Editor", "Enabled");
-
         GridRowElement row = getGridElement().getRow(0);
-        row.click();
+        GridCellElement cell = getGridElement().getCell(0, 0);
+        cell.click();
         assertNull("Editor should not open", getEditor());
 
         new Actions(getDriver()).sendKeys(Keys.ENTER).perform();
         assertNull("Editor should not open", getEditor());
     }
-}
+}
\ No newline at end of file
index ed1234e60822b11fff731784598d1a10f09b3fc1..cd6a7a7b692d6d186f43c809c7ee620161f6daa3 100644 (file)
@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
@@ -39,7 +40,8 @@ public class DisabledGridTest extends GridBasicFeaturesTest {
         selectMenuPath("Component", "State", "Selection mode", "single");
 
         GridRowElement row = getGridElement().getRow(0);
-        row.click();
+        GridCellElement cell = getGridElement().getCell(0, 0);
+        cell.click();
         assertFalse("disabled row should not be selected", row.isSelected());
 
     }
@@ -49,7 +51,8 @@ public class DisabledGridTest extends GridBasicFeaturesTest {
         selectMenuPath("Component", "Editor", "Enabled");
 
         GridRowElement row = getGridElement().getRow(0);
-        row.click();
+        GridCellElement cell = getGridElement().getCell(0, 0);
+        cell.click();
         assertNull("Editor should not open", getEditor());
 
         new Actions(getDriver()).sendKeys(Keys.ENTER).perform();