Adding demo for demoing how to handle server-side close validation (#56)

* Adding demo for demoing how to handle server-side close validation
vaadin · Apr 9, 2018 · d81dc21 · d81dc21
1 parent 59d5fe2
commit d81dc21
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/src/test/java/com/vaadin/flow/component/dialog/demo/DialogView.java b/src/test/java/com/vaadin/flow/component/dialog/demo/DialogView.java
@@ -35,6 +35,7 @@ public class DialogView extends DemoView {
     public void initView() {
         addBasicDialog();
         addConfirmationDialog();
+        addCloseFromServerSideDialog();
     }
 
     private void addBasicDialog() {
@@ -80,4 +81,27 @@ private void addConfirmationDialog() {
         button.setId("confirmation-dialog-button");
         addCard("Confirmation dialog", button, messageLabel);
     }
+
+    private void addCloseFromServerSideDialog() {
+        NativeButton button = new NativeButton(BUTTON_CAPTION);
+
+        // begin-source-example
+        // source-example-heading: Close from server-side
+        Label messageLabel = new Label();
+
+        Dialog dialog = new Dialog(new Label("Close me with the esc-key"));
+        dialog.setCloseOnOutsideClick(false);
+
+        dialog.addDialogCloseActionListener(e -> {
+            messageLabel.setText("Closed from server-side");
+            dialog.close();
+        });
+        // end-source-example
+
+        button.addClickListener(event -> dialog.open());
+
+        messageLabel.setId("server-side-close-dialog-label");
+        button.setId("server-side-close-dialog-button");
+        addCard("Close from server-side", button, messageLabel);
+    }
 }
diff --git a/src/test/java/com/vaadin/flow/component/dialog/tests/DialogIT.java b/src/test/java/com/vaadin/flow/component/dialog/tests/DialogIT.java
@@ -57,6 +57,21 @@ public void openAndCloseConfirmationDialog_buttonsRenderedWithClickListeners() {
         Assert.assertEquals("Cancelled...", messageLabel.getText());
     }
 
+    @Test
+    public void validateClosingFromServerSide() {
+        findElement(By.id("server-side-close-dialog-button")).click();
+        verifyDialogOpened();
+
+        executeScript("document.body.click()");
+        verifyDialogOpened();
+
+        new Actions(getDriver()).sendKeys(Keys.ESCAPE).perform();
+        verifyDialogClosed();
+
+        Assert.assertEquals("Closed from server-side",
+                findElement(By.id("server-side-close-dialog-label")).getText());
+    }
+
     private WebElement getOverlayContent() {
         WebElement overlay = findElement(By.tagName(DIALOG_OVERLAY_TAG));
         return getInShadowRoot(overlay, By.id("content"));
@@ -66,6 +81,10 @@ private void verifyDialogClosed() {
         waitForElementNotPresent(By.tagName(DIALOG_OVERLAY_TAG));
     }
 
+    private void verifyDialogOpened() {
+        waitForElementPresent(By.tagName(DIALOG_OVERLAY_TAG));
+    }
+
     @Override
     protected String getTestPath() {
         return ("/vaadin-dialog");