fix: review

Author: dougfabris

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

@@ -8,6 +8,7 @@ import type { BaseTest } from './utils/test';
 import { expect, test } from './utils/test';
 
 test.use({ storageState: Users.admin.state });
+
 test.describe.serial('Global Search', () => {
 	let targetChannel: { name: string; _id: string };
 	let targetGroup: { name: string; _id: string };
@@ -62,8 +63,7 @@ test.describe.serial('Global Search', () => {
 		await page.goto('/home');
 	});
 
-	test('opens correct message when jumping from global search in group to channel thread', async ({ page }) => {
-		// await poHomeChannel.goto(`/group/${targetGroup.name}`);
+	test('should open the correct message when jumping from global search in group to channel thread', async ({ page }) => {
 		await poHomeChannel.sidenav.openChat(targetGroup.name);
 		await poHomeChannel.roomToolbar.btnSearchMessages.click();
 

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

@@ -7,7 +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';
+import { SearchMessagesFlexTab } from './searchMessages-flextab';
 
 export class HomeFlextab {
 	private readonly page: Page;
@@ -26,7 +26,7 @@ export class HomeFlextab {
 
 	readonly pruneMessages: HomeFlextabPruneMessages;
 
-	readonly searchMessages: HomeFlextabSearchMessages;
+	readonly searchMessages: SearchMessagesFlexTab;
 
 	constructor(page: Page) {
 		this.page = page;
@@ -37,7 +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);
+		this.searchMessages = new SearchMessagesFlexTab(page);
 	}
 
 	get toolbarPrimaryActions(): Locator {

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

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