Bump adaptivecards@2.5.0 (#3630)

* Quick CHANGELOG.md update/fix * Bump Adaptive Cards to 2.5.0 * Add @amal-khalaf to CODEOWNERS * Add/fix-up tests * Add snaps from previous PRs and fix AC column creation * Update snapshots * Fix up tests * Update snapshots * Update package-locks
microsoft · Dec 15, 2020 · 67925e8 · 67925e8
1 parent 1df73a3
commit 67925e8
Show file tree

Hide file tree

Showing 36 changed files with 1,742 additions and 2,831 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,3 @@
 # https://blog.github.com/2017-07-06-introducing-code-owners/
 
-* @a-b-r-o-w-n @compulim @corinagum @cwhitten @srinaath @tdurnford @tonyanziano @beyackle
+* @a-b-r-o-w-n @amal-khalaf @compulim @corinagum @cwhitten @srinaath @tdurnford @tonyanziano @beyackle
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,14 +68,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
       -  [`redux@4.0.5`](https://npmjs.com/package/redux)
       -  [`sanitize-html@2.1.2`](https://npmjs.com/package/sanitize-html)
       -  [`whatwg-fetch@3.4.1`](https://npmjs.com/package/whatwg-fetch)
+-  [#3392](https://github.com/microsoft/BotFramework-WebChat/issues/3392) Bumped Adaptive Cards to the 2.5.0, by [@corinagum](https://github.com/corinagum) in PR [#3630](https://github.com/microsoft/BotFramework-WebChat/pull/3630)
 
 ### Fixed
 
 -  Fixes [#3278](https://github.com/microsoft/BotFramework-WebChat/issues/3278). Update `HOOKS.md` verbiage, by [@corinagum](https://github.com/corinagum) in PR [#3564](https://github.com/microsoft/BotFramework-WebChat/pull/3564)
 -  Fixes [#3534](https://github.com/microsoft/BotFramework-WebChat/issues/3534). Remove 2020 deprecations, by [@corinagum](https://github.com/corinagum) in PR [#3564](https://github.com/microsoft/BotFramework-WebChat/pull/3564)
 -  Fixes [#3561](https://github.com/microsoft/BotFramework-WebChat/issues/3561). Remove MyGet mentions from samples, by [@corinagum](https://github.com/corinagum) in PR [#3564](https://github.com/microsoft/BotFramework-WebChat/pull/3564)
 -  Fixes [#3537](https://github.com/microsoft/BotFramework-WebChat/issues/3537). Fix some carousels improperly using aria-roledescription, by [@corinagum](https://github.com/corinagum) in PR [#3599](https://github.com/microsoft/BotFramework-WebChat/pull/3599)
--  Fixes [#3483](https://github.com/microsoft/BotFramework-WebChat/issues/3483). IE11 anchors fixed to open securely without 'noreferrer' or 'noopener', by [@corinagum](https://github.com/corinagum) in PR [#3607](https://github.com/microsoft/BotFramework-WebChat/pull/XXX)
+-  Fixes [#3483](https://github.com/microsoft/BotFramework-WebChat/issues/3483). IE11 anchors fixed to open securely without 'noreferrer' or 'noopener', by [@corinagum](https://github.com/corinagum) in PR [#3607](https://github.com/microsoft/BotFramework-WebChat/pull/3607)
 
 ### Samples
 

diff --git a/...__image_snapshots__/chrome-docker/adaptive-cards-js-container-styles-1-snap.png b/...__image_snapshots__/chrome-docker/adaptive-cards-js-container-styles-1-snap.png
diff --git a/...mage_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png b/...mage_snapshots__/chrome-docker/adaptive-cards-js-disable-card-inputs-3-snap.png
diff --git a/...ck-skew-js-clock-skew-faking-clock-skew-should-affect-activity-order-1-snap.png b/...ck-skew-js-clock-skew-faking-clock-skew-should-affect-activity-order-1-snap.png
diff --git a/..._/chrome-docker/clock-skew-js-clock-skew-should-not-have-any-effects-1-snap.png b/..._/chrome-docker/clock-skew-js-clock-skew-should-not-have-any-effects-1-snap.png
diff --git a/...aste-in-the-send-box-when-focus-is-on-a-text-box-of-an-adaptive-card-1-snap.png b/...aste-in-the-send-box-when-focus-is-on-a-text-box-of-an-adaptive-card-1-snap.png
diff --git a/...type-in-the-send-box-when-focus-is-on-a-text-box-of-an-adaptive-card-1-snap.png b/...type-in-the-send-box-when-focus-is-on-a-text-box-of-an-adaptive-card-1-snap.png
diff --git a/...ottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png b/...ottom-if-submitting-an-adaptive-card-while-suggested-actions-is-open-1-snap.png
diff --git a/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png b/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-1-snap.png
diff --git a/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png b/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-2-snap.png
diff --git a/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png b/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-3-snap.png
diff --git a/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png b/...oll-to-bottom-js-show-new-messages-button-only-when-new-message-come-4-snap.png
diff --git a/__tests__/__image_snapshots__/chrome-docker/upload-js-upload-a-zip-file-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/upload-js-upload-a-zip-file-2-snap.png
diff --git a/...cker/use-scroll-to-end-js-calling-scroll-to-end-should-scroll-to-end-1-snap.png b/...cker/use-scroll-to-end-js-calling-scroll-to-end-should-scroll-to-end-1-snap.png
diff --git a/...cker/use-scroll-to-end-js-calling-scroll-to-end-should-scroll-to-end-2-snap.png b/...cker/use-scroll-to-end-js-calling-scroll-to-end-should-scroll-to-end-2-snap.png
diff --git a/...n-adaptive-card-card-agenda-js-adaptive-card-card-agenda-should-fail-1-snap.png b/...n-adaptive-card-card-agenda-js-adaptive-card-card-agenda-should-fail-1-snap.png
diff --git a/...ion-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png b/...ion-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png
diff --git a/...action-adaptive-card-parse-validation-js-adaptive-card-parsing-error-1-snap.png b/...action-adaptive-card-parse-validation-js-adaptive-card-parsing-error-1-snap.png
diff --git a/...ero-card-actions-js-hero-card-actions-message-back-display-text-text-1-snap.png b/...ero-card-actions-js-hero-card-actions-message-back-display-text-text-1-snap.png
diff --git a/...shots__/html/hero-card-actions-js-hero-card-actions-post-back-string-1-snap.png b/...shots__/html/hero-card-actions-js-hero-card-actions-post-back-string-1-snap.png
diff --git a/...cript-activity-grouping-js-transcript-with-activity-grouping-test-10-2-snap.png b/...cript-activity-grouping-js-transcript-with-activity-grouping-test-10-2-snap.png
diff --git a/...cript-activity-grouping-js-transcript-with-activity-grouping-test-15-2-snap.png b/...cript-activity-grouping-js-transcript-with-activity-grouping-test-15-2-snap.png
diff --git a/...script-activity-grouping-js-transcript-with-activity-grouping-test-6-2-snap.png b/...script-activity-grouping-js-transcript-with-activity-grouping-test-6-2-snap.png
diff --git a/__tests__/hooks/useAdaptiveCardsPackage.js b/__tests__/hooks/useAdaptiveCardsPackage.js
@@ -27,7 +27,7 @@ test('getter should return default Adaptive Cards package if not set in props',
   const { pageObjects } = await setupWebDriver();
 
   const [adaptiveCardsPackage] = await pageObjects.runHook('useAdaptiveCardsPackage', [], results =>
-    results[0].AdaptiveCard.currentVersion.toString()
+    new results[0].Version().major.toString()
   );
 
   expect(adaptiveCardsPackage).toMatchInlineSnapshot(`"1"`);

diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgenda.html b/__tests__/html/cardAction.adaptiveCard.cardAgenda.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <script crossorigin="anonymous" src="/__dist__/testharness.js"></script>
+    <script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
+  </head>
+  <body>
+    <div id="webchat"></div>
+    <script type="text/babel" data-presets="env,stage-3,react">
+      const {
+        React: { useMemo },
+        WebChat: { renderWebChat },
+        WebChatTest: { conditions, createStore, host, pageObjects, timeouts, token }
+      } = window;
+
+      (async function () {
+        renderWebChat(
+          {
+            directLine: window.WebChat.createDirectLine({ token: await token.fetchDirectLineToken() }),
+            store: createStore()
+          },
+          document.getElementById('webchat')
+        );
+
+        await pageObjects.wait(conditions.uiConnected(), timeouts.directLine);
+        await pageObjects.sendMessageViaSendBox('card agenda', { waitForSend: true });
+        await pageObjects.wait(conditions.minNumActivitiesShown(2), timeouts.directLine);
+
+        await host.snapshot();
+        await host.done();
+      })();
+    </script>
+  </body>
+</html>
diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgenda.js b/__tests__/html/cardAction.adaptiveCard.cardAgenda.js
@@ -0,0 +1,7 @@
+/**
+ * @jest-environment ./__tests__/html/__jest__/WebChatEnvironment.js
+ */
+
+describe('"Adaptive card', () => {
+  test('card agenda should fail', () => runHTMLTest('cardAction.adaptiveCard.cardAgenda.html'));
+});