1 files changed, 37 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
new file mode 100644
index 0000000000..921c1b40e4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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 org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Keys;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+
+public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest {
+    @Test
+    public void testKeyboardSelection() throws InterruptedException {
+        openTestURL();
+        ComboBoxElement cb = $(ComboBoxElement.class).first();
+        cb.click();
+        cb.sendKeys(500, Keys.DOWN, Keys.DOWN, Keys.DOWN, Keys.ENTER);
+        Assert.assertEquals("", getLogRow(0).trim());
+        cb.sendKeys(Keys.ENTER);
+        Assert.assertEquals("1. Button clicked. ComboBox value: Berlin",
+                getLogRow(0));
+    }
+}
+\ No newline at end of file