From 7103a278d18428aff3ed3421ce16cb22486bd55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <ella@vandurpe.com>
Date: Tue, 27 Oct 2020 15:35:31 +0100
Subject: [PATCH 1/2] Fix RTL e2e tests

---
 .../various/__snapshots__/rtl.test.js.snap    | 10 +++-----
 .../specs/editor/various/rtl.test.js          | 23 ++++++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/rtl.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/rtl.test.js.snap
index a8b94682a45963..19b4e8c305acc2 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/rtl.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/rtl.test.js.snap
@@ -8,11 +8,11 @@ exports[`RTL should arrow navigate 1`] = `
 
 exports[`RTL should arrow navigate between blocks 1`] = `
 "<!-- wp:paragraph -->
-<p>٠</p>
+<p>٠<br>١</p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->
-<p><br>١١٠<br><br>٢</p>
+<p>٠<br>١<br>٢</p>
 <!-- /wp:paragraph -->"
 `;
 
@@ -24,11 +24,7 @@ exports[`RTL should merge backward 1`] = `
 
 exports[`RTL should merge forward 1`] = `
 "<!-- wp:paragraph -->
-<p>٠</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p></p>
+<p>٠١</p>
 <!-- /wp:paragraph -->"
 `;
 
diff --git a/packages/e2e-tests/specs/editor/various/rtl.test.js b/packages/e2e-tests/specs/editor/various/rtl.test.js
index 831557b9c52234..6e39d84225e09c 100644
--- a/packages/e2e-tests/specs/editor/various/rtl.test.js
+++ b/packages/e2e-tests/specs/editor/various/rtl.test.js
@@ -5,6 +5,7 @@ import {
 	createNewPost,
 	getEditedPostContent,
 	pressKeyWithModifier,
+	visitAdminPage,
 } from '@wordpress/e2e-test-utils';
 
 // Avoid using three, as it looks too much like two with some fonts.
@@ -12,13 +13,28 @@ const ARABIC_ZERO = '٠';
 const ARABIC_ONE = '١';
 const ARABIC_TWO = '٢';
 
+async function switchLanguage( code ) {
+	await visitAdminPage( 'options-general.php' );
+	await page.waitForSelector( `select#WPLANG option[value="${ code }"]` );
+	await page.select( 'select#WPLANG', code );
+	await page.click( '#submit' );
+	await page.waitForNavigation();
+}
+
 describe( 'RTL', () => {
+	beforeAll( async () => {
+		await switchLanguage( 'ar' );
+	} );
+
 	beforeEach( async () => {
 		await createNewPost();
 	} );
 
+	afterAll( async () => {
+		await switchLanguage( '' );
+	} );
+
 	it( 'should arrow navigate', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		// We need at least three characters as arrow navigation *from* the
@@ -36,7 +52,6 @@ describe( 'RTL', () => {
 	} );
 
 	it( 'should split', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		await page.keyboard.type( ARABIC_ZERO );
@@ -48,7 +63,6 @@ describe( 'RTL', () => {
 	} );
 
 	it( 'should merge backward', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		await page.keyboard.type( ARABIC_ZERO );
@@ -61,7 +75,6 @@ describe( 'RTL', () => {
 	} );
 
 	it( 'should merge forward', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		await page.keyboard.type( ARABIC_ZERO );
@@ -75,7 +88,6 @@ describe( 'RTL', () => {
 	} );
 
 	it( 'should arrow navigate between blocks', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		await page.keyboard.type( ARABIC_ZERO );
@@ -101,7 +113,6 @@ describe( 'RTL', () => {
 	} );
 
 	it( 'should navigate inline boundaries', async () => {
-		await page.evaluate( () => ( document.dir = 'rtl' ) );
 		await page.keyboard.press( 'Enter' );
 
 		// Wait for rich text editor to load.

From 61cc85ac8f0e0f6dec1f0a8bddea9390cc47c1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <ella@vandurpe.com>
Date: Tue, 27 Oct 2020 16:17:21 +0100
Subject: [PATCH 2/2] try different approach

---
 .../specs/editor/various/rtl.test.js          | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/rtl.test.js b/packages/e2e-tests/specs/editor/various/rtl.test.js
index 6e39d84225e09c..67f66ee77cc63a 100644
--- a/packages/e2e-tests/specs/editor/various/rtl.test.js
+++ b/packages/e2e-tests/specs/editor/various/rtl.test.js
@@ -5,7 +5,6 @@ import {
 	createNewPost,
 	getEditedPostContent,
 	pressKeyWithModifier,
-	visitAdminPage,
 } from '@wordpress/e2e-test-utils';
 
 // Avoid using three, as it looks too much like two with some fonts.
@@ -13,25 +12,12 @@ const ARABIC_ZERO = '٠';
 const ARABIC_ONE = '١';
 const ARABIC_TWO = '٢';
 
-async function switchLanguage( code ) {
-	await visitAdminPage( 'options-general.php' );
-	await page.waitForSelector( `select#WPLANG option[value="${ code }"]` );
-	await page.select( 'select#WPLANG', code );
-	await page.click( '#submit' );
-	await page.waitForNavigation();
-}
-
 describe( 'RTL', () => {
-	beforeAll( async () => {
-		await switchLanguage( 'ar' );
-	} );
-
 	beforeEach( async () => {
 		await createNewPost();
-	} );
-
-	afterAll( async () => {
-		await switchLanguage( '' );
+		await page.evaluate( () => {
+			document.querySelector( '.is-root-container' ).dir = 'rtl';
+		} );
 	} );
 
 	it( 'should arrow navigate', async () => {