Post-review updates

Author: rwood-moz

test/e2e/pages/settings-page.ts

@@ -9,7 +9,6 @@ import {
   TIMEOUT_30_SECONDS,
   APPT_LANGUAGE_SETTING_EN,
   } from '../const/constants';
-import test from 'node:test';
 
 
 export class SettingsPage {
@@ -205,7 +204,7 @@ export class SettingsPage {
    * Change the start of week setting
    */
   async changeStartOfWeekSetting(startOfWeek: string) {
-    await this.startOfWeekMondayBtn
+    await this.scrollIntoView(this.startOfWeekMondayBtn);
     await this.page.waitForTimeout(TIMEOUT_1_SECOND);
     if (startOfWeek == 'M') {
       await this.startOfWeekMondayBtn.click({ timeout: TIMEOUT_30_SECONDS });

test/e2e/tests/mobile/settings-account.spec.ts

@@ -98,8 +98,11 @@ test.describe('account settings on mobile browser', {
     await expect(availabilityPage.setAvailabilityText).toBeVisible();
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/tests/mobile/settings-connected-apps.spec.ts

@@ -71,8 +71,11 @@ test.describe('settings - connected applications on mobile browser', {
     await settingsPage.gotoConnectedAppSettings();
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/tests/mobile/settings-language.spec.ts

@@ -60,8 +60,11 @@ test.describe('settings - language on mobile browser', {
     expect(localStore['language']).toBe(APPT_BROWSER_STORE_LANGUAGE_EN);
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/tests/mobile/settings-start-of-week.spec.ts

@@ -58,8 +58,11 @@ test.describe('settings - start of week on mobile browser', {
     expect(localStore['startOfWeek']).toBe(APPT_BROWSER_STORE_START_WEEK_SUN);
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/tests/mobile/settings-theme.spec.ts

@@ -60,8 +60,11 @@ test.describe('settings - theme on mobile browser', {
     expect(localStore['colourScheme']).toBe(APPT_BROWSER_STORE_THEME_LIGHT);
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/tests/mobile/settings-timezone.spec.ts

@@ -56,8 +56,11 @@ test.describe('settings - timezone on mobile browser', {
     expect(localStore['timezone']).toBe(APPT_TIMEZONE_SETTING_PRIMARY);
   });
 
-  test.afterAll(async ({ browser }) => {
-    // close the browser when we're done, BrowserStack needs this or may report BROWSERSTACK_IDLE_TIMEOUT
-    await browser.close();
+  test.afterAll(async ({ browser }, testInfo) => {
+    // close the browser when we're done (good practice for BrowserStack); only do this for BrowserStack,
+    // because if we do this when running on a local playwright mobile viewport the tests will fail
+    if (!testInfo.project.name.includes('View')) {
+      await browser.close();
+    }
   });
 });

test/e2e/utils/utils.ts

@@ -19,7 +19,6 @@ import {
   TIMEOUT_5_SECONDS,
   TIMEOUT_60_SECONDS,
 } from "../const/constants";
-import { createDecipheriv } from "crypto";
 
 const authFile = path.join(__dirname, '../test-results/.auth/user.json');