From e425e76549d3e022b6da2dd7f0b9ac459ceddee6 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Wed, 11 Jul 2018 22:00:58 +0300
Subject: Fix CDI and IE11 tests (#11042)

* Set Wildfly version, only resize viewport for Firefox
---
 test/cdi/pom.xml                                                   | 3 ++-
 .../test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/cdi/pom.xml b/test/cdi/pom.xml
index cfd8f15c90..2a9ae94956 100644
--- a/test/cdi/pom.xml
+++ b/test/cdi/pom.xml
@@ -12,6 +12,7 @@
 
     <properties>
         <jetty.skip>true</jetty.skip>
+        <wildfly.version>12.0.0.Final</wildfly.version>
     </properties>
 
     <dependencies>
@@ -38,7 +39,7 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>1.2.0.Final</version>
+                <version>1.2.2.Final</version>
                 <executions>
                     <execution>
                         <id>start-wildfly</id>
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index 1baccbb5bc..ee284309b4 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
@@ -11,6 +11,7 @@ import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.tb3.AbstractTB3Test;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -27,8 +28,10 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest {
 
         logCounter = 0;
 
-        // Use larger view port to make sure everything is visible.
-        testBench().resizeViewPortTo(1500, 1500);
+        if (BrowserUtil.isFirefox(getDesiredCapabilities())) {
+            // Use larger view port to make sure everything is visible.
+            testBench().resizeViewPortTo(1500, 1500);
+        }
     }
 
     @Override
-- 
cgit v1.2.3