From acf88c8ea269404b38e13ae94ad570b3e091a003 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sauli=20T=C3=A4hk=C3=A4p=C3=A4=C3=A4?= <sauli@vaadin.com>
Date: Tue, 18 Nov 2014 12:51:05 +0200
Subject: [PATCH] Remove IE8 from TextFieldBevelTest. (#14634)

Change-Id: Ie37377b0da800cbe2acbd3e14b972e482c188579
---
 .../tests/themes/valo/TextFieldBevelTest.java | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
index ee2cdd41f8..9159b71961 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
@@ -15,8 +15,14 @@
  */
 package com.vaadin.tests.themes.valo;
 
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.List;
+
 import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -28,32 +34,36 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  */
 public class TextFieldBevelTest extends MultiBrowserTest {
 
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        List<DesiredCapabilities> browsers = super.getBrowsersToTest();
+
+        // IE8 doesn't support box-shadow.
+        browsers.remove(Browser.IE8.getDesiredCapabilities());
+
+        return browsers;
+    }
+
     @Test
-    public void testTextFieldBevel() {
-        String url = getTestUrl();
-        StringBuilder defaultValoUi = new StringBuilder(
-                TextFieldBevel.class.getSimpleName());
-        defaultValoUi.append('$');
-        defaultValoUi.append(TextFieldBevel.ValoDefaultTextFieldBevel.class
-                .getSimpleName());
-        url = url.replace(TextFieldBevel.class.getSimpleName(),
-                defaultValoUi.toString());
-        getDriver().get(url);
-
-        String defaultBoxShadow = $(TextFieldElement.class).first()
-                .getCssValue("box-shadow");
-
-        if (url.contains("restartApplication")) {
-            openTestURL();
-        } else {
-            openTestURL("restartApplication");
-        }
-
-        String boxShadow = $(TextFieldElement.class).first().getCssValue(
-                "box-shadow");
-
-        Assert.assertNotEquals(
-                "Set v-bevel to 'false' doesn't affect 'v-textfield-bevel' value",
-                defaultBoxShadow, boxShadow);
+    public void bevelChangesBoxShadow() {
+        openTestURL();
+        String boxShadowWithBevel = getBoxShadow();
+
+        openTestUrlWithoutBevel();
+        String boxShadowWithoutBevel = getBoxShadow();
+
+        assertThat(boxShadowWithBevel, is(not(boxShadowWithoutBevel)));
+    }
+
+    private void openTestUrlWithoutBevel() {
+        getDriver().get(
+                getTestUrl()
+                        + "$"
+                        + TextFieldBevel.ValoDefaultTextFieldBevel.class
+                                .getSimpleName() + "?restartApplication");
+    }
+
+    private String getBoxShadow() {
+        return $(TextFieldElement.class).first().getCssValue("box-shadow");
     }
 }
-- 
2.39.5