Browse Source

Compatibility Grid test tweaks (#12483)

tags/8.15.0
Anna Koskinen 2 years ago
parent
commit
d0ce883986
No account linked to committer's email address

+ 4
- 2
uitest/src/test/java/com/vaadin/tests/components/grid/GridReorderMergedTest.java View File

openTestURL(); openTestURL();
GridElement grid = $(GridElement.class).first(); GridElement grid = $(GridElement.class).first();
GridCellElement headerCell0_0 = grid.getHeaderCell(0, 0); GridCellElement headerCell0_0 = grid.getHeaderCell(0, 0);
GridCellElement headerCell0_4 = grid.getHeaderCell(0, 4);
new Actions(driver).dragAndDrop(headerCell0_0, headerCell0_4).perform();
// dragAndDrop(headerCell0_0, headerCell0_4) isn't enough for Firefox
new Actions(driver).clickAndHold(headerCell0_0)
.moveByOffset(headerCell0_0.getSize().getWidth() + 5, 5)
.release().perform();


// ensure the first merged block got dragged over the entire second // ensure the first merged block got dragged over the entire second
// merged block // merged block

+ 8
- 1
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java View File

import com.vaadin.testbench.elements.NativeButtonElement; import com.vaadin.testbench.elements.NativeButtonElement;
import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.testbench.elements.NativeSelectElement;
import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.testbench.elementsbase.ServerClass;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.tests.tb3.MultiBrowserTest;
import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererConnector.Renderers; import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererConnector.Renderers;
// Simulate network latency with 2000ms // Simulate network latency with 2000ms
latency = 2000; latency = 2000;


// Chrome uses RGB instead of RGBA
// Chrome and IE11 use RGBA instead of RGB
String colorRed = "rgba(255, 0, 0, 1)"; String colorRed = "rgba(255, 0, 0, 1)";
String colorWhite = "rgba(255, 255, 255, 1)"; String colorWhite = "rgba(255, 255, 255, 1)";
String colorDark = "rgba(245, 245, 245, 1)"; String colorDark = "rgba(245, 245, 245, 1)";


if (BrowserUtil.isFirefox(desiredCapabilities)) {
colorRed = "rgb(255, 0, 0)";
colorWhite = "rgb(255, 255, 255)";
colorDark = "rgb(245, 245, 245)";
}

openTestURL(); openTestURL();


getGrid(); getGrid();

+ 4
- 0
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java View File

detailsRowHeight, "opened" }); detailsRowHeight, "opened" });
} }


// Firefox fails to close the details row if the clicks happen
// too close to each other
sleep(500);

grid.getRow(2).click(5, 5); grid.getRow(2).click(5, 5);
waitForElementNotPresent(By.id("lbl1")); waitForElementNotPresent(By.id("lbl1"));



+ 4
- 2
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReorderMergedTest.java View File

openTestURL(); openTestURL();
GridElement grid = $(GridElement.class).first(); GridElement grid = $(GridElement.class).first();
GridCellElement headerCell0_0 = grid.getHeaderCell(0, 0); GridCellElement headerCell0_0 = grid.getHeaderCell(0, 0);
GridCellElement headerCell0_4 = grid.getHeaderCell(0, 4);
new Actions(driver).dragAndDrop(headerCell0_0, headerCell0_4).perform();
// dragAndDrop(headerCell0_0, headerCell0_4) isn't enough for Firefox
new Actions(driver).clickAndHold(headerCell0_0)
.moveByOffset(headerCell0_0.getSize().getWidth() + 5, 5)
.release().perform();


// ensure the first merged block got dragged over the entire second // ensure the first merged block got dragged over the entire second
// merged block // merged block

Loading…
Cancel
Save