From 441fa7191f2ce3ff9fdf90bcb1bd11081e63a81b Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Wed, 27 Jun 2018 16:43:51 +0300 Subject: Fix IE11 tests (#11003) This patch removes non-native events and updates some screenshots. --- ...yed_Windows_InternetExplorer_11_blue-circle.png | Bin 10750 -> 9945 bytes ...dows_InternetExplorer_11_selects-first-open.png | Bin 34544 -> 34645 bytes ...er_Windows_InternetExplorer_11_expandedMenu.png | Bin 12687 -> 12600 bytes ...indows_InternetExplorer_11_subwindow-dialog.png | Bin 30152 -> 30167 bytes ...ows_InternetExplorer_11_table-empty-caption.png | Bin 18062 -> 18035 bytes ..._Windows_InternetExplorer_11_allVaadinIcons.png | Bin 162707 -> 162702 bytes ...nternetExplorer_11_checkboxes_with_readonly.png | Bin 131063 -> 131063 bytes ...Indices_Windows_InternetExplorer_11_stacked.png | Bin 27231 -> 27111 bytes .../formlayout/FormLayoutResizingTest.java | 5 ----- .../java/com/vaadin/tests/tb3/AbstractTB3Test.java | 5 +++++ 10 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uitest/reference-screenshots/internetexplorer/FlashIsVisibleTest-testFlashIsCorrectlyDisplayed_Windows_InternetExplorer_11_blue-circle.png b/uitest/reference-screenshots/internetexplorer/FlashIsVisibleTest-testFlashIsCorrectlyDisplayed_Windows_InternetExplorer_11_blue-circle.png index eeb6df4bcf..d6773988ce 100755 Binary files a/uitest/reference-screenshots/internetexplorer/FlashIsVisibleTest-testFlashIsCorrectlyDisplayed_Windows_InternetExplorer_11_blue-circle.png and b/uitest/reference-screenshots/internetexplorer/FlashIsVisibleTest-testFlashIsCorrectlyDisplayed_Windows_InternetExplorer_11_blue-circle.png differ diff --git a/uitest/reference-screenshots/internetexplorer/ReindeerThemeTest-testTheme_Windows_InternetExplorer_11_selects-first-open.png b/uitest/reference-screenshots/internetexplorer/ReindeerThemeTest-testTheme_Windows_InternetExplorer_11_selects-first-open.png index 0b35291305..fbb6e31f19 100755 Binary files a/uitest/reference-screenshots/internetexplorer/ReindeerThemeTest-testTheme_Windows_InternetExplorer_11_selects-first-open.png and b/uitest/reference-screenshots/internetexplorer/ReindeerThemeTest-testTheme_Windows_InternetExplorer_11_selects-first-open.png differ diff --git a/uitest/reference-screenshots/internetexplorer/ResponsiveStylesTest-testValoMenuResponsiveHover_Windows_InternetExplorer_11_expandedMenu.png b/uitest/reference-screenshots/internetexplorer/ResponsiveStylesTest-testValoMenuResponsiveHover_Windows_InternetExplorer_11_expandedMenu.png index bdced14e93..5445d7ce53 100755 Binary files a/uitest/reference-screenshots/internetexplorer/ResponsiveStylesTest-testValoMenuResponsiveHover_Windows_InternetExplorer_11_expandedMenu.png and b/uitest/reference-screenshots/internetexplorer/ResponsiveStylesTest-testValoMenuResponsiveHover_Windows_InternetExplorer_11_expandedMenu.png differ diff --git a/uitest/reference-screenshots/internetexplorer/RunoThemeTest-testTheme_Windows_InternetExplorer_11_subwindow-dialog.png b/uitest/reference-screenshots/internetexplorer/RunoThemeTest-testTheme_Windows_InternetExplorer_11_subwindow-dialog.png index a61c43211a..1aabcca0a8 100755 Binary files a/uitest/reference-screenshots/internetexplorer/RunoThemeTest-testTheme_Windows_InternetExplorer_11_subwindow-dialog.png and b/uitest/reference-screenshots/internetexplorer/RunoThemeTest-testTheme_Windows_InternetExplorer_11_subwindow-dialog.png differ diff --git a/uitest/reference-screenshots/internetexplorer/TableWithEmptyCaptionTest-testEmptyCaption_Windows_InternetExplorer_11_table-empty-caption.png b/uitest/reference-screenshots/internetexplorer/TableWithEmptyCaptionTest-testEmptyCaption_Windows_InternetExplorer_11_table-empty-caption.png index 017fb2fee3..86343cb947 100755 Binary files a/uitest/reference-screenshots/internetexplorer/TableWithEmptyCaptionTest-testEmptyCaption_Windows_InternetExplorer_11_table-empty-caption.png and b/uitest/reference-screenshots/internetexplorer/TableWithEmptyCaptionTest-testEmptyCaption_Windows_InternetExplorer_11_table-empty-caption.png differ diff --git a/uitest/reference-screenshots/internetexplorer/VaadinIconSetTest-checkScreenshot_initial_Windows_InternetExplorer_11_allVaadinIcons.png b/uitest/reference-screenshots/internetexplorer/VaadinIconSetTest-checkScreenshot_initial_Windows_InternetExplorer_11_allVaadinIcons.png index a6d5e6ae50..9ab99266f9 100755 Binary files a/uitest/reference-screenshots/internetexplorer/VaadinIconSetTest-checkScreenshot_initial_Windows_InternetExplorer_11_allVaadinIcons.png and b/uitest/reference-screenshots/internetexplorer/VaadinIconSetTest-checkScreenshot_initial_Windows_InternetExplorer_11_allVaadinIcons.png differ diff --git a/uitest/reference-screenshots/internetexplorer/ValoThemeUITest-checkboxes_Windows_InternetExplorer_11_checkboxes_with_readonly.png b/uitest/reference-screenshots/internetexplorer/ValoThemeUITest-checkboxes_Windows_InternetExplorer_11_checkboxes_with_readonly.png index c4a2652e71..d391a00a8b 100755 Binary files a/uitest/reference-screenshots/internetexplorer/ValoThemeUITest-checkboxes_Windows_InternetExplorer_11_checkboxes_with_readonly.png and b/uitest/reference-screenshots/internetexplorer/ValoThemeUITest-checkboxes_Windows_InternetExplorer_11_checkboxes_with_readonly.png differ diff --git a/uitest/reference-screenshots/internetexplorer/WindowZIndexTest-removingUpdatesZIndices_Windows_InternetExplorer_11_stacked.png b/uitest/reference-screenshots/internetexplorer/WindowZIndexTest-removingUpdatesZIndices_Windows_InternetExplorer_11_stacked.png index a3d5a5230e..af48bc9857 100644 Binary files a/uitest/reference-screenshots/internetexplorer/WindowZIndexTest-removingUpdatesZIndices_Windows_InternetExplorer_11_stacked.png and b/uitest/reference-screenshots/internetexplorer/WindowZIndexTest-removingUpdatesZIndices_Windows_InternetExplorer_11_stacked.png differ diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java index 92acd7d355..26bed73ccd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java @@ -71,11 +71,6 @@ public class FormLayoutResizingTest extends MultiBrowserThemeTest { originalWidths[1] + 200, expandedWidths[1]); } - @Override - protected boolean useNativeEventsForIE() { - return !BrowserUtil.isIE(getDesiredCapabilities(), 11); - } - private static int[] getWidths(List tables) { int[] widths = new int[tables.size()]; for (int i = 0; i < widths.length; i++) { diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java index bce227b939..7bbd3aa498 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -25,6 +25,7 @@ import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicHttpEntityEnclosingRequest; +import org.junit.Assume; import org.junit.Rule; import org.junit.rules.TestName; import org.junit.runner.Description; @@ -1212,6 +1213,10 @@ public abstract class AbstractTB3Test extends ParallelTest { } protected TimeZone getBrowserTimeZone() { + Assume.assumeFalse( + "Internet Explorer 11 does not support resolvedOptions timeZone", + BrowserUtil.isIE(getDesiredCapabilities(), 11)); + // Ask TimeZone from browser String browserTimeZone = ((JavascriptExecutor) getDriver()) .executeScript( -- cgit v1.2.3