Merge pull request #31 from session-foundation/android-1220

Android point release 1.22.0

Author: burtonemily

run/screenshots/android/landingpage_new_account.png

@@ -72,30 +72,32 @@ async function changeUsernameLinkedAndroid(platform: SupportedPlatformsType) {
   await device1.deleteText(new UsernameInput(device1));
   await device1.inputText(newUsername, new UsernameInput(device1));
   await device1.clickOnElementAll(new TickButton(device1));
-  const username = await device1.waitForTextElementToBePresent({
-    strategy: 'accessibility id',
-    selector: 'Display name',
-    text: newUsername,
-  });
-  const changedUsername = await device1.getTextFromElement(username);
+  const usernameEl = await device1.waitForTextElementToBePresent(new UsernameSettings(device1));
+  const changedUsername = await device1.getTextFromElement(usernameEl);
   if (changedUsername === userA.userName) {
     throw new Error('Username change unsuccessful');
   }
-  await device1.closeScreen();
-  await device1.clickOnElementAll(new UserSettings(device1));
-  await device2.closeScreen();
-  await device2.clickOnElementAll(new UserSettings(device2));
-  await Promise.all([
-    device1.waitForTextElementToBePresent({
-      strategy: 'accessibility id',
-      selector: 'Display name',
-      text: newUsername,
-    }),
-    device2.waitForTextElementToBePresent({
-      strategy: 'accessibility id',
-      selector: 'Display name',
-      text: newUsername,
-    }),
-  ]);
+  // Get the initial linked username from device2
+  const username2 = await device2.waitForTextElementToBePresent(new UsernameSettings(device2));
+  let currentLinkedUsername = await device2.getTextFromElement(username2);
+
+  let currentWait = 0;
+  const waitPerLoop = 500;
+  const maxWait = 50000;
+
+  do {
+    await sleepFor(waitPerLoop);
+    // Close the screen and navigate back to the User Settings
+    await device2.closeScreen();
+    await device2.clickOnElementAll(new UserSettings(device2));
+    currentWait += waitPerLoop;
+    const linkedUsernameEl = await device2.waitForTextElementToBePresent(
+      new UsernameSettings(device2)
+    );
+    currentLinkedUsername = await device2.getTextFromElement(linkedUsernameEl);
+  } while (currentLinkedUsername === userA.userName && currentWait < maxWait);
+  {
+    console.log('Username not changed yet');
+  }
   await closeApp(device1, device2);
 }

run/screenshots/android/landingpage_restore_account.png

@@ -31,7 +31,8 @@ async function blockUserInConversationOptions(platform: SupportedPlatformsType)
   // Check modal strings
   await device1.checkModalStrings(
     englishStripped('block').toString(),
-    englishStripped('blockDescription').withArgs({ name: userB.userName }).toString()
+    englishStripped('blockDescription').withArgs({ name: userB.userName }).toString(),
+    true
   );
   // Confirm block option
   await device1.clickOnElementAll(new BlockUserConfirmationModal(device1));

run/test/specs/linked_device_change_username.spec.ts

@@ -7,9 +7,9 @@ import { newContact } from './utils/create_contact';
 import { linkedDevice } from './utils/link_device';
 import { openAppMultipleDevices, SupportedPlatformsType } from './utils/open_app';
 
-bothPlatformsIt('Delete contact', 'high', deleteContact);
+bothPlatformsIt('Delete conversation', 'high', deleteConversation);
 
-async function deleteContact(platform: SupportedPlatformsType) {
+async function deleteConversation(platform: SupportedPlatformsType) {
   const [device1, device2, device3] = await openAppMultipleDevices(platform, 3);
   const [Alice, Bob] = await Promise.all([
     linkedDevice(device1, device3, USERNAME.ALICE),
@@ -33,7 +33,7 @@ async function deleteContact(platform: SupportedPlatformsType) {
       text: Bob.userName,
     }),
   ]);
-  // Delete contact
+  // Delete conversation
   await device1.onIOS().swipeLeft('Conversation list item', Bob.userName);
   await device1.onAndroid().longPressConversation(Bob.userName);
   await device1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Delete' });

run/test/specs/user_actions_block_conversation_options.spec.ts

@@ -30,7 +30,10 @@ async function shareToSession(platform: SupportedPlatformsType) {
   await device1.onIOS().swipeRightAny('Session');
   await device1.clickOnElementAll(new PhotoLibrary(device1));
   await sleepFor(2000);
-  const testImage = await device1.doesElementExist(new ImageName(device1));
+  const testImage = await device1.doesElementExist({
+    ...new ImageName(device1).build(),
+    maxWait: 5000,
+  });
   if (!testImage) {
     await device1.pushMediaToDevice(platform, fileName);
   }

…pecs/user_actions_delete_contact.spec.ts …user_actions_delete_conversation.spec.tsrun/test/specs/user_actions_delete_contact.spec.ts renamed to run/test/specs/user_actions_delete_conversation.spec.ts run/test/specs/user_actions_delete_contact.spec.ts renamed to run/test/specs/user_actions_delete_conversation.spec.ts

@@ -21,7 +21,8 @@ async function unblockUser(platform: SupportedPlatformsType) {
   await device1.clickOnElementAll(new BlockUser(device1));
   await device1.checkModalStrings(
     englishStripped('block').toString(),
-    englishStripped('blockDescription').withArgs({ name: userB.userName }).toString()
+    englishStripped('blockDescription').withArgs({ name: userB.userName }).toString(),
+    true
   );
   await device1.clickOnElementAll(new BlockUserConfirmationModal(device1));
   await device1.onIOS().navigateBack();
@@ -47,13 +48,13 @@ async function unblockUser(platform: SupportedPlatformsType) {
   await device1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Blocked banner' });
   await device1.checkModalStrings(
     englishStripped('blockUnblock').toString(),
-    englishStripped('blockUnblockName').withArgs({ name: userB.userName }).toString()
+    englishStripped('blockUnblockName').withArgs({ name: userB.userName }).toString(),
+    true
   );
   await device1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Unblock' });
-  //   Blocked message should now be visible
-  await device1.waitForTextElementToBePresent({
+  await device1.doesElementExist({
     strategy: 'accessibility id',
-    selector: 'Message body',
-    text: blockedMessage,
+    selector: 'Blocked banner',
+    maxWait: 2000,
   });
 }

run/test/specs/user_actions_share_to_session.spec.ts

@@ -1151,7 +1151,7 @@ export class DeviceWrapper {
         text: 'Allow',
       });
       await this.clickOnByAccessibilityID('Show roots');
-      await sleepFor(100);
+      await sleepFor(500);
       await this.clickOnTextElementById(`android:id/title`, 'Downloads');
       await sleepFor(100);
       const testImage = await this.doesElementExist({
@@ -1264,6 +1264,7 @@ export class DeviceWrapper {
     await sleepFor(200);
     // Select video
     const mediaButtons = await this.findElementsByClass('android.widget.Button');
+    await sleepFor(500);
     const videosButton = await this.findMatchingTextInElementArray(mediaButtons, 'Videos');
     if (!videosButton) {
       throw new Error('videosButton was not found');