Merge branch 'master' into grid-unbuffered-editor

Change-Id: I00e60554b57bb57864ea613fffda2b7882628ce2

uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java

@@ -0,0 +1,46 @@
+/*
+ * 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 com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.CheckBox;
+
+public class ComboBoxNoTextInput extends ComboBoxSelecting {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        super.setup(request);
+        comboBox.setTextInputAllowed(true);
+
+        final CheckBox textInputCheckBox = new CheckBox("Text Input", true);
+        textInputCheckBox.setId("textInput");
+        textInputCheckBox.addValueChangeListener(new ValueChangeListener() {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                comboBox.setTextInputAllowed(textInputCheckBox.getValue());
+            }
+        });
+        addComponent(textInputCheckBox);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "ComboBox should open popup on click when text input is not allowed.";
+    }
+
+}

uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java

@@ -0,0 +1,61 @@
+/*
+ * 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.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class ComboBoxNoTextInputTest extends MultiBrowserTest {
+
+    @Test
+    public void testComboBoxNoTextInputPopupOpensOnClick() throws Exception {
+        openTestURL();
+
+        // deactivate text input
+        click($(CheckBoxElement.class).id("textInput"));
+
+        // click and check that popup appears
+        ComboBoxElement cb = $(ComboBoxElement.class).first();
+        click(cb);
+        // popup is opened lazily
+        waitForElementPresent(By.vaadin("//com.vaadin.ui.ComboBox[0]#popup"));
+    }
+
+    @Test
+    public void testComboBoxWithTextInputNoPopupOpensOnClick() throws Exception {
+        openTestURL();
+
+        // click and check that no popup appears
+        ComboBoxElement cb = $(ComboBoxElement.class).first();
+        click(cb);
+        // popup is opened lazily
+        sleep(1000);
+        Assert.assertFalse(cb.isElementPresent(By.vaadin("#popup")));
+    }
+
+    private void click(ComboBoxElement cb) throws Exception {
+        WebElement element = cb.findElement(By.vaadin("#textbox"));
+        ((TestBenchElementCommands) element).click(8, 7);
+    }
+
+}

uitest/src/com/vaadin/tests/components/media/AudioTest.java

@@ -50,15 +50,19 @@ protected void setup() {
 
         CheckBox checkBox = new CheckBox("Show controls",
                 new MethodProperty<Boolean>(audio, "showControls"));
+        checkBox.setImmediate(true);
         addComponent(checkBox);
         checkBox = new CheckBox("HtmlContentAllowed",
                 new MethodProperty<Boolean>(audio, "htmlContentAllowed"));
+        checkBox.setImmediate(true);
         addComponent(checkBox);
         checkBox = new CheckBox("muted", new MethodProperty<Boolean>(audio,
                 "muted"));
+        checkBox.setImmediate(true);
         addComponent(checkBox);
         checkBox = new CheckBox("autoplay", new MethodProperty<Boolean>(audio,
                 "autoplay"));
+        checkBox.setImmediate(true);
         addComponent(checkBox);
 
         Button b = new Button("Change", new Button.ClickListener() {

uitest/src/com/vaadin/tests/tickets/Ticket1710.java

@@ -270,13 +270,17 @@ public class LayoutTestingPanel extends Panel {
             controls.addComponent(new Label("width"));
             controls.addComponent(new TextField(new MethodProperty<Float>(
                     testedLayout, "width")));
-            controls.addComponent(new CheckBox("%",
-                    new MethodProperty<Boolean>(this, "widthPercents")));
+            CheckBox widthPercentsCheckBox = new CheckBox("%",
+                    new MethodProperty<Boolean>(this, "widthPercents"));
+            widthPercentsCheckBox.setImmediate(true);
+            controls.addComponent(widthPercentsCheckBox);
             controls.addComponent(new Label("height"));
             controls.addComponent(new TextField(new MethodProperty<Float>(
                     testedLayout, "height")));
-            controls.addComponent(new CheckBox("%",
-                    new MethodProperty<Boolean>(this, "heightPercents")));
+            CheckBox heightPercentsCheckBox = new CheckBox("%",
+                    new MethodProperty<Boolean>(this, "heightPercents"));
+            heightPercentsCheckBox.setImmediate(true);
+            controls.addComponent(heightPercentsCheckBox);
             controls.addComponent(marginLeft);
             controls.addComponent(marginRight);
             controls.addComponent(marginTop);