Propose solution for flaky undo test (#1415)

mui · Dec 5, 2022 · 023d69d · 023d69d
1 parent cbd9292
commit 023d69d
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/test/integration/undo-redo/index.spec.ts b/test/integration/undo-redo/index.spec.ts
@@ -1,18 +1,18 @@
 import * as path from 'path';
 import { ToolpadEditor } from '../../models/ToolpadEditor';
-import { ToolpadHome } from '../../models/ToolpadHome';
 import { test, expect } from '../../playwright/test';
 import { readJsonFile } from '../../utils/fs';
 import clickCenter from '../../utils/clickCenter';
+import generateId from '../../utils/generateId';
 
-test('test basic undo and redo', async ({ page, browserName }) => {
- const homeModel = new ToolpadHome(page);
- const editorModel = new ToolpadEditor(page, browserName);
+test('test basic undo and redo', async ({ page, browserName, api }) => {
+ const dom = await readJsonFile(path.resolve(__dirname, './dom.json'));
 
- const domInput = await readJsonFile(path.resolve(__dirname, './dom.json'));
+ const app = await api.mutation.createApp(`App ${generateId()}`, {
+ from: { kind: 'dom', dom },
+ });
 
- await homeModel.goto();
- const app = await homeModel.createApplication({ dom: domInput });
+ const editorModel = new ToolpadEditor(page, browserName);
  await editorModel.goto(app.id);
 
  await editorModel.waitForOverlay();
@@ -43,14 +43,14 @@ test('test basic undo and redo', async ({ page, browserName }) => {
  await expect(canvasInputLocator).toHaveCount(3);
 });
 
-test('test batching quick actions into single undo entry', async ({ page, browserName }) => {
- const homeModel = new ToolpadHome(page);
- const editorModel = new ToolpadEditor(page, browserName);
+test('test batching quick actions into single undo entry', async ({ page, browserName, api }) => {
+ const dom = await readJsonFile(path.resolve(__dirname, './dom.json'));
 
- const domInput = await readJsonFile(path.resolve(__dirname, './dom.json'));
+ const app = await api.mutation.createApp(`App ${generateId()}`, {
+ from: { kind: 'dom', dom },
+ });
 
- await homeModel.goto();
- const app = await homeModel.createApplication({ dom: domInput });
+ const editorModel = new ToolpadEditor(page, browserName);
  await editorModel.goto(app.id);
 
  await editorModel.waitForOverlay();
@@ -59,12 +59,18 @@ test('test batching quick actions into single undo entry', async ({ page, browse
 
  clickCenter(page, input);
 
- await editorModel.componentEditor.getByLabel('defaultValue').fill('some value');
- await editorModel.componentEditor.getByLabel('label').fill('some label');
- await editorModel.componentEditor.getByLabel('label').blur();
+ await editorModel.componentEditor.getByLabel('defaultValue').click();
 
- await expect(input).toHaveValue('some value');
- await expect(editorModel.appCanvas.getByLabel('some label')).toBeVisible();
+ await page.keyboard.type('some value');
+
+ // Wait for undo stack to be updated
+ await page.waitForTimeout(600);
+
+ await page.keyboard.type(' hello');
+
+ await editorModel.componentEditor.getByLabel('defaultValue').blur();
+
+ await expect(input).toHaveValue('some value hello');
 
  // Wait for undo stack to be updated
  await page.waitForTimeout(600);
@@ -73,6 +79,5 @@ test('test batching quick actions into single undo entry', async ({ page, browse
  await page.keyboard.press('Control+Z');
 
  // Asssert that batched changes were reverted
- await expect(input).toHaveValue('');
- await expect(editorModel.appCanvas.getByLabel('some label')).not.toBeVisible();
+ await expect(input).toHaveValue('some value');
 });