Chore(1977): Fix e2e tests on windows (#2454)

* Fix windows E2E tests * Reorder tests and try to wait for multiple client test case to finish
TryQuiet · Apr 17, 2024 · db587a4 · db587a4
1 parent 6124233
commit db587a4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
@@ -8,6 +8,7 @@ on:
       - packages/state-manager/**
       - packages/identity/**
       - packages/common/**
+      - packages/e2e-tests/**
 
 jobs:
   mac:

diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
@@ -92,27 +92,28 @@ jobs:
           max_attempts: 3
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
-
-      - name: Run multiple clients test
-        uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          shell: bash
-          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
-
+
       - name: Run user profile test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
           shell: bash
           command: cd packages/e2e-tests && npm run test userProfile.test.ts
-
+        
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
         with:
-          timeout_minutes: 25
+          timeout_minutes: 10
           max_attempts: 3
           shell: bash
           command: cd packages/e2e-tests && npm run test invitationLink.test.ts
+
+
+      - name: Run multiple clients test
+        uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          shell: bash
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
diff --git a/packages/e2e-tests/src/selectors.ts b/packages/e2e-tests/src/selectors.ts
@@ -51,12 +51,12 @@ export class App {
     console.log('App closed', this.buildSetup.dataDir)
   }
 
-  async cleanup() {
+  async cleanup(force: boolean = false) {
     console.log(`Performing app cleanup`, this.buildSetup.dataDir)
     if (this.isOpened) {
       throw new Error(`App with dataDir ${this.buildSetup.dataDir} is still open, close before cleaning up!`)
     }
-    this.buildSetup.clearDataDir()
+    this.buildSetup.clearDataDir(force)
   }
 
   get saveStateButton() {

diff --git a/packages/e2e-tests/src/tests/invitationLink.test.ts b/packages/e2e-tests/src/tests/invitationLink.test.ts
@@ -26,6 +26,9 @@ describe('New user joins using invitation link while having app opened', () => {
   beforeAll(async () => {
     ownerApp = new App()
     guestApp = new App({ defaultDataDir: true })
+    if (process.platform === 'win32') {
+      await guestApp.cleanup(true)
+    }
   })
 
   beforeEach(async () => {
@@ -143,7 +146,7 @@ describe('New user joins using invitation link while having app opened', () => {
       const copiedCode = url.hash.substring(1)
       expect(() => parseInvitationCode(copiedCode)).not.toThrow()
       const data = parseInvitationCode(copiedCode)
-      const commandFull = `${command[process.platform as SupportedPlatformDesktop]} "${composeInvitationDeepUrl(data)}"`
+      const commandFull = `${command[process.platform as SupportedPlatformDesktop]} ${process.platform === 'win32' ? '""' : ''} "${composeInvitationDeepUrl(data)}"`
       console.log(`Calling ${commandFull}`)
       execSync(commandFull)
       console.log('Guest opened invitation link')

diff --git a/packages/e2e-tests/src/tests/multipleClients.test.ts b/packages/e2e-tests/src/tests/multipleClients.test.ts
@@ -341,7 +341,7 @@ describe('Multiple Clients', () => {
       await new Promise<void>(resolve =>
         setTimeout(() => {
           resolve()
-        }, 2000)
+        }, 20000)
       )
       const channels = await sidebarOwner.getChannelList()
       expect(channels.length).toEqual(2)

diff --git a/packages/e2e-tests/src/utils.ts b/packages/e2e-tests/src/utils.ts
@@ -53,9 +53,9 @@ export class BuildSetup {
   }
 
   private getBinaryLocation() {
-    console.log('filename', this.fileName)
     switch (process.platform) {
       case 'linux':
+        console.log('filename', this.fileName)
         return `${__dirname}/../Quiet/${this.fileName ? this.fileName : BuildSetup.getEnvFileName()}`
       case 'win32':
         return `${process.env.LOCALAPPDATA}\\Programs\\@quietdesktop\\Quiet.exe`
@@ -233,8 +233,8 @@ export class BuildSetup {
     await this.driver?.close()
   }
 
-  public clearDataDir() {
-    if (process.env.IS_CI === 'true') {
+  public clearDataDir(force: boolean = false) {
+    if (process.env.IS_CI === 'true' && !force) {
       console.warn('Not deleting data directory because we are running in CI')
       return
     }