Merge branch 'main' into azurep

microsoft · Dec 4, 2020 · 564ef84 · 564ef84
2 parents 18d6651 + 2a5d599
commit 564ef84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Composer/cypress/integration/TriggerCreation.spec.ts b/Composer/cypress/integration/TriggerCreation.spec.ts
@@ -17,7 +17,7 @@ context('Creating a new trigger', () => {
     cy.findByTestId('DialogHeader-__TestEmptyBot').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click();
+    cy.findAllByText('Add a trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Intent recognized"]').click();
     cy.findByTestId('TriggerName').type('myTrigger1');
@@ -29,7 +29,7 @@ context('Creating a new trigger', () => {
     cy.findByTestId('DialogHeader-__TestEmptyBot').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click();
+    cy.findAllByText('Add a trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Dialog events"]').click();
     cy.findByTestId('eventTypeDropDown').click();
@@ -41,7 +41,7 @@ context('Creating a new trigger', () => {
     cy.findByTestId('DialogHeader-__TestEmptyBot').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click();
+    cy.findAllByText('Add a trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Custom events"]').click();
     cy.findByTestId('CustomEventName').type('myCustomEvent');
@@ -52,7 +52,7 @@ context('Creating a new trigger', () => {
     cy.findByTestId('DialogHeader-__TestEmptyBot').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click();
+    cy.findAllByText('Add a trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Activities"]').click();
     cy.findByTestId('activityTypeDropDown').click();

diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
@@ -471,10 +471,10 @@ export class BotProject implements IBotProject {
   public buildFiles = async ({ luisConfig, qnaConfig, luResource = [], qnaResource = [] }: IBuildConfig) => {
     if (this.settings) {
       const luFiles: FileInfo[] = [];
-      luResource.forEach(({ id, isEmpty }) => {
+      luResource.forEach(({ id }) => {
         const fileName = `${id}.lu`;
         const f = this.files.get(fileName);
-        if (f && !isEmpty) {
+        if (f) {
           luFiles.push(f);
         }
       });