Fix problem with re-opening the popup (#8446) (#8451)

* Fix problem with re-opening the popup (#8446)

Fixed problem that disables opening of popup
after closing it by clicking the datefield-button.

* Fix issue #8446 in compatibility version PopupDateField also.

2 files changed, 118 insertions, 0 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateTimeFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateTimeFieldPopup.java
new file mode 100644
index 0000000000..a34569aead
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateTimeFieldPopup.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2016 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.datefield;
+
+import java.time.LocalDateTime;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.DateTimeField;
+
+/**
+ * Test UI for testing the functionality of the popup button.
+ */
+public class DateTimeFieldPopup extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        DateTimeField dateTimeField = new DateTimeField();
+        dateTimeField.setValue(LocalDateTime.of(1999, 12, 1, 12, 00));
+
+        addComponent(dateTimeField);
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldPopupTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldPopupTest.java
new file mode 100644
index 0000000000..36db204835
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldPopupTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2000-2016 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.datefield;
+
+import org.junit.Test;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateTimeFieldElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DateTimeFieldPopupTest extends MultiBrowserTest {
+
+    @Test
+    public void testOpenCloseOpen_popupShouldBeOpen() throws Exception {
+        openTestURL();
+
+        WebElement toggleButton = $(DateTimeFieldElement.class).first()
+                .findElement(By.className("v-datefield-button"));
+
+        toggleButton.click();
+
+        assertThatPopupIsVisible();
+
+        toggleButton.click();
+
+        assertThatPopupIsInvisible();
+
+        // We should be able to immediately open the popup from the popup after
+        // clicking the button to close it. (#8446)
+        toggleButton.click();
+
+        assertThatPopupIsVisible();
+    }
+
+    private void assertThatPopupIsVisible() {
+        waitUntil(ExpectedConditions.visibilityOfElementLocated(
+                org.openqa.selenium.By.className("v-datefield-popup")));
+    }
+
+    private void assertThatPopupIsInvisible() {
+        // ExpectedConditions.invisibilityOfElementLocated doesn't work
+        // with PhantomJS when running with a hub:
+        // https://code.google.com/p/selenium/issues/detail?id=5000
+        // so we need to make our own.
+
+        waitUntil(new ExpectedCondition<Boolean>() {
+            @Override
+            public Boolean apply(WebDriver input) {
+                try {
+                    return !(findElement(org.openqa.selenium.By
+                            .className("v-datefield-popup")).isDisplayed());
+                } catch (Exception e) {
+                    return true;
+                }
+            }
+
+            @Override
+            public String toString() {
+                // Timed out after 10 seconds waiting for ...
+                return "popup to not be visible";
+            }
+        });
+    }
+}