Push main to foundation

.gitignore

@@ -3,6 +3,8 @@ test-results/
 /playwright-report/
 /playwright/.cache/
 **/*.js
+/*.js
+*.js
 .vscode/settings.json
 tests/automation/todo
 allure-report

tests/automation/disappearing_messages.spec.ts

@@ -206,7 +206,7 @@ test_Alice_2W(
     await setDisappearingMessages(aliceWindow1, [
       'note-to-self',
       'disappear-after-send-option',
-      'input-10-seconds',
+      'time-option-10-seconds',
     ]);
     // Check control message is visible and correct
     await doesTextIncludeString(

tests/automation/linked_device_requests.spec.ts

@@ -74,8 +74,8 @@ test_Alice_2W_Bob_1W(
     await sleepFor(1000);
     await clickOnTestIdWithText(
       aliceWindow1,
-      'decline-message-request',
-      englishStrippedStr('decline').toString(),
+      'delete-message-request',
+      englishStrippedStr('delete').toString(),
     );
     await clickOnTestIdWithText(
       aliceWindow1,

tests/automation/message_requests.spec.ts

@@ -94,8 +94,8 @@ test_Alice_1W_Bob_1W(
     // Check that using the accept button has intended use
     await clickOnTestIdWithText(
       bobWindow1,
-      'decline-message-request',
-      englishStrippedStr('decline').toString(),
+      'delete-message-request',
+      englishStrippedStr('delete').toString(),
     );
     // Confirm decline
     await clickOnTestIdWithText(

tests/automation/setup/open.ts

@@ -55,6 +55,7 @@ const openElectronAppOnly = async (multi: string) => {
   const uniqueId = v4();
   process.env.NODE_APP_INSTANCE = `${MULTI_PREFIX}-devprod-${uniqueId}-${process.env.MULTI}`;
   process.env.NODE_ENV = NODE_ENV;
+  process.env.SESSION_DEBUG = '1';
 
   if (!isEmpty(process.env.CI)) {
     const sessionBinPath = getSessionDesktopBinPath();

tests/automation/types/testing.ts

@@ -16,16 +16,19 @@ export type Group = {
 export type ConversationType = '1:1' | 'group' | 'community' | 'note-to-self';
 
 export type DMTimeOption =
-  | 'input-10-seconds'
+  | 'time-option-0-seconds'
+  | 'time-option-5-seconds'
   | 'time-option-10-seconds'
   | 'time-option-30-seconds'
-  | 'time-option-1-minute'
+  | 'time-option-60-seconds'
   | 'time-option-5-minutes'
-  | 'time-option-1-hour'
+  | 'time-option-30-minutes'
+  | 'time-option-1-hours'
+  | 'time-option-6-hours'
   | 'time-option-12-hours'
-  | 'time-option-1-day'
-  | 'time-option-1-week'
-  | 'time-option-2-weeks';
+  | 'time-option-1-days'
+  | 'time-option-7-days'
+  | 'time-option-14-days';
 
 type DisappearOpts1o1 = [
   '1:1',
@@ -84,7 +87,7 @@ export type DataTestId =
   | 'label-device_and_network'
   | 'message-request-banner'
   | 'module-conversation__user__profile-name'
-  | 'decline-message-request'
+  | 'delete-message-request'
   | 'session-confirm-ok-button'
   | 'dropdownitem-5-seconds'
   | 'disappearing-messages-dropdown'
@@ -139,26 +142,17 @@ export type DataTestId =
   | 'disappear-after-read-option'
   | 'disappearing-messages'
   | 'disappear-after-send-option'
-  | 'time-option-1-minute'
-  | 'time-option-10-seconds'
   | 'disappear-set-button'
   | 'add-user-button'
   | 'message-content'
   | 'group-update-message'
   | 'message-request-response-message'
   | 'image-upload-click'
-  | 'input-10-seconds'
-  | 'time-option-30-seconds'
-  | 'time-option-1-minute'
-  | 'time-option-5-minutes'
-  | 'time-option-1-hour'
-  | 'time-option-12-hours'
-  | 'time-option-1-day'
-  | 'time-option-1-week'
-  | 'time-option-2-weeks'
   | 'leave-group-button'
   | 'create-account-button'
   | 'continue-button'
   | 'existing-account-button'
   | 'context-menu-item'
-  | 'block-unblock-modal-description';
+  | 'block-unblock-modal-description'
+  | DMTimeOption
+  | `input-${DMTimeOption}`;

tests/automation/utilities/reply_message.ts

@@ -34,12 +34,17 @@ export const replyTo = async ({
   for (let index = 0; index < 5; index++) {
     try {
       await clickOnTextMessage(senderWindow, textMessage, true, 1000);
+      // those 2 sleepfor are to try to avoid the layout shift which happens when we click too fast in the context menu
+      await sleepFor(200, true);
+
       await clickOnMatchingText(
         senderWindow,
         englishStrippedStr('reply').toString(),
         false,
         1000,
       );
+      await sleepFor(200, true);
+
       break;
     } catch (e) {
       console.info(

tests/automation/utilities/set_disappearing_messages.ts

@@ -1,5 +1,9 @@
 import { Page } from '@playwright/test';
-import { ConversationType, DisappearOptions } from '../types/testing';
+import {
+  ConversationType,
+  DataTestId,
+  DisappearOptions,
+} from '../types/testing';
 import {
   clickOnElement,
   clickOnMatchingText,
@@ -50,13 +54,21 @@ export const setDisappearingMessages = async (
     // Check that 1 Day default is automatically selected (default time is only relevant to 1:1's)
     let defaultTime;
     if (timerType === 'disappear-after-read-option') {
+      // making explicit DataTestId here as `waitForElement` currently allows a string
+      // TODO: add explicit typing to waitForElement
+      const dataTestId: DataTestId = 'input-time-option-12-hours';
+      defaultTime = await waitForElement(windowA, 'data-testid', dataTestId);
+    } else {
+      // making explicit DataTestId here as `waitForElement` currently allows a string
+      // TODO: add explicit typing to waitForElement
+      const dataTestId: DataTestId = 'input-time-option-1-days';
+
       defaultTime = await waitForElement(
         windowA,
         'data-testid',
-        'input-12-hours',
+        dataTestId,
+        1000,
       );
-    } else {
-      defaultTime = await waitForElement(windowA, 'data-testid', 'input-1-day');
     }
     const checked = await defaultTime.isChecked();
     if (checked) {

tests/automation/utilities/utils.ts

@@ -53,7 +53,21 @@ export async function waitForElement(
     ? `css=[${strategy}=${selector}]`
     : `css=[${strategy}=${selector}]:has-text("${text.replace(/"/g, '\\"')}")`;
 
-  return window.waitForSelector(builtSelector, { timeout: maxWaitMs });
+  const start = Date.now();
+  if (!selector.includes('path-light-container')) {
+    console.log(`waitForElement: ${builtSelector} for maxMs ${maxWaitMs}`);
+  }
+
+  const el = await window.waitForSelector(builtSelector, {
+    timeout: maxWaitMs,
+  });
+  if (!selector.includes('path-light-container')) {
+    console.log(
+      `waitForElement: got ${builtSelector} after ${Date.now() - start}ms`,
+    );
+  }
+
+  return el;
 }
 
 export async function waitForTextMessage(
@@ -72,7 +86,7 @@ export async function waitForTextMessage(
     console.info('builtSelector:', builtSelector);
   }
   const el = await window.waitForSelector(builtSelector, { timeout: maxWait });
-  console.info(`Text message found. Text: , ${text}`);
+  console.info(`Text message found. Text: "${text}"`);
   return el;
 }
 
@@ -118,6 +132,9 @@ export async function waitForMatchingPlaceholder(
 
         found = true;
       }
+      if (!found) {
+        await sleepFor(100, true);
+      }
     } catch (e) {
       await sleepFor(1000, true);
       console.info(

tests/locale/shared.ts

@@ -6,7 +6,6 @@ let initialLocale: Locale | undefined;
 
 let translationDictionary: LocalizerDictionary | undefined;
 
-
 /**
  * Returns the current dictionary to use for translations.
  */