Always use cursor detection for improved test stability

Change-Id: I3ac7a8b404da907fbe025b2ab1af03dd7c32813e

2 files changed, 5 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
index e65a24e907..627efdc5b3 100644
--- a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
@@ -35,8 +35,6 @@ public class ComboboxScrollableWindowTest extends MultiBrowserTest {
     @Test
     public void testWindowScrollbars() throws Exception {
         openTestURL();
-        com.vaadin.testbench.Parameters
-                .setScreenshotComparisonCursorDetection(true);
 
         WebElement window = driver.findElement(By.id(WINDOW_ID));
         WebElement scrollableElement = window.findElement(By
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 7e22537032..b892fbe4a0 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -115,6 +115,11 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
         desiredCapabilities = Browser.FIREFOX.getDesiredCapabilities();
     }
 
+    static {
+        com.vaadin.testbench.Parameters
+                .setScreenshotComparisonCursorDetection(true);
+    }
+
     /**
      * Connect to the hub using a remote web driver, set the canvas size and
      * opens the initial URL as specified by {@link #getTestUrl()}