Merge pull request #580 from Satellite-im/luis/chats-tests-2

test(update): update chats tests
Satellite-im · Dec 21, 2023 · a8d221a · a8d221a
2 parents 954edc4 + 6050eb0
commit a8d221a
Show file tree

Hide file tree

Showing 16 changed files with 1,086 additions and 664 deletions.
diff --git a/tests/helpers/commands.ts b/tests/helpers/commands.ts
@@ -124,16 +124,6 @@ export async function loginWithTestUser() {
   const unlockScreen = await createPinFirstUser.unlockLayout;
   await unlockScreen.waitForExist();
   await createPinFirstUser.enterPin("1234");
-
-  // Ensure Main Screen is displayed
-  const welcomeLayout = await welcomeScreenFirstUser.welcomeLayout;
-  await welcomeLayout.waitForExist();
-
-  // Only maximize if current driver is windows
-  const currentDriver = await welcomeScreenFirstUser.getCurrentDriver();
-  if (currentDriver === WINDOWS_DRIVER) {
-    await maximizeWindow();
-  }
 }
 
 export async function resetApp() {
@@ -172,6 +162,16 @@ export async function launchApplication(
   }
 }
 
+export async function launchFirstApplication() {
+  await driver.executeScript("macos: launchApp", [
+    {
+      bundleId: MACOS_USER_A_BUNDLE_ID,
+      arguments: ["--discovery", "disable", "--path", homedir() + "/.uplink"],
+    },
+  ]);
+  await browser.pause(5000);
+}
+
 export async function launchSecondApplication() {
   await driver.executeScript("macos: launchApp", [
     {
@@ -238,6 +238,22 @@ export async function closeApplication() {
   }
 }
 
+export async function closeFirstApplication() {
+  await driver.executeScript("macos: terminateApp", [
+    {
+      bundleId: MACOS_USER_A_BUNDLE_ID,
+    },
+  ]);
+}
+
+export async function closeSecondApplication() {
+  await driver.executeScript("macos: terminateApp", [
+    {
+      bundleId: MACOS_USER_B_BUNDLE_ID,
+    },
+  ]);
+}
+
 export async function maximizeWindow() {
   const currentOS = await driver.capabilities.automationName;
   if (currentOS === WINDOWS_DRIVER) {
@@ -278,10 +294,10 @@ export async function getClipboardValue() {
 }
 
 export async function hoverOnMacOS(locator: WebdriverIO.Element) {
-  // Hover on X and Y coordinates previously retrieved
+  const elementId = await locator.elementId;
   await driver.executeScript("macos: hover", [
     {
-      elementId: locator,
+      elementId: elementId,
     },
   ]);
 }
@@ -346,11 +362,13 @@ export async function selectFileOnMacos(relativePath: string) {
 }
 
 export async function rightClickOnMacOS(locator: WebdriverIO.Element) {
+  const elementId = await locator.elementId;
   await driver.executeScript("macos: rightClick", [
     {
-      elementId: locator,
+      elementId: elementId,
     },
   ]);
+  await mouse.click(Button.RIGHT);
 }
 
 // Windows driver helper functions