٠١٢
-" -`; - -exports[`RTL should arrow navigate between blocks 1`] = ` -" -٠
١
٠
١
٢
٠١
-" -`; - -exports[`RTL should merge forward 1`] = ` -" -٠١
-" -`; - -exports[`RTL should navigate inline boundaries 1`] = ` -" -١٠٢
-" -`; - -exports[`RTL should navigate inline boundaries 2`] = ` -" -١٠٢
-" -`; - -exports[`RTL should navigate inline boundaries 3`] = ` -" -٠١٢
-" -`; - -exports[`RTL should navigate inline boundaries 4`] = ` -" -٠١٢
-" -`; - -exports[`RTL should split 1`] = ` -" -٠
- - - -١
-" -`; diff --git a/packages/e2e-tests/specs/editor/various/rtl.test.js b/test/e2e/specs/editor/various/rtl.spec.js similarity index 54% rename from packages/e2e-tests/specs/editor/various/rtl.test.js rename to test/e2e/specs/editor/various/rtl.spec.js index a18eb0573c8155..01b91507319b8b 100644 --- a/packages/e2e-tests/specs/editor/various/rtl.test.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -1,33 +1,31 @@ /** * WordPress dependencies */ -import { - createNewPost, - getEditedPostContent, - pressKeyWithModifier, - activatePlugin, - deactivatePlugin, -} from '@wordpress/e2e-test-utils'; +const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' ); // Avoid using three, as it looks too much like two with some fonts. const ARABIC_ZERO = '٠'; const ARABIC_ONE = '١'; const ARABIC_TWO = '٢'; -describe( 'RTL', () => { - beforeAll( async () => { - await activatePlugin( 'gutenberg-test-plugin-activate-rtl' ); +test.describe( 'RTL', () => { + test.beforeAll( async ( { requestUtils } ) => { + await requestUtils.activatePlugin( + 'gutenberg-test-plugin-activate-rtl' + ); } ); - beforeEach( async () => { - await createNewPost(); + test.beforeEach( async ( { admin } ) => { + await admin.createNewPost(); } ); - afterAll( async () => { - await deactivatePlugin( 'gutenberg-test-plugin-activate-rtl' ); + test.afterAll( async ( { requestUtils } ) => { + await requestUtils.deactivatePlugin( + 'gutenberg-test-plugin-activate-rtl' + ); } ); - it( 'should arrow navigate', async () => { + test( 'should arrow navigate', async ( { editor, page } ) => { await page.keyboard.press( 'Enter' ); // We need at least three characters as arrow navigation *from* the @@ -41,10 +39,17 @@ describe( 'RTL', () => { // Expect: ARABIC_ZERO + ARABIC_ONE + ARABIC_TWO (٠١٢
). // N.b.: HTML is LTR, so direction will be reversed! - expect( await getEditedPostContent() ).toMatchSnapshot(); + + //Check the content + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +٠١٢
+` + ); } ); - it( 'should split', async () => { + test( 'should split', async ( { editor, page } ) => { await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ZERO ); @@ -52,10 +57,20 @@ describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Enter' ); - expect( await getEditedPostContent() ).toMatchSnapshot(); + //Check the content + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +٠
+ + + +١
+` + ); } ); - it( 'should merge backward', async () => { + test( 'should merge backward', async ( { editor, page } ) => { await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ZERO ); @@ -64,10 +79,16 @@ describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Backspace' ); - expect( await getEditedPostContent() ).toMatchSnapshot(); + //Check the content + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +٠١
+` + ); } ); - it( 'should merge forward', async () => { + test( 'should merge forward', async ( { editor, page } ) => { await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ZERO ); @@ -77,16 +98,26 @@ describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Delete' ); - expect( await getEditedPostContent() ).toMatchSnapshot(); + //Check the content + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +٠١
+` + ); } ); - it( 'should arrow navigate between blocks', async () => { + test( 'should arrow navigate between blocks', async ( { + editor, + page, + pageUtils, + } ) => { await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ZERO ); await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ONE ); - await pressKeyWithModifier( 'shift', 'Enter' ); + await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); await page.keyboard.type( ARABIC_TWO ); await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'ArrowRight' ); @@ -94,26 +125,40 @@ describe( 'RTL', () => { // Move to the previous block with two lines in the current block. await page.keyboard.press( 'ArrowRight' ); - await pressKeyWithModifier( 'shift', 'Enter' ); + await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); await page.keyboard.type( ARABIC_ONE ); // Move to the next block with two lines in the current block. await page.keyboard.press( 'ArrowLeft' ); await page.keyboard.type( ARABIC_ZERO ); - await pressKeyWithModifier( 'shift', 'Enter' ); - - expect( await getEditedPostContent() ).toMatchSnapshot(); + await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); + + //Check the content + const content = await editor.getEditedPostContent(); + expect( content ).toBe( + ` +٠
١
٠
١
٢
١٠٢
+ \ No newline at end of file diff --git a/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-2-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-2-chromium.txt new file mode 100644 index 00000000000000..9f1e70f261f837 --- /dev/null +++ b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-2-chromium.txt @@ -0,0 +1,3 @@ + +١٠٢
+ \ No newline at end of file diff --git a/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-3-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-3-chromium.txt new file mode 100644 index 00000000000000..f078b326823185 --- /dev/null +++ b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-3-chromium.txt @@ -0,0 +1,3 @@ + +٠١٢
+ \ No newline at end of file diff --git a/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-4-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-4-chromium.txt new file mode 100644 index 00000000000000..598ba367aaf538 --- /dev/null +++ b/test/e2e/specs/editor/various/__snapshots__/RTL-should-navigate-inline-boundaries-4-chromium.txt @@ -0,0 +1,3 @@ + +٠١٢
+ \ No newline at end of file From da10e6597d8f51b5b2b4f426080825b521d39a4e Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Thu, 16 Jun 2022 12:01:05 +0530 Subject: [PATCH 03/11] Addressed review feedbacks --- test/e2e/specs/editor/various/rtl.spec.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 01b91507319b8b..3e50c93b589a3a 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -40,7 +40,7 @@ test.describe( 'RTL', () => { // Expect: ARABIC_ZERO + ARABIC_ONE + ARABIC_TWO (٠١٢
). // N.b.: HTML is LTR, so direction will be reversed! - //Check the content + // Check the content. const content = await editor.getEditedPostContent(); expect( content ).toBe( ` @@ -57,7 +57,7 @@ test.describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Enter' ); - //Check the content + // Check the content. const content = await editor.getEditedPostContent(); expect( content ).toBe( ` @@ -79,7 +79,7 @@ test.describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Backspace' ); - //Check the content + // Check the content. const content = await editor.getEditedPostContent(); expect( content ).toBe( ` @@ -98,7 +98,7 @@ test.describe( 'RTL', () => { await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'Delete' ); - //Check the content + // Check the content. const content = await editor.getEditedPostContent(); expect( content ).toBe( ` @@ -117,7 +117,7 @@ test.describe( 'RTL', () => { await page.keyboard.type( ARABIC_ZERO ); await page.keyboard.press( 'Enter' ); await page.keyboard.type( ARABIC_ONE ); - await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); + await page.keyboard.press( 'Shift+Enter' ); await page.keyboard.type( ARABIC_TWO ); await page.keyboard.press( 'ArrowRight' ); await page.keyboard.press( 'ArrowRight' ); @@ -133,7 +133,7 @@ test.describe( 'RTL', () => { await page.keyboard.type( ARABIC_ZERO ); await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); - //Check the content + // Check the content. const content = await editor.getEditedPostContent(); expect( content ).toBe( ` @@ -151,7 +151,7 @@ test.describe( 'RTL', () => { page, pageUtils, } ) => { - await page.keyboard.press( 'Enter' ); + page.click( 'role=button[name="Add default block"i]' ); // Wait for rich text editor to load. await page.waitForSelector( '.block-editor-rich-text__editable' ); From 09e40c9fd269154b61ad1bf8ee850ce4719bf987 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Thu, 16 Jun 2022 16:17:01 +0530 Subject: [PATCH 04/11] Addressed review feedback --- test/e2e/specs/editor/various/rtl.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 3e50c93b589a3a..54900af1195919 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -125,7 +125,7 @@ test.describe( 'RTL', () => { // Move to the previous block with two lines in the current block. await page.keyboard.press( 'ArrowRight' ); - await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); + await page.press( 'Shift+Enter' ); await page.keyboard.type( ARABIC_ONE ); // Move to the next block with two lines in the current block. From 9910cc8a1de9dcebeeda9987c0426a5024d22fc9 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Thu, 16 Jun 2022 16:20:19 +0530 Subject: [PATCH 05/11] Addressed remaining feedbacks --- test/e2e/specs/editor/various/rtl.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 54900af1195919..6dc6138a56b981 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -131,7 +131,7 @@ test.describe( 'RTL', () => { // Move to the next block with two lines in the current block. await page.keyboard.press( 'ArrowLeft' ); await page.keyboard.type( ARABIC_ZERO ); - await pageUtils.pressKeyWithModifier( 'shift', 'Enter' ); + await page.press( 'Shift+Enter' ); // Check the content. const content = await editor.getEditedPostContent(); From 2c97c6aaff5d908f2a5841faa8656d941176b4d4 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Thu, 16 Jun 2022 16:35:48 +0530 Subject: [PATCH 06/11] Addressed review feedback --- test/e2e/specs/editor/various/rtl.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 6dc6138a56b981..95b1a0cb0afb0c 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -109,8 +109,7 @@ test.describe( 'RTL', () => { test( 'should arrow navigate between blocks', async ( { editor, - page, - pageUtils, + page } ) => { await page.keyboard.press( 'Enter' ); From 0515435a867bf347deb0a18927917994e1252f4e Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Thu, 16 Jun 2022 17:34:22 +0530 Subject: [PATCH 07/11] Solved styleint issue --- test/e2e/specs/editor/various/rtl.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 95b1a0cb0afb0c..21b0a10f643bd3 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -109,7 +109,7 @@ test.describe( 'RTL', () => { test( 'should arrow navigate between blocks', async ( { editor, - page + page, } ) => { await page.keyboard.press( 'Enter' ); @@ -124,13 +124,13 @@ test.describe( 'RTL', () => { // Move to the previous block with two lines in the current block. await page.keyboard.press( 'ArrowRight' ); - await page.press( 'Shift+Enter' ); + await page.keyboard.press( 'Shift+Enter' ); await page.keyboard.type( ARABIC_ONE ); // Move to the next block with two lines in the current block. await page.keyboard.press( 'ArrowLeft' ); await page.keyboard.type( ARABIC_ZERO ); - await page.press( 'Shift+Enter' ); + await page.keyboard.press( 'Shift+Enter' ); // Check the content. const content = await editor.getEditedPostContent(); From 8f516c589a9f54eaeb75ea48ed1c0ac2b5b54353 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Mon, 20 Jun 2022 13:51:40 +0530 Subject: [PATCH 08/11] Addressed review feedbacks --- test/e2e/specs/editor/various/rtl.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 21b0a10f643bd3..d6998b26a8ab11 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -150,7 +150,7 @@ test.describe( 'RTL', () => { page, pageUtils, } ) => { - page.click( 'role=button[name="Add default block"i]' ); + await page.click( 'role=button[name="Add default block"i]' ); // Wait for rich text editor to load. await page.waitForSelector( '.block-editor-rich-text__editable' ); From e80a13795a9eef07e834a2fbf92c7683726d12c7 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Wed, 22 Jun 2022 15:13:53 +0530 Subject: [PATCH 09/11] Remove unused code --- test/e2e/specs/editor/various/rtl.spec.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index d6998b26a8ab11..0aa1ce6051c61e 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -151,10 +151,7 @@ test.describe( 'RTL', () => { pageUtils, } ) => { await page.click( 'role=button[name="Add default block"i]' ); - - // Wait for rich text editor to load. - await page.waitForSelector( '.block-editor-rich-text__editable' ); - + await pageUtils.pressKeyWithModifier( 'primary', 'b' ); await page.keyboard.type( ARABIC_ONE ); await pageUtils.pressKeyWithModifier( 'primary', 'b' ); From 4ced09b674febbb958aa619a3e174167675aa239 Mon Sep 17 00:00:00 2001 From: pavanpatil1 <=> Date: Wed, 22 Jun 2022 19:10:25 +0530 Subject: [PATCH 10/11] Fix styleint issue --- test/e2e/specs/editor/various/rtl.spec.js | 33 +++++++++++------------ 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/test/e2e/specs/editor/various/rtl.spec.js b/test/e2e/specs/editor/various/rtl.spec.js index 0aa1ce6051c61e..f5a2977ec97e2c 100644 --- a/test/e2e/specs/editor/various/rtl.spec.js +++ b/test/e2e/specs/editor/various/rtl.spec.js @@ -44,8 +44,8 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠١٢
-` +٠١٢
+ ` ); } ); @@ -61,12 +61,12 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠
- +٠
+ - -١
-` + +١
+ ` ); } ); @@ -83,8 +83,8 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠١
-` +٠١
+ ` ); } ); @@ -102,8 +102,8 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠١
-` +٠١
+ ` ); } ); @@ -136,12 +136,12 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠
١
٠
١
٠
١
٢
٠
١
٢
٠١٢
- ` +٠١٢
+` ); } ); @@ -61,12 +61,12 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠
- +٠
+ - -١
- ` + +١
+` ); } ); @@ -83,8 +83,8 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠١
- ` +٠١
+` ); } ); @@ -102,8 +102,8 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠١
- ` +٠١
+` ); } ); @@ -136,12 +136,12 @@ test.describe( 'RTL', () => { const content = await editor.getEditedPostContent(); expect( content ).toBe( ` -٠
١
٠
١
٠
١
٢
٠
١
٢