Fix: Change token API URL (#5249)

* Change token API URL * Update tests to use `conversationstart` command * Use docker compose v2 * Fix ASE token * Merge obsoleted tests * Remove obsoleted screenshots * Port to HTML tests * Skip DLSpeech tests for now * Port * One pixel difference * More error logging
microsoft · Aug 5, 2024 · af6b947 · af6b947
1 parent f65f37e
commit af6b947
Show file tree

Hide file tree

Showing 42 changed files with 283 additions and 320 deletions.
diff --git a/.github/workflows/pull-request-validation.yml b/.github/workflows/pull-request-validation.yml
@@ -236,11 +236,11 @@ jobs:
 
       - run: npm clean-install
 
-      - name: Run docker-compose build
-        run: docker-compose -f docker-compose-wsl2.yml build --build-arg REGISTRY=mcr.microsoft.com/mirror/docker/library
+      - name: Run docker compose build
+        run: docker compose -f docker-compose-wsl2.yml build --build-arg REGISTRY=mcr.microsoft.com/mirror/docker/library
 
-      - name: Run docker-compose up
-        run: docker-compose -f docker-compose-wsl2.yml up --detach --scale chrome=2
+      - name: Run docker compose up
+        run: docker compose -f docker-compose-wsl2.yml up --detach --scale chrome=2
 
       - name: Wait for Docker to be ready
         run: |
@@ -269,7 +269,7 @@ jobs:
 
       - if: always()
         name: Print Docker logs
-        run: docker-compose -f docker-compose-wsl2.yml logs
+        run: docker compose -f docker-compose-wsl2.yml logs
 
       - if: always()
         name: Append ID to test result

diff --git a/...me-docker/style-options-js-style-options-bubble-background-and-color-1-snap.png b/...me-docker/style-options-js-style-options-bubble-background-and-color-1-snap.png
diff --git a/...e-docker/style-options-js-style-options-hide-scroll-to-bottom-button-1-snap.png b/...e-docker/style-options-js-style-options-hide-scroll-to-bottom-button-1-snap.png
diff --git a/...e-docker/style-options-js-style-options-hide-scroll-to-bottom-button-2-snap.png b/...e-docker/style-options-js-style-options-hide-scroll-to-bottom-button-2-snap.png
diff --git a/__tests__/__image_snapshots__/chrome-docker/video-js-video-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/video-js-video-1-snap.png
diff --git a/...line-app-service-service-chat-adapter-should-connect-to-the-mock-bot-1-snap.png b/...line-app-service-service-chat-adapter-should-connect-to-the-mock-bot-1-snap.png
diff --git a/...operties-with-no-locale-is-sent-should-get-hello-and-welcome-message-1-snap.png b/...operties-with-no-locale-is-sent-should-get-hello-and-welcome-message-1-snap.png
diff --git a/...properties-with-locale-of-en-us-should-get-hello-and-welcome-message-1-snap.png b/...properties-with-locale-of-en-us-should-get-hello-and-welcome-message-1-snap.png
diff --git a/...ies-with-locale-of-invalid-type-should-get-hello-and-welcome-message-1-snap.png b/...ies-with-locale-of-invalid-type-should-get-hello-and-welcome-message-1-snap.png
diff --git a/...erties-with-non-existing-locale-should-get-hello-and-welcome-message-1-snap.png b/...erties-with-non-existing-locale-should-get-hello-and-welcome-message-1-snap.png
diff --git a/...ties-with-non-iso-format-locale-should-get-hello-and-welcome-message-1-snap.png b/...ties-with-non-iso-format-locale-should-get-hello-and-welcome-message-1-snap.png
diff --git a/...h-locale-of-zh-cn-should-get-hello-and-welcome-in-simplified-chinese-1-snap.png b/...h-locale-of-zh-cn-should-get-hello-and-welcome-in-simplified-chinese-1-snap.png
diff --git a/...bubble-border-js-bubble-border-with-color-radius-style-and-width-set-1-snap.png b/...bubble-border-js-bubble-border-with-color-radius-style-and-width-set-1-snap.png
diff --git a/...how-zip-files-with-content-url-1-snap.png → ...e-with-content-url-should-send-1-snap.png b/...how-zip-files-with-content-url-1-snap.png → ...e-with-content-url-should-send-1-snap.png
diff --git a/...-zip-files-without-content-url-1-snap.png → ...ithout-content-url-should-send-1-snap.png b/...-zip-files-without-content-url-1-snap.png → ...ithout-content-url-should-send-1-snap.png
diff --git a/__tests__/fileAttachment.js b/__tests__/fileAttachment.js
diff --git a/__tests__/hooks/useReferenceGrammarId.js b/__tests__/hooks/useReferenceGrammarId.js
diff --git a/__tests__/html/assets/uploads/empty.zip b/__tests__/html/assets/uploads/empty.zip
diff --git a/__tests__/html/chatAdapter.directLineAppServiceExtension.html b/__tests__/html/chatAdapter.directLineAppServiceExtension.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -10,19 +10,18 @@
     <main id="webchat"></main>
     <script>
       run(async function () {
+        const { domain, token } = await testHelpers.token.fetchDirectLineAppServiceExtensionToken();
+
         WebChat.renderWebChat(
           {
-            directLine: await WebChat.createDirectLineAppServiceExtension({
-              domain: 'https://webchat-mockbot3.azurewebsites.net/.bot/v3/directline',
-              token: await testHelpers.token.fetchDirectLineAppServiceExtensionToken()
-            }),
+            directLine: await WebChat.createDirectLineAppServiceExtension({ domain, token }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
-        await pageObjects.sendMessageViaSendBox('Hello, World!', { waitForSend: true });
+        await pageObjects.sendMessageViaSendBox('echo Hello, World!', { waitForSend: true });
         await pageConditions.minNumActivitiesShown(3);
 
         await host.snapshot();

diff --git a/__tests__/html/chatAdapter.directLineSpeech.js b/__tests__/html/chatAdapter.directLineSpeech.js
@@ -1,5 +1,5 @@
 /** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
 
 describe('Direct Line Speech chat adapter', () => {
-  test('should connect to the MockBot.', () => runHTML('chatAdapter.directLineSpeech.html'));
+  test.skip('should connect to the MockBot.', () => runHTML('chatAdapter.directLineSpeech.html'));
 });
diff --git a/__tests__/html/conversationStartProperties.noLocaleIsSent.html b/__tests__/html/conversationStartProperties.noLocaleIsSent.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -14,16 +14,16 @@
         WebChat.renderWebChat(
           {
             directLine: WebChat.createDirectLine({
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();

diff --git a/__tests__/html/conversationStartProperties.sendEnUs.html b/__tests__/html/conversationStartProperties.sendEnUs.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -17,16 +17,16 @@
               conversationStartProperties: {
                 locale: 'en-US'
               },
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();

diff --git a/__tests__/html/conversationStartProperties.sendInvalidType.html b/__tests__/html/conversationStartProperties.sendInvalidType.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -17,16 +17,16 @@
               conversationStartProperties: {
                 locale: { invalid: true }
               },
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();

diff --git a/__tests__/html/conversationStartProperties.sendNonExisting.html b/__tests__/html/conversationStartProperties.sendNonExisting.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -17,16 +17,16 @@
               conversationStartProperties: {
                 locale: 'xx-YY'
               },
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();

diff --git a/__tests__/html/conversationStartProperties.sendNonISOFormat.html b/__tests__/html/conversationStartProperties.sendNonISOFormat.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -17,16 +17,16 @@
               conversationStartProperties: {
                 locale: '1a2b3c'
               },
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();

diff --git a/__tests__/html/conversationStartProperties.sendZhCn.html b/__tests__/html/conversationStartProperties.sendZhCn.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-US">
   <head>
     <link href="/assets/index.css" rel="stylesheet" type="text/css" />
@@ -17,16 +17,16 @@
               conversationStartProperties: {
                 locale: 'zh-CN'
               },
-              token: await testHelpers.token.fetchDirectLineToken(
-                'https://webchat-mockbot3.azurewebsites.net/api/token/directline'
-              )
+              token: await testHelpers.token.fetchDirectLineToken()
             }),
             store: testHelpers.createStore()
           },
           document.getElementById('webchat')
         );
 
         await pageConditions.uiConnected();
+
+        await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(1);
 
         await host.snapshot();