2 files changed, 50 insertions, 24 deletions

diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss
index 07a51f03ef..1616e80563 100644
--- a/WebContent/VAADIN/themes/valo/components/_upload.scss
+++ b/WebContent/VAADIN/themes/valo/components/_upload.scss
@@ -16,7 +16,7 @@
 
   .#{$primary-stylename}-immediate input[type="file"] {
     @include opacity(0);
-    z-index: 2;
+    z-index: -1;
     position: absolute;
     right: 0;
     height: $v-unit-size;
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
index 044f76e335..87827b1358 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
@@ -15,9 +15,10 @@
  */
 package com.vaadin.tests.themes.valo;
 
-import static org.hamcrest.Matchers.equalToIgnoringCase;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.junit.Test;
@@ -40,34 +41,59 @@ public class ImmediateUploadTest extends MultiBrowserTest {
         return getAllBrowsers();
     }
 
-    @Test
-    public void fileInputShouldNotBeVisibleInImmediate()
-            throws InterruptedException {
+    @Override
+    public void setup() throws Exception {
+        super.setup();
         openTestURL();
+    }
+
+    private WebElement getUploadButton(String id) {
+        UploadElement normalUpload = $(UploadElement.class).id(id);
+
+        return normalUpload.findElement(By.tagName("div"));
+    }
+
+    private WebElement getUploadFileInput(String id) {
+        UploadElement normalUpload = $(UploadElement.class).id(id);
+
+        return normalUpload.findElement(By.cssSelector("input[type='file']"));
+    }
+
+    @Test
+    public void normalUploadButtonIsVisible() {
+        WebElement button = getUploadButton("upload");
 
-        UploadElement normalUpload = $(UploadElement.class).id("upload");
-        UploadElement immediateUpload = $(UploadElement.class).id(
-                "immediateupload");
+        assertThat(button.getCssValue("display"), is("block"));
+    }
+
+    @Test
+    public void fileInputIsVisibleForNormalUpload() {
+        WebElement input = getUploadFileInput("upload");
 
-        WebElement normalUploadInput = normalUpload.findElement(By
-                .cssSelector("input[type='file']"));
-        WebElement immediateUploadInput = immediateUpload.findElement(By
-                .cssSelector("input[type='file']"));
+        assertThat(input.getCssValue("position"), is("static"));
+    }
 
-        WebElement normalUploadButton = normalUpload.findElement(By
-                .tagName("div"));
-        WebElement immediateUploadButton = immediateUpload.findElement(By
-                .tagName("div"));
+    @Test
+    public void immediateUploadButtonIsVisible() {
+        WebElement button = getUploadButton("immediateupload");
 
-        assertThat(normalUploadButton.getCssValue("display"),
-                equalToIgnoringCase("block"));
-        assertThat(immediateUploadButton.getCssValue("display"),
-                equalToIgnoringCase("block"));
+        assertThat(button.getCssValue("display"), is("block"));
+    }
 
-        assertThat(normalUploadInput.getCssValue("position"),
-                equalToIgnoringCase("static"));
-        assertThat(immediateUploadInput.getCssValue("position"),
-                equalToIgnoringCase("absolute"));
+    @Test
+    public void fileInputIsNotVisibleForImmediateUpload() {
+        WebElement input = getUploadFileInput("immediateupload");
+
+        assertThat(input.getCssValue("position"), is("absolute"));
+    }
+
+    @Test
+    public void fileInputIsNotClickableForImmediateUpload() throws IOException {
+        WebElement input = getUploadFileInput("immediateupload");
 
+        // input.click() and then verifying if the upload window is opened
+        // would be better but couldn't figure a way to do that. screenshots
+        // don't show the upload window, not at least in firefox.
+        assertThat(input.getCssValue("z-index"), is("-1"));
     }
 }