@@ -25,10 +25,10 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { | |||
// Chrome version does not necessarily match the desired version | |||
// because of auto updates... | |||
browserIdentifier = getExpectedUserAgentString( | |||
getDesiredCapabilities()) + "89"; | |||
getDesiredCapabilities()) + "90"; | |||
} else if (BrowserUtil.isFirefox(getDesiredCapabilities())) { | |||
browserIdentifier = getExpectedUserAgentString( | |||
getDesiredCapabilities()) + "81"; | |||
getDesiredCapabilities()) + "88"; | |||
} else { | |||
browserIdentifier = getExpectedUserAgentString(desiredCapabilities) | |||
+ desiredCapabilities.getVersion(); |
@@ -62,7 +62,7 @@ public class GridResizeHiddenColumnTest extends MultiBrowserTest { | |||
// Click on "Last Name" menu item | |||
action.click(visibilityToggle).perform(); | |||
waitUntilLoadingIndicatorNotVisible(); | |||
sleep(100); // wait for layouting | |||
sleep(200); // wait for layouting | |||
// Check if column "Last Name" is visible | |||
headerCells = grid.getHeaderCells(0); |
@@ -18,14 +18,23 @@ public class MenuBarNavigationMouseTest extends MultiBrowserTest { | |||
public void testMenuBarMouseNavigation() throws Exception { | |||
openTestURL(); | |||
MenuBarElement menuBar = $(MenuBarElement.class).first(); | |||
menuBar.clickItem("File", "Export..", "As PDF..."); | |||
// clicks separated to different calls for more informative errors | |||
menuBar.clickItem("File"); | |||
menuBar.clickItem("Export.."); | |||
menuBar.clickItem("As PDF..."); | |||
assertEquals("1. MenuItem File/Export../As PDF... selected", | |||
getLogRow(0)); | |||
menuBar.clickItem("Edit", "Copy"); | |||
menuBar.clickItem("Edit"); | |||
menuBar.clickItem("Copy"); | |||
assertEquals("2. MenuItem Edit/Copy selected", getLogRow(0)); | |||
menuBar.clickItem("Help"); | |||
assertEquals("3. MenuItem Help selected", getLogRow(0)); | |||
menuBar.clickItem("File", "Exit"); | |||
menuBar.clickItem("File"); | |||
menuBar.clickItem("Exit"); | |||
assertEquals("4. MenuItem File/Exit selected", getLogRow(0)); | |||
} | |||
} |
@@ -82,7 +82,7 @@ public class GridThemeUITest extends MultiBrowserThemeTest { | |||
private void selectPage(String string) { | |||
$(NativeSelectElement.class).id("page").selectByText(string); | |||
grid = $(GridElement.class).first(); | |||
waitUntilLoadingIndicatorNotVisible(); | |||
} | |||
} |
@@ -3,6 +3,7 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.server; | |||
import java.io.IOException; | |||
import org.junit.Test; | |||
import org.openqa.selenium.By; | |||
import org.openqa.selenium.interactions.Actions; | |||
import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; | |||
@@ -27,9 +28,12 @@ public class GridSidebarThemeTest extends GridBasicFeaturesTest { | |||
private void runTestSequence(String theme) throws IOException { | |||
openTestURL("theme=" + theme); | |||
waitUntilLoadingIndicatorNotVisible(); | |||
compareScreen(theme + "-SidebarClosed"); | |||
getSidebarOpenButton().click(); | |||
waitForElementPresent(By.className("v-grid-sidebar-content")); | |||
sleep(100); // wait for animations to finish | |||
compareScreen(theme + "-SidebarOpen"); | |||
@@ -55,6 +59,7 @@ public class GridSidebarThemeTest extends GridBasicFeaturesTest { | |||
compareScreen(theme + "-OnMouseOverHiddenToggle"); | |||
getSidebarOpenButton().click(); | |||
waitForElementNotPresent(By.className("v-grid-sidebar-content")); | |||
compareScreen(theme + "-SidebarClosed2"); | |||
} |