Use lolex

compulim · Apr 26, 2019 · c2f3d53 · c2f3d53
1 parent f05bb8f
commit c2f3d53
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/__tests__/offlineUI.js b/__tests__/offlineUI.js
@@ -1,6 +1,7 @@
 import { By, Condition, Key } from 'selenium-webdriver';
 
 import { imageSnapshotOptions, timeouts } from './constants.json';
+import actionDispatched from './setup/conditions/actionDispatched';
 import minNumActivitiesShown from './setup/conditions/minNumActivitiesShown';
 import staticSpinner from './setup/assets/staticSpinner';
 import uiConnected from './setup/conditions/uiConnected';
@@ -307,18 +308,21 @@ describe('offline UI', async () => {
         };
       },
       pingBotOnLoad: false,
-      setup: () => new Promise(resolve => {
-        const scriptElement = document.createElement('script');
+      setup: () =>
+        Promise.all([
+          window.WebChatTest.loadScript('https://unpkg.com/core-js@2.6.3/client/core.min.js'),
+          window.WebChatTest.loadScript('https://unpkg.com/lolex@4.0.1/lolex.js')
+        ]).then(() => {
+          window.WebChatTest.clock = lolex.install();
+        })
+    });
 
-        scriptElement.onload = resolve;
-        scriptElement.setAttribute('src', 'https://unpkg.com/core-js@2.6.3/client/core.min.js');
+    await driver.wait(actionDispatched('DIRECT_LINE/RECONNECT_PENDING'), timeouts.directLine);
 
-        document.head.appendChild(scriptElement);
-      })
+    await driver.executeScript(() => {
+      window.WebChatTest.clock.tick(17000);
     });
 
-    await driver.sleep(17000);
-
     const base64PNG = await driver.takeScreenshot();
 
     expect(base64PNG).toMatchImageSnapshot(imageSnapshotOptions);

diff --git a/__tests__/setup/conditions/actionDispatched.js b/__tests__/setup/conditions/actionDispatched.js
@@ -0,0 +1,7 @@
+import { Condition } from 'selenium-webdriver';
+
+export default function (type) {
+  return new Condition('Action to dispatch', async driver =>
+    await driver.executeScript(type => ~window.WebChatTest.actions.findIndex(({ type: target }) => target === type), type)
+  );
+}
diff --git a/__tests__/setup/web/index.html b/__tests__/setup/web/index.html
@@ -53,8 +53,6 @@
   <body>
     <div id="webchat" role="main"></div>
     <script>
-      window.WebChatTest = { actions: [] };
-
       function unmarshal({ __evalKeys, ...obj } = {}) {
         __evalKeys && __evalKeys.forEach(key => {
           obj[key] = eval(obj[key])();
@@ -67,7 +65,8 @@
         return new Promise((resolve, reject) => {
           const script = document.createElement('script');
 
-          script.setAttribute('src', '/webchat-instrumented.js');
+          script.setAttribute('async', '');
+          script.setAttribute('src', src);
           script.addEventListener('load', resolve);
           script.addEventListener('error', ({ error }) => reject(error));
 
@@ -142,6 +141,11 @@
 
         document.querySelector('#webchat > *').focus();
       }
+
+      window.WebChatTest = {
+        actions: [],
+        loadScript
+      };
     </script>
   </body>
 </html>