3 files changed, 58 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.java b/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java
index 9eb6806d13..b1379080e9 100644
--- a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.java
+++ b/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java
@@ -48,7 +48,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.NativeButton;
 
-public class FileDownloaderTest extends AbstractTestUIWithLog {
+public class FileDownloaderUI extends AbstractTestUIWithLog {
 
     private AbstractComponent firstDownloadComponent;
 
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java b/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java
new file mode 100644
index 0000000000..73d1ba6f52
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class FileDownloaderUITest extends MultiBrowserTest {
+
+    @Test
+    public void ensureButtonWithDownloaderCanBeRemoved() {
+        openTestURL();
+        By id = By.id("com.vaadin.ui.ButtonDynamicimage");
+        assertElementPresent(id);
+        $(ButtonElement.class).caption("Remove first download button").first()
+                .click();
+        assertElementNotPresent(id);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 075319103b..2e33cc2741 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -1044,4 +1044,25 @@ public abstract class AbstractTB3Test extends ParallelTest {
         }
         selectMenu(menuCaptions[menuCaptions.length - 1], true);
     }
+
+    /**
+     * Asserts that an element is present
+     * 
+     * @param by
+     *            the locatore for the element
+     */
+    protected void assertElementPresent(By by) {
+        Assert.assertTrue("Element is not present", isElementPresent(by));
+    }
+
+    /**
+     * Asserts that an element is not present
+     * 
+     * @param by
+     *            the locatore for the element
+     */
+    protected void assertElementNotPresent(By by) {
+        Assert.assertFalse("Element is present", isElementPresent(by));
+    }
+
 }