Removed fallback exception from version change logic. (#2283)

* Removed fallback exception from version cgange logic. * Removed un-needed unit test * Removed console log Co-authored-by: Steven Gum <14935595+stevengum@users.noreply.github.com>
microsoft · Jun 1, 2020 · f3e7e02 · f3e7e02
1 parent cad3701
commit f3e7e02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/libraries/botbuilder-dialogs/src/dialogContainer.ts b/libraries/botbuilder-dialogs/src/dialogContainer.ts
@@ -63,11 +63,7 @@ export abstract class DialogContainer<O extends object = {}> extends Dialog<O> {
             // Give bot an opportunity to handle the change.
             // - If bot handles it the changeHash will have been updated as to avoid triggering the 
             //   change again.
-            const handled = await dc.emitEvent(DialogEvents.versionChanged, this.id, true, false);
-            if (!handled) {
-                // Throw an error for bot to catch
-                throw new Error(`Version change detected for '${this.id}' dialog.`);
-            }
+            await dc.emitEvent(DialogEvents.versionChanged, this.id, true, false);
         }
     }
 }
diff --git a/libraries/botbuilder-dialogs/tests/componentDialog.test.js b/libraries/botbuilder-dialogs/tests/componentDialog.test.js
@@ -391,48 +391,6 @@ describe('ComponentDialog', function () {
             .assertReply('Second step.')
             .assertReply('Done.')
     });
-
-    it('should throw error if unhandled dialogChange event.', (done) => {
-        const conversationState = new ConversationState(new MemoryStorage());
-        const dialogState = conversationState.createProperty('dialog');
-
-        const childDialog = new WaterfallDialog('child', [
-            async step => {
-                component.addDialog(new WaterfallDialog('change'));
-                await step.context.sendActivity('First step.');
-                return Dialog.EndOfTurn;
-            },
-            async step => {
-                await step.context.sendActivity('Second step.');
-                return await step.endDialog();
-            }
-        ]);
-        const component = new ChangedDialog('test', false);
-        component.addDialog(childDialog);
-
-        const dialogs = new DialogSet(dialogState);
-        dialogs.add(component);
-
-        const adapter = new TestAdapter(async turnContext => {
-            try {
-                const dc = await dialogs.createContext(turnContext);
-                const results = await dc.continueDialog();
-
-                if (results.status === DialogTurnStatus.empty) {
-                    await dc.beginDialog('test');
-                }
-                await conversationState.saveChanges(turnContext);
-            } catch (err) {
-                await turnContext.sendActivity('Done.')
-                done();
-            }
-        });
-
-        adapter.send('Hi')
-            .assertReply('First step.')
-            .send('Hi again')
-            .assertReply('Done.')
-    });
 });