updated tests

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

Author: abhinavkrin

apps/meteor/tests/e2e/global-search.spec.ts

@@ -2,6 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 
 import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
 import { setSettingValueById } from './utils';
 import type { BaseTest } from './utils/test';
 import { expect, test } from './utils/test';
@@ -11,6 +12,7 @@ test.describe.serial('Global Search', () => {
 	let targetChannel: { name: string; _id: string };
 	let targetGroup: { name: string; _id: string };
 	let threadMessage: IMessage;
+	let poHomeChannel: HomeChannel;
 
 	const fillMessages = async (api: BaseTest['api']) => {
 		const { message: parentMessage } = await (
@@ -56,21 +58,18 @@ test.describe.serial('Global Search', () => {
 	);
 
 	test.beforeEach(async ({ page }) => {
-		await page.goto('/');
+		poHomeChannel = new HomeChannel(page);
+		await page.goto('/home');
 	});
 
 	test('opens correct message when jumping from global search in group to channel thread', async ({ page }) => {
-		await page.goto(`/group/${targetGroup.name}`);
-		await expect(page.getByTitle('Search Messages')).toBeVisible();
-		await page.getByTitle('Search Messages').click();
+		// await poHomeChannel.goto(`/group/${targetGroup.name}`);
+		await poHomeChannel.sidenav.openChat(targetGroup.name);
+		await poHomeChannel.roomToolbar.btnSearchMessages.click();
 
-		await expect(page.getByText('Global search')).toBeVisible({ timeout: 10000 });
-		await page.getByText('Global search').click();
+		await poHomeChannel.tabs.searchMessages.search(threadMessage.msg.slice(10), { global: true, timeout: 10000 }); // fill partial text to match search
 
-		await expect(page.getByPlaceholder('Search Messages')).toBeVisible();
-		await page.getByPlaceholder('Search Messages').fill(threadMessage.msg.slice(10)); // fill partial text to match search
-
-		const message = page.getByRole('listitem').filter({ hasText: threadMessage.msg });
+		const message = await poHomeChannel.tabs.searchMessages.getResultItem(threadMessage.msg);
 		await expect(message).toBeVisible();
 		await message.hover();
 		const jumpToMessageButton = message.getByTitle('Jump to message');

apps/meteor/tests/e2e/page-objects/fragments/home-flextab-searchMessages.ts

@@ -0,0 +1,20 @@
+import type { Locator, Page } from '@playwright/test';
+
+export class HomeFlextabSearchMessages {
+	readonly searchTab: Locator;
+
+	constructor(protected page: Page) {
+		this.searchTab = this.page.getByRole('dialog', { name: 'Search Messages' });
+	}
+
+	async search(text: string, { global = false, timeout }: { global?: boolean; timeout?: number } = {}) {
+		if (global) {
+			await this.searchTab.getByText('Global search').click({ timeout });
+		}
+		await this.searchTab.getByPlaceholder('Search Messages').fill(text, { timeout });
+	}
+
+	async getResultItem(messageText: string) {
+		return this.searchTab.getByRole('listitem', { name: messageText });
+	}
+}

apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts

@@ -7,6 +7,7 @@ import { HomeFlextabNotificationPreferences } from './home-flextab-notificationP
 import { HomeFlextabOtr } from './home-flextab-otr';
 import { HomeFlextabPruneMessages } from './home-flextab-pruneMessages';
 import { HomeFlextabRoom } from './home-flextab-room';
+import { HomeFlextabSearchMessages } from './home-flextab-searchMessages';
 
 export class HomeFlextab {
 	private readonly page: Page;
@@ -25,6 +26,8 @@ export class HomeFlextab {
 
 	readonly pruneMessages: HomeFlextabPruneMessages;
 
+	readonly searchMessages: HomeFlextabSearchMessages;
+
 	constructor(page: Page) {
 		this.page = page;
 		this.members = new HomeFlextabMembers(page);
@@ -34,6 +37,7 @@ export class HomeFlextab {
 		this.otr = new HomeFlextabOtr(page);
 		this.exportMessages = new ExportMessagesTab(page);
 		this.pruneMessages = new HomeFlextabPruneMessages(page);
+		this.searchMessages = new HomeFlextabSearchMessages(page);
 	}
 
 	get toolbarPrimaryActions(): Locator {

apps/meteor/tests/e2e/page-objects/fragments/toolbar.ts

@@ -60,6 +60,10 @@ export class RoomToolbar extends Toolbar {
 		return this.root.getByRole('button', { name: 'Options' });
 	}
 
+	get btnSearchMessages(): Locator {
+		return this.root.getByRole('button', { name: 'Search Messages' });
+	}
+
 	get btnDisableE2EEncryption(): Locator {
 		return this.root.getByRole('button', { name: 'Disable E2E encryption' });
 	}