added test case for CancelAllDialogs (#2049)

microsoft · Apr 22, 2020 · d32dd1d · d32dd1d
1 parent 13b240a
commit d32dd1d
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 3 deletions.
diff --git a/...tbuilder-dialogs-adaptive-tests/resources/ActionTests/Action_CancelAllDialogs.test.dialog b/...tbuilder-dialogs-adaptive-tests/resources/ActionTests/Action_CancelAllDialogs.test.dialog
@@ -0,0 +1,98 @@
+{
+    "$schema": "../../../../schemas/sdk.schema",
+    "$kind": "Microsoft.Test.Script",
+    "dialog": {
+        "$schema": "../../app.schema",
+        "$kind": "Microsoft.AdaptiveDialog",
+        "recognizer": {
+            "$kind": "Microsoft.RegexRecognizer",
+            "intents": [
+                {
+                    "intent": "CancelIntent",
+                    "pattern": "(?i)cancel|never mind"
+                }
+            ]
+        },
+        "triggers": [
+            {
+                "$kind": "Microsoft.OnBeginDialog",
+                "actions": [
+                    {
+                        "$schema": "../../app.schema",
+                        "$kind": "Microsoft.AdaptiveDialog",
+                        "recognizer": {
+                            "$kind": "Microsoft.RegexRecognizer",
+                            "intents": [
+                                {
+                                    "intent": "CancelIntent",
+                                    "pattern": "(?i)cancel|never mind"
+                                }
+                            ]
+                        },
+                        "triggers": [
+                            {
+                                "$kind": "Microsoft.OnBeginDialog",
+                                "actions": [
+                                    {
+                                        "$kind": "Microsoft.SendActivity",
+                                        "activity": "Why did the chicken cross the road?"
+                                    },
+                                    {
+                                        "$kind": "Microsoft.EndTurn"
+                                    },
+                                    {
+                                        "$kind": "Microsoft.SendActivity",
+                                        "activity": "To get to the other side"
+                                    }
+                                ]
+                            },
+                            {
+                                "$kind": "Microsoft.OnIntent",
+                                "intent": "CancelIntent",
+                                "actions": [
+                                    {
+                                        "$kind": "Microsoft.SendActivity",
+                                        "activity": "Canceled"
+                                    },
+                                    {
+                                        "$kind": "Microsoft.CancelAllDialogs"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "$kind": "Microsoft.SendActivity",
+                        "activity": "What am I doing here?"
+                    }
+                ]
+            }
+        ]
+    },
+    "script": [
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "hi"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Why did the chicken cross the road?"
+        },
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "cancel"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Canceled"
+        },
+        {
+            "$kind": "Microsoft.Test.UserSays",
+            "text": "hi"
+        },
+        {
+            "$kind": "Microsoft.Test.AssertReply",
+            "text": "Why did the chicken cross the road?"
+        }
+    ]
+}
diff --git a/libraries/botbuilder-dialogs-adaptive-tests/src/action.test.ts b/libraries/botbuilder-dialogs-adaptive-tests/src/action.test.ts
@@ -19,6 +19,10 @@ describe('ActionTests', function() {
         await testRunner.runTestScript('Action_BeginDialogWithActivity');
     });
 
+    it('CancelAllDialogs', async () => {
+        await testRunner.runTestScript('Action_CancelAllDialogs');
+    });
+
     it('ChoiceInput', async () => {
         await testRunner.runTestScript('Action_ChoiceInput');
     });

diff --git a/libraries/botbuilder-dialogs-adaptive/src/actions/cancelAllDialogs.ts b/libraries/botbuilder-dialogs-adaptive/src/actions/cancelAllDialogs.ts
@@ -35,15 +35,15 @@ export class CancelAllDialogs<O extends object = {}> extends Dialog<O> {
         }
 
         if (!dc.parent) {
-            return await dc.cancelAllDialogs(true, this.eventName.getValue(dc.state), this.eventValue.getValue(dc.state));
+            return await dc.cancelAllDialogs(true, this.eventName && this.eventName.getValue(dc.state), this.eventValue && this.eventValue.getValue(dc.state));
         } else {
-            const turnResult = await dc.cancelAllDialogs(true, this.eventName.getValue(dc.state), this.eventValue.getValue(dc.state));
+            const turnResult = await dc.cancelAllDialogs(true, this.eventName && this.eventName.getValue(dc.state), this.eventValue && this.eventValue.getValue(dc.state));
             turnResult.parentEnded = true;
             return turnResult;
         }
     }
 
     protected onComputeId(): string {
-        return `CancelAllDialogs[${ this.eventName.toString() || '' }]`;
+        return `CancelAllDialogs[${ this.eventName ? this.eventName.toString() : '' }]`;
     }
 }