Remove deprecated waitForNavigation playwright API (#1699)

mui · Feb 22, 2023 · af908ff · af908ff
1 parent aa5eccb
commit af908ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/test/integration/appTemplates.spec.ts b/test/integration/appTemplates.spec.ts
@@ -7,8 +7,6 @@ test('can use default app template', async ({ page }) => {
   await homeModel.goto();
   const app = await homeModel.createApplication({ appTemplateId: 'default' });
 
-  page.waitForNavigation();
-
   const runtimeModel = new ToolpadRuntime(page);
   await runtimeModel.gotoPage(app.id, 'page1');
 
@@ -21,8 +19,6 @@ test('can use hr template', async ({ page }) => {
   await homeModel.goto();
   const app = await homeModel.createApplication({ appTemplateId: 'hr' });
 
-  page.waitForNavigation();
-
   const runtimeModel = new ToolpadRuntime(page);
   await runtimeModel.gotoPage(app.id, 'page1');
 
@@ -35,8 +31,6 @@ test('can use images app template', async ({ page }) => {
   await homeModel.goto();
   const app = await homeModel.createApplication({ appTemplateId: 'images' });
 
-  page.waitForNavigation();
-
   const runtimeModel = new ToolpadRuntime(page);
   await runtimeModel.gotoPage(app.id, 'dogBreedsPage');
 

diff --git a/test/integration/duplication/index.spec.ts b/test/integration/duplication/index.spec.ts
@@ -17,7 +17,9 @@ test('duplication', async ({ page, api }) => {
   {
     await editorModel.openHierarchyMenu('connections', 'connection');
     const duplicateMenuItem = page.getByRole('menuitem', { name: 'Duplicate' });
-    await Promise.all([duplicateMenuItem.click(), page.waitForNavigation()]);
+    await duplicateMenuItem.click();
+
+    await page.waitForURL(/\/_toolpad\/app\/[^/]+\/connections\/[^/]+$/);
 
     const input = page.getByLabel('base url');
     await expect(input).toHaveValue('https://example.com/');
@@ -26,29 +28,33 @@ test('duplication', async ({ page, api }) => {
     const deleteMenuItem = page.getByRole('menuitem', { name: 'Delete' });
     await deleteMenuItem.click();
     const deleteButton = editorModel.confirmationDialog.getByRole('button', { name: 'Delete' });
-    await Promise.all([deleteButton.click(), page.waitForNavigation()]);
+    await deleteButton.click();
 
     await expect(editorModel.hierarchyItem('connections', 'connection1')).toBeHidden();
   }
 
   {
     await editorModel.openHierarchyMenu('components', 'myComponent');
     const duplicateMenuItem = page.getByRole('menuitem', { name: 'Duplicate' });
-    await Promise.all([duplicateMenuItem.click(), page.waitForNavigation()]);
+    await duplicateMenuItem.click();
+
+    await page.waitForURL(/\/_toolpad\/app\/[^/]+\/codeComponents\/[^/]+$/);
 
     await editorModel.openHierarchyMenu('components', 'myComponent1');
     const deleteMenuItem = page.getByRole('menuitem', { name: 'Delete' });
     await deleteMenuItem.click();
     const deleteButton = editorModel.confirmationDialog.getByRole('button', { name: 'Delete' });
-    await Promise.all([deleteButton.click(), page.waitForNavigation()]);
+    await deleteButton.click();
 
     await expect(editorModel.hierarchyItem('components', 'myComponent1')).toBeHidden();
   }
 
   {
     await editorModel.openHierarchyMenu('pages', 'page1');
     const duplicateMenuItem = page.getByRole('menuitem', { name: 'Duplicate' });
-    await Promise.all([duplicateMenuItem.click(), page.waitForNavigation()]);
+    await duplicateMenuItem.click();
+
+    await page.waitForURL(/\/_toolpad\/app\/[^/]+\/pages\/[^/]+$/);
 
     const button = editorModel.appCanvas.getByRole('button', { name: 'hello world' });
     await expect(button).toBeVisible();
@@ -57,7 +63,7 @@ test('duplication', async ({ page, api }) => {
     const deleteMenuItem = page.getByRole('menuitem', { name: 'Delete' });
     await deleteMenuItem.click();
     const deleteButton = editorModel.confirmationDialog.getByRole('button', { name: 'Delete' });
-    await Promise.all([deleteButton.click(), page.waitForNavigation()]);
+    await deleteButton.click();
 
     await expect(editorModel.hierarchyItem('pages', 'page2')).toBeHidden();
   }