Merge branch 'main' of https://github.com/session-foundation/session-appium

Author: burtonemily

.github/workflows/android-regression.yml

@@ -27,6 +27,7 @@ on:
         options:
           - session-foundation/session-appium
           - burtonemily/session-appium
+          - Miki-Session/session-appium
           - bilb/session-appium
         default: session-foundation/session-appium
 
@@ -69,15 +70,15 @@ on:
         default: '0'
 
       PRINT_FAILED_TEST_LOGS:
-        description: 'print failed test logs (1 to enable)'
+        description: 'print failed test logs (1 to enable) - DONT DO FOR FULL REGRESSION (it crashes github)'
         required: true
         type: choice
         options:
           - '0'
           - '1'
         default: '0'
       PRINT_ONGOING_TEST_LOGS:
-        description: 'print ongoing test logs (1 to enable)'
+        description: 'print ongoing test logs (1 to enable) - DONT DO FOR FULL REGRESSION (it crashes github)'
         required: true
         type: choice
         options:
@@ -90,8 +91,6 @@ on:
         type: choice
         options:
           - '1'
-          - '2'
-          - '3'
         default: '1'
 
 # concurrency:
@@ -109,7 +108,6 @@ jobs:
       PLAYWRIGHT_RETRIES_COUNT: ${{ github.event.inputs.PLAYWRIGHT_RETRIES_COUNT }}
       PRINT_FAILED_TEST_LOGS: ${{ github.event.inputs.PRINT_FAILED_TEST_LOGS }}
       PRINT_ONGOING_TEST_LOGS: ${{ github.event.inputs.PRINT_ONGOING_TEST_LOGS }}
-      PLAYWRIGHT_WORKERS_COUNT: 1
       IOS_FIRST_SIMULATOR: '49651A15-3E14-4BAF-8B8E-0C630C35B8DD'
       IOS_SECOND_SIMULATOR: '7CA21E47-56AC-4B76-82A4-1D5199515F38'
       IOS_THIRD_SIMULATOR: 'FE1DEDC7-D530-41E7-9B38-86ED2DDB97CD'

.github/workflows/ios-regression.yml

@@ -108,7 +108,7 @@ jobs:
       PRINT_FAILED_TEST_LOGS: ${{ github.event.inputs.PRINT_FAILED_TEST_LOGS }}
       PRINT_ONGOING_TEST_LOGS: ${{ github.event.inputs.PRINT_ONGOING_TEST_LOGS }}
       PLAYWRIGHT_WORKERS_COUNT: 3
-      PLAYWRIGHT_REPEAT_COUNT: 1
+      PLAYWRIGHT_REPEAT_COUNT: 0
       SDK_MANAGER_FULL_PATH: '/Users/emilyburton/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager'
       AVD_MANAGER_FULL_PATH: '/Users/emilyburton/Library/Android/sdk/cmdline-tools/latest/bin/avdmanager'
       ANDROID_SYSTEM_IMAGE: 'system-images;android-35;google_atd;x86_64'

eslint.config.mjs

@@ -32,6 +32,7 @@ export default tseslint.config(
       '@typescript-eslint/no-unsafe-assignment': 'off',
       '@typescript-eslint/no-redundant-type-constituents': 'off',
       '@typescript-eslint/no-unsafe-enum-comparison': 'off',
+      quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }],
       '@typescript-eslint/no-unused-vars': [
         'error',
         {

playwright.config.ts

@@ -15,7 +15,7 @@ require('source-map-support').install = () => {};
 
 export default defineConfig({
   timeout: 480000,
-  // globalTimeout: 12800000, // extends timeout to run full suite with 3 retries
+  globalTimeout: 18000000, // extends timeout to 5 hours run full suite with 3 retries
   reporter: [useSessionReporter ? ['./sessionReporter.ts'] : ['list']],
   testDir: './run/test/specs',
   testIgnore: '*.js',

run/test/specs/community_tests_image.spec.ts

@@ -6,13 +6,16 @@ import { newContact } from './utils/create_contact';
 import { joinCommunity } from './utils/join_community';
 import { SupportedPlatformsType, closeApp, openAppTwoDevices } from './utils/open_app';
 
-iosIt('Send image to community', 'medium', sendImageCommunityiOS);
-androidIt('Send image to community', 'medium', sendImageCommunityAndroid);
+iosIt('Send image to community', 'medium', sendImageCommunityiOS, true);
+androidIt('Send image to community', 'medium', sendImageCommunityAndroid, true);
+
+// Tests skipped due to both platforms having unique issues, have made a ticket
+// to investigate further https://optf.atlassian.net/browse/QA-486
 
 async function sendImageCommunityiOS(platform: SupportedPlatformsType) {
   const { device1, device2 } = await openAppTwoDevices(platform);
   const testMessage = 'Testing sending images to communities';
-  const testImageMessage = `Image message + ${new Date().getTime()}`;
+  const testImageMessage = `Image message + ${new Date().getTime()} - ${platform}`;
   // Create user A and user B
   const [Alice, Bob] = await Promise.all([
     newUser(device1, USERNAME.ALICE),
@@ -22,7 +25,7 @@ async function sendImageCommunityiOS(platform: SupportedPlatformsType) {
   await Promise.all([device1.navigateBack(), device2.navigateBack()]);
   await joinCommunity(device1, testCommunityLink, testCommunityName);
   await joinCommunity(device2, testCommunityLink, testCommunityName);
-  await Promise.all([device1.scrollToBottom(platform), device2.scrollToBottom(platform)]);
+  await Promise.all([device1.scrollToBottom(), device2.scrollToBottom()]);
   await device1.sendMessage(testMessage);
   await device1.sendImage(platform, testImageMessage, true);
   await device2.replyToMessage(Alice, testImageMessage);
@@ -32,7 +35,7 @@ async function sendImageCommunityiOS(platform: SupportedPlatformsType) {
 async function sendImageCommunityAndroid(platform: SupportedPlatformsType) {
   const { device1, device2 } = await openAppTwoDevices(platform);
   const time = await device1.getTimeFromDevice(platform);
-  const testMessage = `Testing sending images to communities + ${time}`;
+  const testMessage = `Testing sending images to communities + ${time} - ${platform}`;
   // Create user A and user B
   const [Alice] = await Promise.all([
     newUser(device1, USERNAME.ALICE),
@@ -44,11 +47,10 @@ async function sendImageCommunityAndroid(platform: SupportedPlatformsType) {
     joinCommunity(device2, testCommunityLink, testCommunityName),
   ]);
   await device1.sendImageWithMessageAndroid(testMessage);
-  await device2.scrollToBottom(platform);
+  await device2.scrollToBottom();
   await device2.longPressMessage(testMessage);
   await device2.clickOnByAccessibilityID('Reply to message');
   await device2.sendMessage(replyMessage);
-  await device1.onIOS().scrollToBottom(platform);
   await device1.waitForTextElementToBePresent({
     strategy: 'accessibility id',
     selector: 'Message body',

run/test/specs/community_tests_join.spec.ts

@@ -13,7 +13,7 @@ async function joinCommunityTest(platform: SupportedPlatformsType) {
   // Create user A and user B
   await linkedDevice(device1, device2, USERNAME.ALICE);
   await joinCommunity(device1, testCommunityLink, testCommunityName);
-  await device1.onIOS().scrollToBottom(platform);
+  await device1.onIOS().scrollToBottom();
   await device1.sendMessage(testMessage);
   // Has community synced to device 2?
   await device2.waitForTextElementToBePresent({

run/test/specs/disappear_after_read.spec.ts

@@ -40,11 +40,13 @@ async function disappearAfterRead(platform: SupportedPlatformsType) {
       strategy: 'accessibility id',
       selector: 'Message body',
       text: testMessage,
+      maxWait: 5000,
     }),
     device2.hasElementBeenDeleted({
       strategy: 'accessibility id',
       selector: 'Message body',
       text: testMessage,
+      maxWait: 5000,
     }),
   ]);
   // Great success

run/test/specs/disappear_after_send.spec.ts

@@ -58,11 +58,13 @@ async function disappearAfterSend(platform: SupportedPlatformsType) {
       strategy: 'accessibility id',
       selector: 'Message body',
       text: testMessage,
+      maxWait: 5000,
     }),
     device2.hasElementBeenDeleted({
       strategy: 'accessibility id',
       selector: 'Message body',
       text: testMessage,
+      maxWait: 5000,
     }),
   ]);
 

run/test/specs/disappear_after_send_note_to_self.spec.ts

@@ -1,5 +1,6 @@
 import { bothPlatformsIt } from '../../types/sessionIt';
 import { DisappearActions, DISAPPEARING_TIMES, USERNAME } from '../../types/testing';
+import { EnterAccountID } from './locators/start_conversation';
 import { sleepFor } from './utils';
 import { newUser } from './utils/create_account';
 import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app';
@@ -16,10 +17,7 @@ async function disappearAfterSendNoteToSelf(platform: SupportedPlatformsType) {
   // Send message to self to bring up Note to Self conversation
   await device.clickOnByAccessibilityID('New conversation button');
   await device.clickOnByAccessibilityID('New direct message');
-  await device.inputText(userA.accountID, {
-    strategy: 'accessibility id',
-    selector: 'Session id input box',
-  });
+  await device.inputText(userA.accountID, new EnterAccountID(device));
   await device.scrollDown();
   await device.clickOnByAccessibilityID('Next');
   await device.inputText('Creating note to self', {

run/test/specs/disappear_after_send_off_1o1.spec.ts

@@ -6,6 +6,7 @@ import {
   DisappearModes,
   USERNAME,
 } from '../../types/testing';
+import { ConversationSettings } from './locators/conversation';
 import {
   DisableDisappearingMessages,
   DisappearingMessagesMenuOption,
@@ -21,7 +22,7 @@ import { linkedDevice } from './utils/link_device';
 import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app';
 import { setDisappearingMessage } from './utils/set_disappearing_messages';
 
-bothPlatformsIt('Disappear after send off 1o1', 'high', disappearAfterSendOff1o1);
+bothPlatformsIt('Disappear after send off 1:1', 'high', disappearAfterSendOff1o1);
 
 async function disappearAfterSendOff1o1(platform: SupportedPlatformsType) {
   const { device1, device2, device3 } = await openAppThreeDevices(platform);
@@ -51,8 +52,8 @@ async function disappearAfterSendOff1o1(platform: SupportedPlatformsType) {
     device3
   );
 
-  // Turned off disappearing messages on device 1
-  await device1.clickOnElementAll({ strategy: 'accessibility id', selector: 'More options' });
+  // Turn off disappearing messages on device 1
+  await device1.clickOnElementAll(new ConversationSettings(device1));
   await device1.clickOnElementAll(new DisappearingMessagesMenuOption(device1));
   await device1.clickOnElementAll(new DisableDisappearingMessages(device1));
   await device1.clickOnElementAll(new SetDisappearMessagesButton(device1));
@@ -69,7 +70,7 @@ async function disappearAfterSendOff1o1(platform: SupportedPlatformsType) {
   await Promise.all([
     device1.disappearingControlMessage(disappearingMessagesTurnedOffYou),
     device2.disappearingControlMessage(disappearingMessagesTurnedOff),
-    // device3.disappearingControlMessage(disappearingMessagesTurnedOffYou),
+    device3.disappearingControlMessage(disappearingMessagesTurnedOffYou),
   ]);
   // Follow setting on device 2
   await device2.clickOnElementAll(new FollowSettingsButton(device2));