chore: enhance waiting for channels in multiple users e2e test; Make …

…username bold in system message about deleted messages

packages/common/src/messages.ts

@@ -3,7 +3,7 @@ import { PublicChannelStorage } from '@quiet/types'
 export const createdChannelMessage = (channelName: string): string => `Created #${channelName}`
 
 export const generalChannelDeletionMessage = (username: string): string =>
-  `@${username} deleted all messages in #general`
+  `**@${username}** deleted all messages in #general`
 
 export const userJoinedMessage = (username: string): string =>
   `**@${username}** has joined and will be registered soon. 🎉 [Learn more](https://github.com/TryQuiet/quiet/wiki/Quiet-FAQ#how-does-username-registration-work)`

packages/e2e-tests/src/selectors.ts

@@ -427,6 +427,33 @@ export class Sidebar {
     return channels
   }
 
+  /**
+   * Get names of all channels in the sidebar
+   */
+  async getChannelsNames() {
+    const elements = await this.getChannelList()
+    return Promise.all(
+      elements.map(async element => {
+        const fullName = await element.getText()
+        return fullName.split(' ')[1]
+      })
+    )
+  }
+
+  async waitForChannelsNum(num: number) {
+    console.log(`Waiting for ${num} channels`)
+    return this.driver.wait(async () => {
+      const channels = await this.getChannelList()
+      return channels.length === num
+    })
+  }
+
+  async waitForChannels(channelsNames: Array<string>) {
+    await this.waitForChannelsNum(channelsNames.length)
+    const names = await this.getChannelsNames()
+    expect(names).toEqual(expect.arrayContaining(channelsNames))
+  }
+
   async openSettings() {
     const button = await this.driver.findElement(By.xpath('//span[@data-testid="settings-panel-button"]'))
     await button.click()

packages/e2e-tests/src/tests/multipleClients.test.ts

@@ -327,19 +327,15 @@ describe('Multiple Clients', () => {
         users.owner.username,
         `@${users.owner.username} deleted #${newChannelName}`
       )
+      await sidebarUser1.waitForChannels(['general'])
     })
+
     it('Channel deletion - User can create channel with the same name and is fresh channel', async () => {
       await sidebarUser1.addNewChannel(newChannelName)
       await sidebarUser1.switchChannel(newChannelName)
       const messages = await secondChannelUser1.getUserMessages(users.user1.username)
       expect(messages.length).toEqual(1)
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 2000)
-      )
-      const channels = await sidebarOwner.getChannelList()
-      expect(channels.length).toEqual(2)
+      await sidebarOwner.waitForChannels(['general', newChannelName])
     })
 
     it('Channel deletion - Owner creates third channel', async () => {
@@ -348,13 +344,7 @@ describe('Multiple Clients', () => {
       thirdChannelOwner = new Channel(users.owner.app.driver, thirdChannelName)
       const messages = await thirdChannelOwner.getUserMessages(users.owner.username)
       expect(messages.length).toEqual(1)
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 2000)
-      )
-      const channels = await sidebarUser1.getChannelList()
-      expect(channels.length).toEqual(3)
+      await sidebarUser1.waitForChannels(['general', newChannelName, thirdChannelName])
     })
 
     // End of tests for Windows
@@ -373,8 +363,7 @@ describe('Multiple Clients', () => {
         await channelContextMenuOwner.openMenu()
         await channelContextMenuOwner.openDeletionChannelModal()
         await channelContextMenuOwner.deleteChannel()
-        const channels = await sidebarOwner.getChannelList()
-        expect(channels.length).toEqual(2)
+        await sidebarOwner.waitForChannels(['general', newChannelName])
       })
 
       // Delete general channel while guest is absent
@@ -386,8 +375,7 @@ describe('Multiple Clients', () => {
         await channelContextMenuOwner.openMenu()
         await channelContextMenuOwner.openDeletionChannelModal()
         await channelContextMenuOwner.deleteChannel()
-        const channels = await sidebarOwner.getChannelList()
-        expect(channels.length).toEqual(2)
+        await sidebarOwner.waitForChannels(['general', newChannelName])
       })
 
       it('User 1 re-opens app', async () => {

packages/e2e-tests/src/utils.ts

@@ -46,6 +46,7 @@ export class BuildSetup {
     this.debugPort = await getPort()
   }
 
+  // Note: .env file is being used locally right now, mainly by script e2e:linux:build
   static getEnvFileName() {
     const { parsed, error } = config()
     console.log('Dotenv config', { parsed, error })
@@ -239,7 +240,11 @@ export class BuildSetup {
       return
     }
     console.log(`Deleting data directory at ${this.dataDirPath}`)
-    fs.rmdirSync(this.dataDirPath, { recursive: true })
+    try {
+      fs.rmdirSync(this.dataDirPath, { recursive: true })
+    } catch (e) {
+      console.error(`Could not delete ${this.dataDirPath}. Reason: ${e.message}`)
+    }
   }
 
   public getProcessData = () => {

packages/state-manager/src/sagas/publicChannels/createGeneralChannel/sendInitialChannelMessage.saga.test.ts

@@ -13,7 +13,7 @@ import { DateTime } from 'luxon'
 import { publicChannelsSelectors } from '../publicChannels.selectors'
 import { combineReducers } from '@reduxjs/toolkit'
 import { reducers } from '../../reducers'
-import { generateChannelId } from '@quiet/common'
+import { generalChannelDeletionMessage, generateChannelId } from '@quiet/common'
 import { type Community, type PublicChannel } from '@quiet/types'
 
 describe('sendInitialChannelMessageSaga', () => {
@@ -93,7 +93,7 @@ describe('sendInitialChannelMessageSaga', () => {
       .put(
         messagesActions.sendMessage({
           type: 3,
-          message: `@${owner.nickname} deleted all messages in #general`,
+          message: generalChannelDeletionMessage(owner.nickname),
           channelId: generalChannel.id,
         })
       )