Merge branch 'nathan/create-load-during-upgrades-and-downgrades' into…

… 'master' test(service-worker): create load on the service worker during upgrade and downgrade e2e tests re #TT-233 See merge request dfinity-lab/public/ic!14314
dfinity · Sep 14, 2023 · 0ebf3ed · 0ebf3ed
2 parents 330df35 + a350637
commit 0ebf3ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/typescript/service-worker/e2e/specs/asset-loading.spec.ts b/typescript/service-worker/e2e/specs/asset-loading.spec.ts
@@ -5,6 +5,7 @@ import {
   runInBrowser,
   waitForServiceWorkerUpgrade,
   env,
+  loadSampleAssetUnderLoad,
 } from '../utils';
 
 const { baseUrl, swPath, currentSwPath, latestSwPath, previousSwPath } = env;
@@ -23,31 +24,43 @@ it('should load sample asset', async () => {
 
     console.log('\n\nDeploying latest service worker...');
     await deployServiceWorker(latestSwPath, swPath);
-    await waitForServiceWorkerUpgrade(browser);
+    await Promise.all([
+      await waitForServiceWorkerUpgrade(browser),
+      await loadSampleAssetUnderLoad(browser),
+    ]);
 
     console.log('Running tests...');
     contentElem = await loadSampleAsset(browser);
     await expectSampleAssetLoaded(contentElem);
 
     console.log('\n\nDeploying current service worker...');
     await deployServiceWorker(currentSwPath, swPath);
-    await waitForServiceWorkerUpgrade(browser);
+    await Promise.all([
+      await waitForServiceWorkerUpgrade(browser),
+      await loadSampleAssetUnderLoad(browser),
+    ]);
 
     console.log('Running tests...');
     contentElem = await loadSampleAsset(browser);
     await expectSampleAssetLoaded(contentElem);
 
     console.log('\n\nDeploying previous service worker...');
     await deployServiceWorker(previousSwPath, swPath);
-    await waitForServiceWorkerUpgrade(browser);
+    await Promise.all([
+      await waitForServiceWorkerUpgrade(browser),
+      await loadSampleAssetUnderLoad(browser),
+    ]);
 
     console.log('Running tests...');
     contentElem = await loadSampleAsset(browser);
     await expectSampleAssetLoaded(contentElem);
 
     console.log('\n\nDeploying current service worker...');
     await deployServiceWorker(currentSwPath, swPath);
-    await waitForServiceWorkerUpgrade(browser);
+    await Promise.all([
+      await waitForServiceWorkerUpgrade(browser),
+      await loadSampleAssetUnderLoad(browser),
+    ]);
 
     console.log('Running tests...');
     contentElem = await loadSampleAsset(browser);

diff --git a/typescript/service-worker/e2e/utils/common.ts b/typescript/service-worker/e2e/utils/common.ts
@@ -7,6 +7,18 @@ export async function waitForServiceWorkerUpgrade(
   await setTimeout(3000);
 }
 
+export async function loadSampleAssetUnderLoad(
+  browser: WebdriverIO.Browser
+): Promise<void> {
+  await Promise.all(
+    new Array(100).fill(async () => {
+      const contentElem = await loadSampleAsset(browser);
+
+      await expectSampleAssetLoaded(contentElem);
+    })
+  );
+}
+
 export async function loadSampleAsset(
   browser: WebdriverIO.Browser
 ): Promise<WebdriverIO.Element> {