From 41ef058ba8a99d7603e98e122b9e60fa2dbf33c9 Mon Sep 17 00:00:00 2001
From: Sun Zhe <31067185+ZheSun88@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:18:40 +0200
Subject: Fix ComboBoxElement clear method (#11483)

Explicitly reset the value in case if it was cleared.
Ignore the case for selecting a suggestion.

Fixes vaadin/testbench#1122
---
 .../java/com/vaadin/tests/components/ErrorLevelsTest.java    | 12 +-----------
 .../combobox/ComboBoxSelectingNewItemValueChangeTest.java    |  4 +++-
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/test/java/com/vaadin/tests/components/ErrorLevelsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ErrorLevelsTest.java
index 647c9601e4..942e23f061 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ErrorLevelsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ErrorLevelsTest.java
@@ -147,17 +147,7 @@ public class ErrorLevelsTest extends SingleBrowserTest {
     }
 
     private void selectErrorLevel(ErrorLevel errorLevel) {
-        errorLevelSelector.clear();
         errorLevelSelector
-                .sendKeys(errorLevel.toString().toLowerCase(Locale.ROOT));
-        errorLevelSelector.sendKeys(getReturn());
-    }
-
-    private Keys getReturn() {
-        if (BrowserUtil.isPhantomJS(getDesiredCapabilities())) {
-            return Keys.ENTER;
-        } else {
-            return Keys.RETURN;
-        }
+                .selectByText(errorLevel.toString().toUpperCase(Locale.ROOT));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
index 1e2869df61..6f6d45cd2a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
@@ -137,7 +137,9 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
 
     protected void typeInputAndSelect(String input,
             SelectionType selectionType) {
-        comboBoxElement.clear();
+        // clear() would cause an additional value change in chrome 70+
+        // since it always makes blur after clear()
+        comboBoxElement.sendKeys(Keys.BACK_SPACE, Keys.BACK_SPACE, Keys.BACK_SPACE);
         sendKeysToInput(input);
         switch (selectionType) {
         case ENTER:
-- 
cgit v1.2.3