fix new window

posit-dev · Jan 19, 2025 · f6dc133 · f6dc133
1 parent 1dba00c
commit f6dc133
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/test/e2e/pages/editorActionBar.ts b/test/e2e/pages/editorActionBar.ts
@@ -105,19 +105,21 @@ export class EditorActionBar {
 	}
 
 	/**
-	 * Verify: Check that the "open in new window" contains the specified title
+	 * Verify: Check that the "open in new window" contains the specified text
 	 * @param isWeb whether the test is running in the web or desktop app
-	 * @param windowTitle the title to verify in the new window
+	 * @param text the text to verify in the new window
 	 */
-	async verifyOpenInNewWindow(isWeb: boolean, windowTitle: string) {
+	async verifyOpenInNewWindow(isWeb: boolean, text: string | RegExp, exact = true) {
 		if (!isWeb) {
-			await test.step(`Verify "open new window" contains: ${windowTitle}`, async () => {
+			await test.step(`Verify "open new window" contains: ${text}`, async () => {
 				const [newPage] = await Promise.all([
 					this.page.context().waitForEvent('page'),
 					this.page.getByLabel('Move into new window').first().click(),
 				]);
-				await newPage.waitForLoadState();
-				await expect(newPage.getByText(windowTitle)).toBeVisible();
+				await newPage.waitForLoadState('load');
+				exact
+					? await expect(newPage.getByText(text, { exact: true })).toBeVisible()
+					: await expect(newPage.getByText(text)).toBeVisible();
 			});
 		}
 	}

diff --git a/test/e2e/tests/editor-action-bar/data-files.test.ts b/test/e2e/tests/editor-action-bar/data-files.test.ts
@@ -80,7 +80,7 @@ test.describe('Editor Action Bar: Data Files', {
 			await editorActionBar.clickSplitEditorButton('down');
 			await editorActionBar.verifySplitEditor('down', testCase.tabName);
 
-			await editorActionBar.verifyOpenInNewWindow(app.web, `${testCase.tabName} — qa-example-content`);
+			await editorActionBar.verifyOpenInNewWindow(app.web, testCase.tabName);
 		});
 	}
 });

diff --git a/test/e2e/tests/editor-action-bar/document-files.test.ts b/test/e2e/tests/editor-action-bar/document-files.test.ts
@@ -83,8 +83,8 @@ async function verifySplitEditor(tabName: string) {
 	await editorActionBar.verifySplitEditor('down', tabName);
 }
 
-async function verifyOpenInNewWindow(app: Application, title: string) {
-	await editorActionBar.verifyOpenInNewWindow(app.web, title);
+async function verifyOpenInNewWindow(app: Application, text: string) {
+	await editorActionBar.verifyOpenInNewWindow(app.web, text, false);
 }
 
 async function verifyOpenViewerRendersHtml(app: Application, title: string) {