updating tests for UCS

.github/workflows/android-regression.yml

@@ -141,11 +141,12 @@ jobs:
           adb kill-server;
           adb start-server;
 
-      - name: Start emulators
+      - name: Start emulators from snapshot
         shell: bash
         run: |
           source ./scripts/ci.sh
           start_with_snapshots
+          wait_for_emulators
 
       - name: List tests part of this run
         uses: ./github/actions/list-tests

.gitignore

@@ -33,4 +33,4 @@ avd/*
 .eslintcache
 test-results.csv
 *.csv
-/allure
+/allure*

eslint.config.mjs

@@ -14,6 +14,7 @@ export default tseslint.config(
       'run/**/*.js',
       'scripts/*.js',
       'avd/',
+      'allure*/',
     ],
   },
   eslint.configs.recommended,

github/actions/generate-publish-test-report/action.yml

@@ -28,6 +28,9 @@ runs:
         BUILD_NUMBER: ${{ inputs.BUILD_NUMBER }}
         GH_TOKEN: ${{ inputs.GH_TOKEN }}
         APK_URL: ${{inputs.APK_URL}}
+        RISK: ${{inputs.RISK}}
+        GITHUB_RUN_NUMBER: ${{ inputs.GITHUB_RUN_NUMBER}}
+        GITHUB_RUN_ATTEMPT: ${{ inputs.GITHUB_RUN_ATTEMPT}}
 
     - name: Publish report to GitHub Pages
       if: ${{ success() }}

patches/appium-uiautomator2-driver-npm-3.8.2-1ce2a0f39e.patch

@@ -1,13 +1,13 @@
 diff --git a/build/lib/driver.js b/build/lib/driver.js
-index 4287b4fc525093dee083bd37869947902bcc0398..3c8c6ab0b8c08ab6519268465e3c5bfd06068f86 100644
+index 4287b4fc525093dee083bd37869947902bcc0398..8635fd3d871c55d7e54e22246f9b4b90fbd5686a 100644
 --- a/build/lib/driver.js
 +++ b/build/lib/driver.js
 @@ -60,7 +60,7 @@ const screenshot_1 = require("./commands/screenshot");
  const viewport_1 = require("./commands/viewport");
  // The range of ports we can use on the system for communicating to the
  // UiAutomator2 HTTP server on the device
 -const DEVICE_PORT_RANGE = [8200, 8299];
-+const DEVICE_PORT_RANGE = [8200, 8399];
++const DEVICE_PORT_RANGE = [8200, 8999];
  // The guard is needed to avoid dynamic system port allocation conflicts for
  // parallel driver sessions
  const DEVICE_PORT_ALLOCATION_GUARD = support_1.util.getLockFileGuard(node_path_1.default.resolve(node_os_1.default.tmpdir(), 'uia2_device_port_guard'), { timeout: 25, tryRecovery: true });

run/constants/allure.ts

@@ -3,3 +3,4 @@ import path from 'path';
 export const allureResultsDir = path.join('allure', 'allure-results');
 export const allureCurrentReportDir = path.join('allure', 'allure-report');
 export const allureReportsDir = path.join('allure', 'reports');
+export const GH_PAGES_BASE_URL = 'https://session-foundation.github.io/session-appium/';

run/localizer/constants.ts

@@ -8,7 +8,6 @@ export enum LOCALE_DEFAULTS {
   staking_reward_pool = 'Staking Reward Pool',
   token_name_short = 'SESH',
   usd_name_short = 'USD',
-  session_network_data_price = 'Price data powered by CoinGecko<br/>Accurate at {date_time}',
   app_pro = 'Session Pro',
 }
 

run/localizer/locales.ts

@@ -1843,7 +1843,7 @@ export const simpleDictionary = {
     args: undefined,
   },
   groupNameEnterShorter: {
-    en: 'Please enter a shorter group name.',
+    en: 'Please enter a shorter group name',
     args: undefined,
   },
   groupNameNew: {
@@ -2222,6 +2222,10 @@ export const simpleDictionary = {
     en: 'Message',
     args: undefined,
   },
+  messageBubbleReadMore: {
+    en: 'Read more',
+    args: undefined,
+  },
   messageEmpty: {
     en: 'This message is empty.',
     args: undefined,
@@ -2386,12 +2390,24 @@ export const simpleDictionary = {
     en: 'Minimize',
     args: undefined,
   },
+  modalMessageCharacterDisplayTitle: {
+    en: 'Message Length',
+    args: undefined,
+  },
+  modalMessageCharacterTooLongDescription: {
+    en: 'You have exceeded the character limit for this message. Please shorten your message to {limit} characters or less.',
+    args: { limit: 'string' },
+  },
+  modalMessageCharacterTooLongTitle: {
+    en: 'Message Too Long',
+    args: undefined,
+  },
   modalMessageTooLongDescription: {
-    en: 'Please shorten your message to {count} characters or less.',
-    args: { count: 'number' },
+    en: 'Please shorten your message to {limit} characters or less.',
+    args: { limit: 'string' },
   },
   modalMessageTooLongTitle: {
-    en: 'Your message is too long',
+    en: 'Message Too Long',
     args: undefined,
   },
   next: {
@@ -3115,11 +3131,7 @@ export const simpleDictionary = {
     args: undefined,
   },
   remainingCharactersOverTooltip: {
-    en: 'Message is too long',
-    args: undefined,
-  },
-  remainingCharactersTooltip: {
-    en: '{count} characters remaining',
+    en: 'Reduce message length by {count}',
     args: { count: 'number' },
   },
   remove: {
@@ -3570,6 +3582,10 @@ export const simpleDictionary = {
     en: 'You',
     args: undefined,
   },
+  sessionNetworkDataPrice: {
+    en: 'Price data powered by CoinGecko<br/>Accurate at {date_time}',
+    args: { date_time: 'string' },
+  },
 } as const;
 
 export const pluralsDictionary = {
@@ -3720,6 +3736,14 @@ export const pluralsDictionary = {
     },
     args: { group_name: 'string', count: 'number' },
   },
+  modalMessageCharacterDisplayDescription: {
+    en: {
+      one: 'Messages have a character limit of {limit} characters. You have {count} character remaining',
+      other:
+        'Messages have a character limit of {limit} characters. You have {count} characters remaining',
+    },
+    args: { limit: 'string', count: 'number' },
+  },
   promotionFailed: {
     en: {
       one: 'Promotion Failed',
@@ -3734,6 +3758,13 @@ export const pluralsDictionary = {
     },
     args: { count: 'number' },
   },
+  remainingCharactersTooltip: {
+    en: {
+      one: '{count} character remaining',
+      other: '{count} characters remaining',
+    },
+    args: { count: 'number' },
+  },
   searchMatches: {
     en: {
       one: '{found_count} of {count} match',

run/test/specs/app_disguise_icons.spec.ts

@@ -6,6 +6,7 @@ import { AppearanceMenuItem, SelectAppIcon, UserSettings } from './locators/sett
 import { verifyElementScreenshot } from './utils/verify_screenshots';
 import { AppDisguisePageScreenshot } from './utils/screenshot_paths';
 import { sleepFor } from './utils';
+import type { TestInfo } from '@playwright/test';
 
 bothPlatformsIt({
   title: 'App disguise icons',
@@ -14,7 +15,7 @@ bothPlatformsIt({
   testCb: appDisguiseIcons,
 });
 
-async function appDisguiseIcons(platform: SupportedPlatformsType) {
+async function appDisguiseIcons(platform: SupportedPlatformsType, testInfo: TestInfo) {
   const { device } = await openAppOnPlatformSingleDevice(platform);
   await newUser(device, USERNAME.ALICE);
   await device.clickOnElementAll(new UserSettings(device));
@@ -25,6 +26,6 @@ async function appDisguiseIcons(platform: SupportedPlatformsType) {
   // Must scroll down to reveal the app disguise option
   await device.scrollDown();
   await device.clickOnElementAll(new SelectAppIcon(device));
-  await verifyElementScreenshot(device, new AppDisguisePageScreenshot(device));
+  await verifyElementScreenshot(device, new AppDisguisePageScreenshot(device), testInfo);
   await closeApp(device);
 }

run/test/specs/app_disguise_set.spec.ts

@@ -43,7 +43,7 @@ async function appDisguiseSetIcon(platform: SupportedPlatformsType) {
     );
     await device.clickOnElementAll(new CloseAppButton(device));
     await sleepFor(2000);
-    // // Open app library and check for disguised app
+    // Open app library and check for disguised app
     await device.swipeFromBottom();
     await device.waitForTextElementToBePresent(new DisguisedApp(device));
   } finally {

run/test/specs/check_avatar_color.spec.ts

@@ -1,16 +1,23 @@
-import { bothPlatformsIt } from '../../types/sessionIt';
+import { bothPlatformsItSeparate } from '../../types/sessionIt';
 import { SupportedPlatformsType, closeApp } from './utils/open_app';
 import { isSameColor } from './utils/check_colour';
 import { UserSettings } from './locators/settings';
-import { ConversationAvatar, ConversationSettings } from './locators/conversation';
+import { ConversationSettings } from './locators/conversation';
 import { open_Alice1_Bob1_friends } from './state_builder';
 import { ConversationItem } from './locators/home';
 
-bothPlatformsIt({
+bothPlatformsItSeparate({
   title: 'Avatar color',
   risk: 'medium',
-  testCb: avatarColor,
   countOfDevicesNeeded: 2,
+  ios: {
+    testCb: avatarColor,
+    shouldSkip: false,
+  },
+  android: {
+    testCb: avatarColor,
+    shouldSkip: true, // something is going on on Android, test is picking up wildly different pixel colors
+  },
 });
 
 async function avatarColor(platform: SupportedPlatformsType) {
@@ -22,20 +29,15 @@ async function avatarColor(platform: SupportedPlatformsType) {
     focusFriendsConvo: false,
   });
 
-  // Get Alice's avatar color on device 1 (Home Screen avatar) and turn it into a hex value
+  // Get Alice's avatar color on device 1 (Settings screen avatar) and turn it into a hex value
+  await alice1.clickOnElementAll(new UserSettings(alice1));
   const alice1PixelColor = await alice1.getElementPixelColor(new UserSettings(alice1));
+  console.log(alice1PixelColor);
   // Get Alice's avatar color on device 2 and turn it into a hex value
-  let bob1PixelColor;
   // Open the conversation with Alice on Bob's device
   await bob1.clickOnElementAll(new ConversationItem(bob1, alice.userName));
-  // The conversation screen looks slightly different per platform so we're grabbing the avatar from different locators
-  // On iOS the avatar doubles as the Conversation Settings button on the right
-  // On Android, the avatar is a separate, non-interactable element on the left (and the settings has the 3-dot icon)
-  if (platform === 'ios') {
-    bob1PixelColor = await bob1.getElementPixelColor(new ConversationSettings(bob1));
-  } else {
-    bob1PixelColor = await bob1.getElementPixelColor(new ConversationAvatar(bob1));
-  }
+  const bob1PixelColor = await bob1.getElementPixelColor(new ConversationSettings(bob1));
+  console.log(bob1PixelColor);
   // Color matching devices 1 and 2
   const colorMatch = isSameColor(alice1PixelColor, bob1PixelColor);
   if (!colorMatch) {

run/test/specs/community_tests_join.spec.ts

@@ -1,6 +1,8 @@
 import { testCommunityLink, testCommunityName } from '../../constants/community';
 import { bothPlatformsIt } from '../../types/sessionIt';
+import { ConversationItem } from './locators/home';
 import { open_Alice2 } from './state_builder';
+import { sleepFor } from './utils';
 import { joinCommunity } from './utils/join_community';
 import { SupportedPlatformsType, closeApp } from './utils/open_app';
 
@@ -18,13 +20,10 @@ async function joinCommunityTest(platform: SupportedPlatformsType) {
   const testMessage = `Test message + ${new Date().getTime()}`;
 
   await joinCommunity(alice1, testCommunityLink, testCommunityName);
-  await alice1.onIOS().scrollToBottom();
+  await sleepFor(5000);
+  await alice1.scrollToBottom();
   await alice1.sendMessage(testMessage);
   // Has community synced to device 2?
-  await alice2.waitForTextElementToBePresent({
-    strategy: 'accessibility id',
-    selector: 'Conversation list item',
-    text: testCommunityName,
-  });
+  await alice2.waitForTextElementToBePresent(new ConversationItem(alice2, testCommunityName));
   await closeApp(alice1, alice2);
 }

run/test/specs/disappear_after_send_note_to_self.spec.ts

@@ -1,7 +1,7 @@
 import { bothPlatformsIt } from '../../types/sessionIt';
 import { DisappearActions, DISAPPEARING_TIMES, USERNAME } from '../../types/testing';
-import { MessageInput } from './locators/conversation';
-import { EnterAccountID } from './locators/start_conversation';
+import { PlusButton } from './locators/home';
+import { EnterAccountID, NewMessageOption, NextButton } from './locators/start_conversation';
 import { sleepFor } from './utils';
 import { newUser } from './utils/create_account';
 import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app';
@@ -21,12 +21,15 @@ async function disappearAfterSendNoteToSelf(platform: SupportedPlatformsType) {
   const controlMode: DisappearActions = 'sent';
   const time = DISAPPEARING_TIMES.THIRTY_SECONDS;
   // 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.clickOnElementAll(new PlusButton(device));
+  await device.clickOnElementAll(new NewMessageOption(device));
   await device.inputText(alice.accountID, new EnterAccountID(device));
   await device.scrollDown();
-  await device.clickOnByAccessibilityID('Next');
-  await device.inputText('Creating note to self', new MessageInput(device));
+  await device.clickOnElementAll(new NextButton(device));
+  await device.inputText('Creating note to self', {
+    strategy: 'accessibility id',
+    selector: 'Message input box',
+  });
   await device.clickOnByAccessibilityID('Send message button');
   // Enable disappearing messages
   await setDisappearingMessage(platform, device, [

run/test/specs/disappear_after_send_off_1o1.spec.ts

@@ -55,7 +55,7 @@ async function disappearAfterSendOff1o1(platform: SupportedPlatformsType) {
   await alice1.clickOnElementAll(new DisappearingMessagesMenuOption(alice1));
   await alice1.clickOnElementAll(new DisableDisappearingMessages(alice1));
   await alice1.clickOnElementAll(new SetDisappearMessagesButton(alice1));
-  await alice1.onIOS().navigateBack();
+  await alice1.navigateBack();
   // Check control message for turning off disappearing messages
   // Check USER A'S CONTROL MESSAGE on device 1 and 3 (linked device)
   const disappearingMessagesTurnedOffYou = englishStrippedStr(
@@ -76,7 +76,7 @@ async function disappearAfterSendOff1o1(platform: SupportedPlatformsType) {
   await bob1.checkModalStrings(
     englishStrippedStr('disappearingMessagesFollowSetting').toString(),
     englishStrippedStr('disappearingMessagesFollowSettingOff').toString(),
-    true
+    false
   );
   await bob1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Confirm' });
   // Check conversation subtitle?