summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-08-06 10:01:57 +0300
committerGitHub <noreply@github.com>2019-08-06 10:01:57 +0300
commit5a8e2ac17f2a1a645cd73e7db383dcd37df875a4 (patch)
treeb2cb7340a03a1ac6046c9e423867e020aa285735
parent6cb298b39d00c4498206fc76e316a3bc52b31a6e (diff)
downloadvaadin-framework-5a8e2ac17f2a1a645cd73e7db383dcd37df875a4.tar.gz
vaadin-framework-5a8e2ac17f2a1a645cd73e7db383dcd37df875a4.zip
Exclude element screenshot tests from IE11 (#11681)
-rw-r--r--uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java12
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java10
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java4
6 files changed, 57 insertions, 2 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
index dc74ab74b5..f4a1b6e4c2 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
@@ -1,14 +1,25 @@
package com.vaadin.tests.application;
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.CheckBoxElement;
import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserThemeTest;
public class CriticalNotificationsTest extends MultiBrowserThemeTest {
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+ Browser.FIREFOX.getDesiredCapabilities());
+ }
+
@Test
public void internalError() throws Exception {
testCriticalNotification("Internal error");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
index ff0d692e1d..a01d4d8fa0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
@@ -1,18 +1,29 @@
package com.vaadin.tests.components.combobox;
+import java.util.Arrays;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.openqa.selenium.Keys;
+import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.testbench.parallel.Browser;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
@TestCategory("xvfb-test")
public class ComboBoxItemIconTest extends MultiBrowserTest {
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+ Browser.FIREFOX.getDesiredCapabilities());
+ }
+
@Test
public void testIconsInComboBox() throws Exception {
openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
index ee18a02799..9631b5313c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
@@ -1,11 +1,22 @@
package com.vaadin.tests.components.progressindicator;
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ProgressBarElement;
+import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ProgressBarStaticReindeerTest extends MultiBrowserTest {
+
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+ Browser.FIREFOX.getDesiredCapabilities());
+ }
@Test
public void compareScreenshot() throws Exception {
openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
index dc13ff7cbd..40efe8484c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
@@ -1,11 +1,23 @@
package com.vaadin.tests.components.progressindicator;
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ProgressBarElement;
+import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ProgressBarStaticRunoTest extends MultiBrowserTest {
+
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+ Browser.FIREFOX.getDesiredCapabilities());
+ }
+
@Test
public void compareScreenshot() throws Exception {
openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index d92190a014..cc6cdafd9a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
@@ -3,20 +3,30 @@ package com.vaadin.tests.components.table;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
import org.junit.Test;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.TableElement;
import com.vaadin.testbench.elements.TableElement.ContextMenuElement;
+import com.vaadin.testbench.parallel.Browser;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+ Browser.FIREFOX.getDesiredCapabilities());
+ }
+
@Test
public void expandCorrectlyAfterCollapse() throws IOException {
openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
index fb095c07b4..cd7afec9ca 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
@@ -9,6 +9,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.By;
+import com.vaadin.testbench.annotations.RunLocally;
import com.vaadin.testbench.elements.WindowElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -17,8 +18,7 @@ public class WindowControlButtonFocusTest extends MultiBrowserTest {
@Override
public List<DesiredCapabilities> getBrowsersToTest() {
- return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
- Browser.IE11.getDesiredCapabilities());
+ return Arrays.asList(Browser.CHROME.getDesiredCapabilities());
}
@Test