Set WaterfallStepContext.Parent correctly (#2728)

microsoft · Aug 19, 2020 · 8e006ec · 8e006ec
1 parent 339b6ec
commit 8e006ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 60 deletions.
diff --git a/libraries/botbuilder-dialogs/src/waterfallStepContext.ts b/libraries/botbuilder-dialogs/src/waterfallStepContext.ts
@@ -61,7 +61,7 @@ export class WaterfallStepContext<O extends object = {}> extends DialogContext {
     public constructor(dc: DialogContext, info: WaterfallStepInfo<O>) {
         super(dc.dialogs, dc, { dialogStack: dc.stack });
         this._info = info;
-        this.parent = dc;
+        this.parent = dc.parent;
     }
 
     /**

diff --git a/libraries/botbuilder-dialogs/tests/waterfallDialog.test.js b/libraries/botbuilder-dialogs/tests/waterfallDialog.test.js
@@ -634,63 +634,4 @@ describe('WaterfallDialog', function () {
         }, DialogReason.cancelCalled);
         assert(trackEventCalled, 'trackEvent was never called.');
     });
-
-    it('should waterfall parent be equal to Component Dialog.', (done) => {
-        const conversationState = new ConversationState(new MemoryStorage());
-        const dialogState = conversationState.createProperty('dialog');
-
-        const waterfall = new WaterfallDialog('waterfall', [
-            step => ({ status: DialogTurnStatus.complete, result: step })
-        ]);
-
-        const component = new ComponentDialog('composite');
-        component.addDialog(waterfall);
-
-        const dialogs = new DialogSet(dialogState);
-        dialogs.add(component);
-
-        const adapter = new TestAdapter(async turnContext => {
-            const dc = await dialogs.createContext(turnContext);
-
-            const results = await dc.beginDialog('composite');
-
-            if (results.status === DialogTurnStatus.complete) {
-                const waterfallParent = results.result.parent.parent;
-
-                assert.strictEqual(waterfallParent.dialogs.dialogs['composite'], component, 'WaterfallDialog "waterfall" parent should be equal to ComponentDialog "composite".');
-                done();
-            } else {
-                done(new Error('status results not completed'));
-            }
-        });
-
-        adapter.send('Hi');
-    });
-
-    it('should waterfall parent be equal to Dialog Context.', (done) => {
-        const conversationState = new ConversationState(new MemoryStorage());
-        const dialogState = conversationState.createProperty('dialog');
-
-        const waterfall = new WaterfallDialog('waterfall', [
-            step => ({ status: DialogTurnStatus.complete, result: step })
-        ]);
-
-        const dialogs = new DialogSet(dialogState);
-        dialogs.add(waterfall);
-
-        const adapter = new TestAdapter(async turnContext => {
-            const dc = await dialogs.createContext(turnContext);
-            const results = await dc.beginDialog('waterfall');
-
-            if (results.status === DialogTurnStatus.complete) {
-                assert.deepStrictEqual(results.result.parent, dc, 'waterfall parent should be equal to Dialog Context.');
-                done();
-            } else {
-                done(new Error('status results not completed'));
-            }
-        });
-
-        adapter.send('Hi');
-    });
-
 });