Browse Source

Fix tests for Chrome 63 and focus issues in IE11 (#10495)

tags/8.4.0.alpha1
Teemu Suo-Anttila 6 years ago
parent
commit
fc9bf9fc3b
No account linked to committer's email address

+ 1
- 1
tests/screenshots

@@ -1 +1 @@
Subproject commit 23ea335cad670d55f99c9dcf1425e1ebbee534a5
Subproject commit a70c038dcdf9b95d984d5fa7d54acf3f49c45132

+ 1
- 1
uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java View File

@@ -40,7 +40,7 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
// Chrome version does not necessarily match the desired version
// because of auto updates...
browserIdentifier = getExpectedUserAgentString(
getDesiredCapabilities()) + "61";
getDesiredCapabilities()) + "63";
} else {
browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
+ desiredCapabilities.getVersion();

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

@@ -45,14 +45,12 @@ public class JavaScriptPreloadingTest extends MultiBrowserTest {
openTestURL();

try {
new WebDriverWait(driver, 10)
.until(ExpectedConditions.alertIsPresent());
waitUntil(ExpectedConditions.alertIsPresent());
Alert alert = driver.switchTo().alert();
assertEquals("First", alert.getText());
alert.accept();

new WebDriverWait(driver, 10)
.until(ExpectedConditions.alertIsPresent());
waitUntil(ExpectedConditions.alertIsPresent());
alert = driver.switchTo().alert();
assertEquals("Second", alert.getText());
alert.accept();

+ 2
- 3
uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java View File

@@ -56,9 +56,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest {
zoomSetter.resetZoom();
openTestURL();
// IE sometimes has trouble waiting long enough.
new WebDriverWait(getDriver(), 30)
.until(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-table-body-wrapper")));
waitUntil(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-table-body-wrapper")), 30);
}

@Test

+ 5
- 0
uitest/src/test/java/com/vaadin/tests/elements/menubar/MenuBarUITest.java View File

@@ -31,6 +31,11 @@ import com.vaadin.testbench.elements.MenuBarElement;
import com.vaadin.tests.tb3.MultiBrowserTest;

public class MenuBarUITest extends MultiBrowserTest {
@Override
protected boolean requireWindowFocusForIE() {
return true;
}

@Before
public void init() {

+ 2
- 3
uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java View File

@@ -47,9 +47,8 @@ public class ResponsiveUITest extends MultiBrowserTest {
openTestURL();

// IE sometimes has trouble waiting long enough.
new WebDriverWait(getDriver(), 30)
.until(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-grid.first")));
waitUntil(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-grid.first")), 30);

assertEquals("401px-600px",
$(".v-csslayout-grid.first").getAttribute("width-range"));

+ 2
- 3
uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java View File

@@ -41,9 +41,8 @@ public class ResponsiveWidthAndHeightTest extends MultiBrowserTest {
openTestURL();

// IE sometimes has trouble waiting long enough.
new WebDriverWait(getDriver(), 30)
.until(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-width-and-height")));
waitUntil(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-width-and-height")), 30);

// Verify both width-range and height-range.
assertEquals("600px-",

+ 4
- 5
uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java View File

@@ -50,13 +50,12 @@ public class SetThemeAndResponsiveLayoutTest extends MultiBrowserTest {
public void testWidthAndHeightRanges() throws Exception {
openTestURL();
// IE sometimes has trouble waiting long enough.
new WebDriverWait(getDriver(), 30)
.until(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-width-and-height")));
waitUntil(ExpectedConditions.presenceOfElementLocated(
By.cssSelector(".v-csslayout-width-and-height")), 30);
// set the theme programmatically
$(ButtonElement.class).caption("Set theme").first().click();
new WebDriverWait(getDriver(), 30).until(ExpectedConditions
.presenceOfElementLocated(By.xpath("//div[@width-range]")));
waitUntil(ExpectedConditions
.presenceOfElementLocated(By.xpath("//div[@width-range]")), 30);

// Verify both width-range and height-range.
assertEquals("600px-",

Loading…
Cancel
Save