Merge pull request #29 from Miki-Session/feat/qa-922/groups-warning-banner

Groups version warning banners

Author: burtonemily

.env.sample

@@ -1,6 +1,7 @@
 # this is a sample .env file. Copy it to .env, and edit the .env file to match your needs.
 
 export ANDROID_APK=/home/yougotthis/Downloads/session-android-universal.apk
+export IOS_APP_PATH_PREFIX=/home/yougotthis/Downloads/Session.app
 export SDK_MANAGER_FULL_PATH=/home/yougotthis/Android/Sdk/cmdline-tools/latest/bin/sdkmanager
 export AVD_MANAGER_FULL_PATH=/home/yougotthis/Android/Sdk/cmdline-tools/latest/bin/avdmanager
 export EMULATOR_FULL_PATH=/home/yougotthis/Android/Sdk/emulator/emulator
@@ -14,3 +15,7 @@ export IOS_FIFTH_SIMULATOR=just_not_empty
 export IOS_SIXTH_SIMULATOR=just_not_empty
 export IOS_SEVENTH_SIMULATOR=just_not_empty
 export IOS_EIGHTH_SIMULATOR=just_not_empty
+export IOS_NINTH_SIMULATOR=just_not_empty
+export IOS_TENTH_SIMULATOR=just_not_empty
+export IOS_ELEVENTH_SIMULATOR=just_not_empty
+export IOS_TWELFTH_SIMULATOR=just_not_empty

run/test/specs/group_tests_create_group_banner.spec.ts

@@ -0,0 +1,29 @@
+import { bothPlatformsIt } from '../../types/sessionIt';
+import { USERNAME } from '../../types/testing';
+import { PlusButton } from './locators/home';
+import { CreateGroupOption } from './locators/start_conversation';
+import { newUser } from './utils/create_account';
+import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app';
+import { newContact } from './utils/create_contact';
+import { LatestReleaseBanner } from './locators/groups';
+
+bothPlatformsIt('Create group banner', 'high', createGroupBanner);
+
+async function createGroupBanner(platform: SupportedPlatformsType) {
+  const { device1, device2 } = await openAppTwoDevices(platform);
+  // Create users A and B
+  const [userA, userB] = await Promise.all([
+    newUser(device1, USERNAME.ALICE),
+    newUser(device2, USERNAME.BOB),
+  ]);
+  await newContact(platform, device1, userA, device2, userB);
+  await device1.navigateBack();
+  // Open the Create Group screen from home
+  await device1.clickOnElementAll(new PlusButton(device1));
+  await device1.clickOnElementAll(new CreateGroupOption(device1));
+  const groupsBanner = await device1.doesElementExist(new LatestReleaseBanner(device1));
+  if (!groupsBanner) {
+    throw new Error('v2 groups warning banner is not shown or text is incorrect');
+  }
+  await closeApp(device1, device2);
+}

run/test/specs/group_tests_edit_group_banner.spec.ts

@@ -0,0 +1,31 @@
+import { bothPlatformsIt } from '../../types/sessionIt';
+import { USERNAME } from '../../types/testing';
+import { newUser } from './utils/create_account';
+import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app';
+import { createGroup } from './utils/create_group';
+import { ConversationSettings } from './locators/conversation';
+import { EditGroup } from './locators';
+import { LatestReleaseBanner } from './locators/groups';
+
+bothPlatformsIt('Edit group banner', 'medium', editGroupBanner);
+
+async function editGroupBanner(platform: SupportedPlatformsType) {
+  const { device1, device2, device3 } = await openAppThreeDevices(platform);
+  // Create users A, B and C
+  const [userA, userB, userC] = await Promise.all([
+    newUser(device1, USERNAME.ALICE),
+    newUser(device2, USERNAME.BOB),
+    newUser(device3, USERNAME.CHARLIE),
+  ]);
+  // Create group
+  const testGroupName = 'Test group';
+  await createGroup(platform, device1, userA, device2, userB, device3, userC, testGroupName);
+  // Navigate to Edit Group screen
+  await device1.clickOnElementAll(new ConversationSettings(device1));
+  await device1.clickOnElementAll(new EditGroup(device1));
+  const groupsBanner = await device1.doesElementExist(new LatestReleaseBanner(device1));
+  if (!groupsBanner) {
+    throw new Error('v2 groups warning banner is not shown or text is incorrect');
+  }
+  await closeApp(device1, device2, device3);
+}

run/test/specs/group_tests_invite_contact_banner.spec.ts

@@ -0,0 +1,32 @@
+import { bothPlatformsIt } from '../../types/sessionIt';
+import { USERNAME } from '../../types/testing';
+import { newUser } from './utils/create_account';
+import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app';
+import { createGroup } from './utils/create_group';
+import { ConversationSettings } from './locators/conversation';
+import { EditGroup, InviteContactsButton } from './locators';
+import { LatestReleaseBanner } from './locators/groups';
+
+bothPlatformsIt('Invite contacts banner', 'medium', inviteContactGroupBanner);
+
+async function inviteContactGroupBanner(platform: SupportedPlatformsType) {
+  const { device1, device2, device3 } = await openAppThreeDevices(platform);
+  // Create users A, B and C
+  const [userA, userB, userC] = await Promise.all([
+    newUser(device1, USERNAME.ALICE),
+    newUser(device2, USERNAME.BOB),
+    newUser(device3, USERNAME.CHARLIE),
+  ]);
+  // Create group
+  const testGroupName = 'Test group';
+  await createGroup(platform, device1, userA, device2, userB, device3, userC, testGroupName);
+  // Navigate to Invite Contacts screen
+  await device1.clickOnElementAll(new ConversationSettings(device1));
+  await device1.clickOnElementAll(new EditGroup(device1));
+  await device1.clickOnElementAll(new InviteContactsButton(device1));
+  const groupsBanner = await device1.doesElementExist(new LatestReleaseBanner(device1));
+  if (!groupsBanner) {
+    throw new Error('v2 groups warning banner is not shown or text is incorrect');
+  }
+  await closeApp(device1, device2, device3);
+}

run/test/specs/locators/groups.ts

@@ -1,5 +1,6 @@
 import { LocatorsInterface } from '.';
 import { StrategyExtractionObj } from '../../../types/testing';
+import { englishStripped } from '../../../localizer/i18n/localizedString';
 
 export class GroupNameInput extends LocatorsInterface {
   public build(): StrategyExtractionObj {
@@ -103,3 +104,23 @@ export class LeaveGroupButton extends LocatorsInterface {
     }
   }
 }
+export class LatestReleaseBanner extends LocatorsInterface {
+  public build() {
+    switch (this.platform) {
+      // On Android, the text of the banner is exposed to Appium
+      // so it's possible to verify that the banner is visible and it has the correct text
+      case 'android':
+        return {
+          strategy: 'id',
+          selector: 'Version warning banner',
+          text: englishStripped('groupInviteVersion').toString(),
+        } as const;
+      case 'ios':
+        // On iOS, the text is currently not exposed to Appium
+        return {
+          strategy: 'accessibility id',
+          selector: 'Version warning banner',
+        } as const;
+    }
+  }
+}

run/types/DeviceWrapper.ts

@@ -658,12 +658,16 @@ export class DeviceWrapper {
   public async doesElementExist(
     args: { text?: string; maxWait?: number } & (StrategyExtractionObj | LocatorsInterface)
   ) {
-    const { text, maxWait } = args;
     const beforeStart = Date.now();
-    const maxWaitMSec = maxWait || 30000;
+    const maxWaitMSec = args.maxWait || 30000;
     const waitPerLoop = 100;
     let element: AppiumNextElementType | null = null;
+
+    // Build the locator if necessary, and extract the expected text.
+    // Use the text from the locator if available; otherwise fallback to args.text.
+    // This ensures that the correct text value is used for matching, preventing false positives in tests.
     const locator = args instanceof LocatorsInterface ? args.build() : args;
+    const text: string | undefined = ('text' in locator ? locator.text : undefined) || args.text;
 
     while (element === null) {
       try {
@@ -674,26 +678,32 @@ export class DeviceWrapper {
           element = await this.findMatchingTextInElementArray(els, text);
           if (element) {
             console.log(
-              `${locator.strategy}: ${locator.selector} with matching text ${text} found`
+              `${locator.strategy}: ${locator.selector} with matching text "${text}" found`
             );
           } else {
             console.log(
-              `Couldn't find ${text} with matching ${locator.strategy}: ${locator.selector}`
+              `Couldn't find "${text}" with matching ${locator.strategy}: ${locator.selector}`
             );
           }
         }
       } catch (e: any) {
-        console.info(`doesElementExist failed with`, `${locator.strategy} ${locator.selector}`);
+        console.info(`doesElementExist failed with ${locator.strategy} ${locator.selector}`);
       }
-      if (!element) {
-        await sleepFor(waitPerLoop);
+      // Break immediately if we found the element
+      if (element) {
+        break;
       }
-      if (beforeStart + maxWaitMSec <= Date.now()) {
-        console.log(locator.selector, " doesn't exist, time expired");
+
+      // Check for timeout before sleeping
+      if (Date.now() >= beforeStart + maxWaitMSec) {
+        console.log(locator.selector, "doesn't exist, time expired");
         break;
       } else {
         console.log(locator.selector, "Doesn't exist but retrying");
       }
+
+      // Sleep before trying again
+      await sleepFor(waitPerLoop);
     }
 
     return element;

run/types/testing.ts

@@ -344,7 +344,8 @@ export type AccessibilityId =
   | '1967-05-06 07:00:00 +0000'
   | '1967-05-05 20:00:00 +0000'
   | '1967-05-05 21:00:00 +0000'
-  | 'Pin';
+  | 'Pin'
+  | 'Version warning banner';
 
 export type Id =
   | 'Modal heading'
@@ -405,7 +406,8 @@ export type Id =
   | 'Hide'
   | 'com.google.android.apps.photos:id/text'
   | 'network.loki.messenger:id/search_cancel'
-  | 'Download media';
+  | 'Download media'
+  | 'Version warning banner';
 
 export type TestRisk = 'high' | 'medium' | 'low' | undefined;