/
undo.spec.js
535 lines (447 loc) · 14.8 KB
/
undo.spec.js
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
/**
* WordPress dependencies
*/
const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
test.use( {
undoUtils: async ( { page }, use ) => {
await use( new UndoUtils( { page } ) );
},
} );
test.describe( 'undo', () => {
test.beforeEach( async ( { admin } ) => {
await admin.createNewPost();
} );
test( 'should undo typing after a pause', async ( {
editor,
page,
pageUtils,
undoUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( 'before pause' );
await editor.page.waitForTimeout( 1000 );
await page.keyboard.type( ' after pause' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: { content: 'before pause after pause' },
},
] );
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: { content: 'before pause' },
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before pause'.length,
endOffset: 'before pause'.length,
} );
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getEditedPostContent ).toBe( '' );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
} );
await pageUtils.pressKeys( 'primaryShift+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: { content: 'before pause' },
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before pause'.length,
endOffset: 'before pause'.length,
} );
await pageUtils.pressKeys( 'primaryShift+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: { content: 'before pause after pause' },
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before pause after pause'.length,
endOffset: 'before pause after pause'.length,
} );
} );
test( 'should undo typing after non input change', async ( {
editor,
page,
pageUtils,
undoUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( 'before keyboard ' );
await pageUtils.pressKeys( 'primary+b' );
await page.keyboard.type( 'after keyboard' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'before keyboard <strong>after keyboard</strong>',
},
},
] );
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'before keyboard ',
},
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before keyboard '.length,
endOffset: 'before keyboard '.length,
} );
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getEditedPostContent ).toBe( '' );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
} );
await pageUtils.pressKeys( 'primaryShift+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'before keyboard ',
},
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before keyboard '.length,
endOffset: 'before keyboard '.length,
} );
await pageUtils.pressKeys( 'primaryShift+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'before keyboard <strong>after keyboard</strong>',
},
},
] );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'before keyboard after keyboard'.length,
endOffset: 'before keyboard after keyboard'.length,
} );
} );
test( 'should undo bold', async ( { page, pageUtils, editor } ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( 'test' );
await page.click( 'role=button[name="Save draft"i]' );
await expect(
page.locator(
'role=button[name="Dismiss this notice"i] >> text=Draft saved'
)
).toBeVisible();
await page.reload();
await page.waitForSelector( 'iframe[name="editor-canvas"]' );
await editor.canvas.click( '[data-type="core/paragraph"]' );
await pageUtils.pressKeys( 'primary+a' );
await pageUtils.pressKeys( 'primary+b' );
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'test',
},
},
] );
} );
test( 'Should undo/redo to expected level intervals', async ( {
editor,
page,
pageUtils,
undoUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
const firstBlock = await editor.getEditedPostContent();
await page.keyboard.type( 'This' );
const firstText = await editor.getEditedPostContent();
await page.keyboard.press( 'Enter' );
const secondBlock = await editor.getEditedPostContent();
await page.keyboard.type( 'is' );
const secondText = await editor.getEditedPostContent();
await page.keyboard.press( 'Enter' );
const thirdBlock = await editor.getEditedPostContent();
await page.keyboard.type( 'test' );
const thirdText = await editor.getEditedPostContent();
await pageUtils.pressKeys( 'primary+z' ); // Undo 3rd paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( thirdBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 2,
} );
await pageUtils.pressKeys( 'primary+z' ); // Undo 3rd block.
await expect.poll( editor.getEditedPostContent ).toBe( secondText );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 1,
startOffset: 'is'.length,
endOffset: 'is'.length,
} );
await pageUtils.pressKeys( 'primary+z' ); // Undo 2nd paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( secondBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 1,
} );
await pageUtils.pressKeys( 'primary+z' ); // Undo 2nd block.
await expect.poll( editor.getEditedPostContent ).toBe( firstText );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'This'.length,
endOffset: 'This'.length,
} );
await pageUtils.pressKeys( 'primary+z' ); // Undo 1st paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( firstBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
} );
await pageUtils.pressKeys( 'primary+z' ); // Undo 1st block.
await expect.poll( editor.getEditedPostContent ).toBe( '' );
await expect.poll( undoUtils.getSelection ).toEqual( {} );
// After undoing every action, there should be no more undo history.
await expect(
page.locator( 'role=button[name="Undo"]' )
).toBeDisabled();
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 1st block.
await expect.poll( editor.getEditedPostContent ).toBe( firstBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 0,
endOffset: 0,
} );
// After redoing one change, the undo button should be enabled again.
await expect(
page.locator( 'role=button[name="Undo"]' )
).toBeEnabled();
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 1st paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( firstText );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 0,
startOffset: 'This'.length,
endOffset: 'This'.length,
} );
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 2nd block.
await expect.poll( editor.getEditedPostContent ).toBe( secondBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 1,
startOffset: 0,
endOffset: 0,
} );
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 2nd paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( secondText );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 1,
startOffset: 'is'.length,
endOffset: 'is'.length,
} );
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 3rd block.
await expect.poll( editor.getEditedPostContent ).toBe( thirdBlock );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 2,
startOffset: 0,
endOffset: 0,
} );
await pageUtils.pressKeys( 'primaryShift+z' ); // Redo 3rd paragraph text.
await expect.poll( editor.getEditedPostContent ).toBe( thirdText );
await expect.poll( undoUtils.getSelection ).toEqual( {
blockIndex: 2,
startOffset: 'test'.length,
endOffset: 'test'.length,
} );
} );
test( 'should undo for explicit persistence editing post', async ( {
page,
pageUtils,
editor,
} ) => {
// Regression test: An issue had occurred where the creation of an
// explicit undo level would interfere with blocks values being synced
// correctly to the block editor.
//
// See: https://github.com/WordPress/gutenberg/issues/14950
// Issue is demonstrated from an edited post: create, save, and reload.
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( 'original' );
await page.click( 'role=button[name="Save draft"i]' );
await expect(
page.locator(
'role=button[name="Dismiss this notice"i] >> text=Draft saved'
)
).toBeVisible();
await page.reload();
await page.waitForSelector( 'iframe[name="editor-canvas"]' );
// Issue is demonstrated by forcing state merges (multiple inputs) on
// an existing text after a fresh reload.
await editor.canvas.click( '[data-type="core/paragraph"] >> nth=0' );
await page.keyboard.type( 'modified' );
// The issue is demonstrated after the one second delay to trigger the
// creation of an explicit undo persistence level.
await editor.page.waitForTimeout( 1000 );
await pageUtils.pressKeys( 'primary+z' );
// Assert against the _visible_ content. Since editor state with the
// regression present was accurate, it would produce the correct
// content. The issue had manifested in the form of what was shown to
// the user since the blocks state failed to sync to block editor.
const activeElementLocator = editor.canvas.locator(
'[data-type="core/paragraph"] >> nth=0'
);
await expect( activeElementLocator ).toHaveText( 'original' );
} );
test( 'should not create undo levels when saving', async ( {
editor,
page,
pageUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( '1' );
await page.click( 'role=button[name="Save draft"i]' );
await expect(
page.locator(
'role=button[name="Dismiss this notice"i] >> text=Draft saved'
)
).toBeVisible();
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getEditedPostContent ).toBe( '' );
} );
test( 'should not create undo levels when publishing', async ( {
editor,
page,
pageUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( '1' );
await editor.publishPost();
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getEditedPostContent ).toBe( '' );
} );
test( 'should immediately create an undo level on typing', async ( {
editor,
page,
pageUtils,
} ) => {
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( '1' );
await page.click( 'role=button[name="Save draft"i]' );
await expect(
page.locator(
'role=button[name="Dismiss this notice"i] >> text=Draft saved'
)
).toBeVisible();
await page.reload();
// Expect undo button to be disabled.
await expect(
page.locator( 'role=button[name="Undo"]' )
).toBeDisabled();
await editor.canvas.click( '[data-type="core/paragraph"]' );
await page.keyboard.type( '2' );
// Expect undo button to be enabled.
await expect(
page.locator( 'role=button[name="Undo"]' )
).toBeEnabled();
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: '1',
},
},
] );
} );
test( 'should be able to undo and redo when transient changes have been made and we update/publish', async ( {
editor,
page,
pageUtils,
} ) => {
// Typing consecutive characters in a `Paragraph` block updates the same
// block attribute as in the previous action and results in transient edits
// and skipping `undo` history steps.
const text = 'tonis';
await editor.canvas.click( 'role=button[name="Add default block"i]' );
await page.keyboard.type( text );
await editor.publishPost();
await pageUtils.pressKeys( 'primary+z' );
await expect.poll( editor.getEditedPostContent ).toBe( '' );
await expect(
page.locator( 'role=button[name="Redo"]' )
).not.toBeDisabled();
await page.click( 'role=button[name="Redo"]' );
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: {
content: 'tonis',
},
},
] );
} );
// @see https://github.com/WordPress/gutenberg/issues/12075
test( 'should be able to undo and redo property cross property changes', async ( {
page,
pageUtils,
editor,
} ) => {
await editor.canvas
.getByRole( 'textbox', { name: 'Add title' } )
.type( 'a' ); // First step.
await page.keyboard.press( 'Backspace' ); // Second step.
await editor.canvas
.getByRole( 'button', { name: 'Add default block' } )
.click(); // third step.
// Title should be empty
await expect(
editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
).toHaveText( '' );
// First undo removes the block.
// Second undo restores the title.
await pageUtils.pressKeys( 'primary+z' );
await pageUtils.pressKeys( 'primary+z' );
await expect(
editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
).toHaveText( 'a' );
// Redoing the "backspace" should clear the title again.
await pageUtils.pressKeys( 'primaryShift+z' );
await expect(
editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
).toHaveText( '' );
} );
} );
class UndoUtils {
constructor( { page } ) {
this.page = page;
this.getSelection = this.getSelection.bind( this );
}
async getSelection() {
return await this.page.evaluate( () => {
const selectedBlockId = window.wp.data
.select( 'core/block-editor' )
.getSelectedBlockClientId();
const blockIndex = window.wp.data
.select( 'core/block-editor' )
.getBlockIndex( selectedBlockId );
if ( blockIndex === -1 ) {
return {};
}
return {
blockIndex,
startOffset: window.wp.data
.select( 'core/block-editor' )
.getSelectionStart().offset,
endOffset: window.wp.data
.select( 'core/block-editor' )
.getSelectionEnd().offset,
};
} );
}
}