diff --git a/CHANGELOG.md b/CHANGELOG.md index b80418e89e..6983681a0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed -- Bumped all dependencies to the latest versions and sample bumps, by [@compulim](https://github.com/compulim) in PR [#3831](https://github.com/microsoft/BotFramework-WebChat/pull/3831) +- Bumped all dependencies to the latest versions and sample bumps, by [@compulim](https://github.com/compulim) in PR [#3831](https://github.com/microsoft/BotFramework-WebChat/pull/3831) and PR [#3846](https://github.com/microsoft/BotFramework-WebChat/pull/3846) - Development dependencies - [`@azure/storage-blob@12.5.0`](https://npmjs.com/package/@azure/storage-blob) - [`@babel/cli@7.13.14`](https://npmjs.com/package/@babel/cli) @@ -96,6 +96,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [`webpack@4.46.0`](https://npmjs.com/package/webpack) - Production dependencies - [`@emotion/css@11.1.3`](https://npmjs.com/package/@emotion/css), moved from [`create-emotion`](https://npmjs.com/package/create-emotion) + - [`adaptivecards@2.9.0`](https://npmjs.com/package/adaptivecards) - [`classnames@2.3.1`](https://npmjs.com/package/classnames) - [`core-js@3.10.0`](https://npmjs.com/package/core-js) - [`react-redux@7.2.3`](https://npmjs.com/package/react-redux) diff --git a/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png b/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png index 4c79b23b42..613d00a959 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png and b/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-inputs-card-with-custom-style-options-and-submit-action-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-inputs-card-with-custom-style-options-and-submit-action-1-snap.png index cdd6501984..907d3f35d1 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-inputs-card-with-custom-style-options-and-submit-action-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/adaptive-cards-js-inputs-card-with-custom-style-options-and-submit-action-1-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-should-stick-to-bottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-should-stick-to-bottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png index bc8253b92d..d20b513eb0 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-should-stick-to-bottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-should-stick-to-bottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png index 1abc55f7a6..92bb17e337 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png index f876d9fcbd..bf888b631a 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png and b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png index 6f7b29cd12..3a0dad6bd9 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png and b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png differ diff --git a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png index bc6743116a..0af9b85f02 100644 Binary files a/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png and b/__tests__/__image_snapshots__/chrome-docker/scroll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png differ diff --git a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png b/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png index b1f348a4e6..598e57519a 100644 Binary files a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png and b/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png differ diff --git a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png b/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png index 50c44a56a4..479cdf3f1a 100644 Binary files a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png and b/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png differ diff --git a/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-1-snap.png b/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-1-snap.png index 1abc55f7a6..92bb17e337 100644 Binary files a/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-1-snap.png and b/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-1-snap.png differ diff --git a/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-2-snap.png b/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-2-snap.png index 0d07c8950d..060fb2f75b 100644 Binary files a/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-2-snap.png and b/__tests__/__image_snapshots__/html/hooks-use-text-box-js-use-text-box-should-work-properly-2-snap.png differ diff --git a/__tests__/adaptiveCards.js b/__tests__/adaptiveCards.js index 38ffb3c30d..46c1c8d2e6 100644 --- a/__tests__/adaptiveCards.js +++ b/__tests__/adaptiveCards.js @@ -111,6 +111,7 @@ test('disable card inputs', async () => { document.querySelector('.ac-adaptiveCard input[type="radio"]').checked = true; document.querySelector('.ac-adaptiveCard input[type="text"]').value = 'William'; document.querySelector('.ac-adaptiveCard input[type="time"]').value = '12:34'; + document.querySelector('.ac-adaptiveCard input[type="number"]').value = '1'; document.querySelector('.ac-adaptiveCard select').value = '1'; document.querySelector('.ac-adaptiveCard textarea').value = 'One Redmond Way, Redmond, WA'; }); @@ -189,6 +190,11 @@ test('Inputs card with custom style options and submit action', async () => { await driver.wait(minNumActivitiesShown(2), timeouts.directLine); await driver.wait(allImagesLoaded(), timeouts.fetchImage); + // To submit the input form, the number field is mandatory. + await driver.executeScript(() => { + document.querySelector('.ac-adaptiveCard input[type="number"]').value = '1'; + }); + // Click "Submit" button should change the button color await driver.executeScript(() => { document.querySelector('.ac-actionSet button:nth-of-type(2)').click(); diff --git a/__tests__/scrollToBottom.js b/__tests__/scrollToBottom.js index 9111927836..1e9600ed2b 100644 --- a/__tests__/scrollToBottom.js +++ b/__tests__/scrollToBottom.js @@ -26,6 +26,11 @@ test('should stick to bottom if submitting an Adaptive Card while suggested acti await driver.wait(suggestedActionsShown(), timeouts.directLine); await driver.wait(scrollToBottomCompleted(), timeouts.scrollToBottom); + // To submit the input form, the number field is mandatory. + await driver.executeScript(() => { + document.querySelector('.ac-adaptiveCard input[type="number"]').value = '1'; + }); + const submitButton = await driver.findElement(By.css('button.ac-pushButton:nth-of-type(2)')); await submitButton.click(); diff --git a/packages/bundle/package-lock.json b/packages/bundle/package-lock.json index e682138ad1..518a698914 100644 --- a/packages/bundle/package-lock.json +++ b/packages/bundle/package-lock.json @@ -4166,9 +4166,9 @@ "dev": true }, "adaptivecards": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/adaptivecards/-/adaptivecards-2.5.0.tgz", - "integrity": "sha512-WEMxMEcjgNgXPHIe4DtMi0+/EfKgF5h30GBkC07idKKSho+w45RTdNsh2SvXJesuO8rQOnGukclKXfK83/6R3A==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/adaptivecards/-/adaptivecards-2.9.0.tgz", + "integrity": "sha512-TXbtzc6LwisTdlfEAooropj9ZwgcQz8bSirWOnph3bzJJr9QF8YQCfSIpcAXKTJ7b6YrOfH+9xw/a8RaKgeOZg==" }, "agent-base": { "version": "6.0.2", diff --git a/packages/bundle/package.json b/packages/bundle/package.json index 3459befa7f..465e2aa94a 100644 --- a/packages/bundle/package.json +++ b/packages/bundle/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@babel/runtime": "7.13.10", - "adaptivecards": "2.5.0", + "adaptivecards": "2.9.0", "botframework-directlinejs": "0.14.1", "botframework-directlinespeech-sdk": "0.0.0-0", "botframework-webchat-api": "0.0.0-0",