1 files changed, 60 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
new file mode 100644
index 0000000000..a5efb44ec8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.combobox;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest {
+    @Override
+    protected Class<?> getUIClass() {
+        return ComboBoxes2.class;
+    }
+
+    @Test
+    public void testClosePopupRetainText() throws Exception {
+        openTestURL();
+
+        ComboBoxElement cb = $(ComboBoxElement.class).first();
+        WebElement textbox = cb.findElement(By.vaadin("#textbox"));
+        textbox.sendKeys("I");
+        cb.openPopup();
+        cb.openPopup(); // openPopup() actually toggles
+        // The entered value should remain
+        assertEquals("I", textbox.getAttribute("value"));
+    }
+
+    @Test
+    public void testClosePopupRetainText_selectingAValue() throws Exception {
+        openTestURL();
+        ComboBoxElement cb = $(ComboBoxElement.class).first();
+        cb.selectByText("Item 3");
+        WebElement textbox = cb.findElement(By.vaadin("#textbox"));
+        textbox.clear();
+        textbox.sendKeys("I");
+        cb.openPopup();
+        // Entered value should remain in the text field even though the popup
+        // is opened
+        assertEquals("I", textbox.getAttribute("value"));
+
+    }
+}