From 1f4e55112e8ea30a38356491b917b86220c9a12d Mon Sep 17 00:00:00 2001
From: Marcelo de Moraes Serpa <boss@fullofcaffeine.com>
Date: Tue, 8 Sep 2020 19:29:30 -0500
Subject: [PATCH 1/8] Add regression E2E test for the classic block
 initialization issue

Issue: https://github.com/WordPress/gutenberg/issues/24696
---
 .../blocks/__snapshots__/classic.test.js.snap |  4 ++
 .../specs/editor/blocks/classic.test.js       | 47 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
index a4461344bb438..ab5206d54577b 100644
--- a/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
+++ b/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
@@ -1,3 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Classic Should not fail after save/reload 1`] = `"test"`;
+
+exports[`Classic Should not fail after save/reload 2`] = `"test"`;
+
 exports[`Classic should be inserted 1`] = `"test"`;
diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index b9302e3a8217e..ce450cd1720f5 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -15,6 +15,8 @@ import {
 	insertBlock,
 	pressKeyWithModifier,
 	clickBlockToolbarButton,
+	switchEditorModeTo,
+	saveDraft,
 } from '@wordpress/e2e-test-utils';
 
 describe( 'Classic', () => {
@@ -46,6 +48,7 @@ describe( 'Classic', () => {
 		// Click the image button.
 		await page.waitForSelector( 'div[aria-label^="Add Media"]' );
 		await page.click( 'div[aria-label^="Add Media"]' );
+
 		await page.click( '.media-menu-item#menu-item-gallery' );
 
 		// Wait for media modal to appear and upload image.
@@ -98,4 +101,48 @@ describe( 'Classic', () => {
 		await page.waitForSelector( '.wp-block[data-type="core/gallery"]' );
 		expect( await getEditedPostContent() ).toMatch( /<!-- wp:gallery/ );
 	} );
+
+	it( 'Should not fail after save/reload', async () => {
+		const mainBlockCSSSelector = 'div[aria-label^="Block: Classic"]';
+
+		const clickClassic = async () => {
+			await page.waitForSelector( mainBlockCSSSelector );
+			await page.click( mainBlockCSSSelector );
+		};
+
+		const errorMessage = async () =>
+			page.$(
+				`${ mainBlockCSSSelector } p.block-editor-warning__message`
+			);
+
+		await insertBlock( 'Classic' );
+
+		// Wait for TinyMCE to initialise.
+		await page.waitForSelector( '.mce-content-body' );
+
+		// Ensure there is focus.
+		await page.focus( '.mce-content-body' );
+		await page.keyboard.type( 'test' );
+
+		// Move focus away.
+		await pressKeyWithModifier( 'shift', 'Tab' );
+
+		// save
+		await saveDraft();
+
+		// reload
+		await page.reload();
+
+		await clickClassic();
+		expect( await errorMessage() ).toBeFalsy();
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+
+		// switch to code editor and back
+		await switchEditorModeTo( 'Code' );
+		await switchEditorModeTo( 'Visual' );
+
+		await clickClassic();
+		expect( await errorMessage() ).toBeFalsy();
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
 } );

From a1af5a67c6cd33811da3e5f55b9fae96cb65399e Mon Sep 17 00:00:00 2001
From: Marcelo de Moraes Serpa <boss@fullofcaffeine.com>
Date: Wed, 9 Sep 2020 16:45:30 -0500
Subject: [PATCH 2/8] Simplify classic block initialization issue regression
 test scenario

Considering commit 65c9f74 is reverted, the only actions needed to reproduce the issue are to:
 * Add the block to the editor, add some content;
 * Save;
 * Reload the editor;
 * Click it. It should error.
---
 .../specs/editor/blocks/classic.test.js       | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index ce450cd1720f5..d35e80c96e7af 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -110,10 +110,12 @@ describe( 'Classic', () => {
 			await page.click( mainBlockCSSSelector );
 		};
 
-		const errorMessage = async () =>
-			page.$(
-				`${ mainBlockCSSSelector } p.block-editor-warning__message`
-			);
+		// Might move to utils if this becomes useful enough for other tests
+		const runWithoutCache = async ( cb ) => {
+			await page.setCacheEnabled( false );
+			await cb();
+			await page.setCacheEnabled( true );
+		};
 
 		await insertBlock( 'Classic' );
 
@@ -127,22 +129,17 @@ describe( 'Classic', () => {
 		// Move focus away.
 		await pressKeyWithModifier( 'shift', 'Tab' );
 
-		// save
+		// Save
 		await saveDraft();
 
-		// reload
-		await page.reload();
-
-		await clickClassic();
-		expect( await errorMessage() ).toBeFalsy();
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		// switch to code editor and back
-		await switchEditorModeTo( 'Code' );
-		await switchEditorModeTo( 'Visual' );
-
-		await clickClassic();
-		expect( await errorMessage() ).toBeFalsy();
-		expect( await getEditedPostContent() ).toMatchSnapshot();
+		// Reload
+		// Disabling the browser disk cache is needed in order to reproduce the issue
+		// in case it regresses. To test this, revert commit 65c9f74, build and run the test.
+		await runWithoutCache( async () => {
+			await page.reload();
+			await clickClassic();
+			expect( console ).not.toHaveErrored();
+			expect( await getEditedPostContent() ).toMatchSnapshot();
+		} );
 	} );
 } );

From 4dbe8633a622525731d75bc4d8fd50d3000074d3 Mon Sep 17 00:00:00 2001
From: Marcelo Serpa <boss@fullofcaffeine.com>
Date: Wed, 9 Sep 2020 17:42:32 -0500
Subject: [PATCH 3/8] Move non-relevant lines out of the `runWithoutCache`

Co-authored-by: Bernie Reiter <ockham@raz.or.at>
---
 packages/e2e-tests/specs/editor/blocks/classic.test.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index d35e80c96e7af..58f87231eb8f3 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -135,11 +135,9 @@ describe( 'Classic', () => {
 		// Reload
 		// Disabling the browser disk cache is needed in order to reproduce the issue
 		// in case it regresses. To test this, revert commit 65c9f74, build and run the test.
-		await runWithoutCache( async () => {
-			await page.reload();
-			await clickClassic();
-			expect( console ).not.toHaveErrored();
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
+		await runWithoutCache( () => page.reload() );
+		await clickClassic();
+		expect( console ).not.toHaveErrored();
+		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 } );

From 56c55f469454f1453daa1c727dd80e3ac62bb4fd Mon Sep 17 00:00:00 2001
From: Marcelo de Moraes Serpa <boss@fullofcaffeine.com>
Date: Wed, 9 Sep 2020 18:17:44 -0500
Subject: [PATCH 4/8] Remove obsolete snapshot

---
 .../specs/editor/blocks/__snapshots__/classic.test.js.snap      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
index ab5206d54577b..92fc0cb47b8db 100644
--- a/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
+++ b/packages/e2e-tests/specs/editor/blocks/__snapshots__/classic.test.js.snap
@@ -2,6 +2,4 @@
 
 exports[`Classic Should not fail after save/reload 1`] = `"test"`;
 
-exports[`Classic Should not fail after save/reload 2`] = `"test"`;
-
 exports[`Classic should be inserted 1`] = `"test"`;

From d300c6ff20aba393b36a6f87436b7eee37baee4e Mon Sep 17 00:00:00 2001
From: Marcelo de Moraes Serpa <boss@fullofcaffeine.com>
Date: Wed, 9 Sep 2020 21:03:49 -0500
Subject: [PATCH 5/8] Remove unused import

---
 packages/e2e-tests/specs/editor/blocks/classic.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index 58f87231eb8f3..36919e2203e1e 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -15,7 +15,6 @@ import {
 	insertBlock,
 	pressKeyWithModifier,
 	clickBlockToolbarButton,
-	switchEditorModeTo,
 	saveDraft,
 } from '@wordpress/e2e-test-utils';
 

From 32f099813921fe78cccbd28a64d7dfde10095538 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 10 Sep 2020 15:15:39 +0200
Subject: [PATCH 6/8] Rename selector

---
 packages/e2e-tests/specs/editor/blocks/classic.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index 36919e2203e1e..882c5275bf1bc 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -102,11 +102,11 @@ describe( 'Classic', () => {
 	} );
 
 	it( 'Should not fail after save/reload', async () => {
-		const mainBlockCSSSelector = 'div[aria-label^="Block: Classic"]';
+		const classicBlockSelector = 'div[aria-label^="Block: Classic"]';
 
 		const clickClassic = async () => {
-			await page.waitForSelector( mainBlockCSSSelector );
-			await page.click( mainBlockCSSSelector );
+			await page.waitForSelector( classicBlockSelector );
+			await page.click( classicBlockSelector );
 		};
 
 		// Might move to utils if this becomes useful enough for other tests

From a96c8db94c34812cf4b1585dc5900f550537738c Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 10 Sep 2020 15:20:35 +0200
Subject: [PATCH 7/8] Use focus instead of click, inline

---
 .../e2e-tests/specs/editor/blocks/classic.test.js    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index 882c5275bf1bc..4d0c8f702223d 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -102,13 +102,6 @@ describe( 'Classic', () => {
 	} );
 
 	it( 'Should not fail after save/reload', async () => {
-		const classicBlockSelector = 'div[aria-label^="Block: Classic"]';
-
-		const clickClassic = async () => {
-			await page.waitForSelector( classicBlockSelector );
-			await page.click( classicBlockSelector );
-		};
-
 		// Might move to utils if this becomes useful enough for other tests
 		const runWithoutCache = async ( cb ) => {
 			await page.setCacheEnabled( false );
@@ -135,7 +128,10 @@ describe( 'Classic', () => {
 		// Disabling the browser disk cache is needed in order to reproduce the issue
 		// in case it regresses. To test this, revert commit 65c9f74, build and run the test.
 		await runWithoutCache( () => page.reload() );
-		await clickClassic();
+
+		const classicBlockSelector = 'div[aria-label^="Block: Classic"]';
+		await page.waitForSelector( classicBlockSelector );
+		await page.focus( classicBlockSelector );
 		expect( console ).not.toHaveErrored();
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );

From 748c799dcc294322aa7392549cfa724a7a0fbbc5 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 10 Sep 2020 15:38:57 +0200
Subject: [PATCH 8/8] Add exception handling

---
 packages/e2e-tests/specs/editor/blocks/classic.test.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/classic.test.js b/packages/e2e-tests/specs/editor/blocks/classic.test.js
index 4d0c8f702223d..d48cd0b826784 100644
--- a/packages/e2e-tests/specs/editor/blocks/classic.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/classic.test.js
@@ -104,9 +104,12 @@ describe( 'Classic', () => {
 	it( 'Should not fail after save/reload', async () => {
 		// Might move to utils if this becomes useful enough for other tests
 		const runWithoutCache = async ( cb ) => {
-			await page.setCacheEnabled( false );
-			await cb();
-			await page.setCacheEnabled( true );
+			try {
+				await page.setCacheEnabled( false );
+				await cb();
+			} finally {
+				await page.setCacheEnabled( true );
+			}
 		};
 
 		await insertBlock( 'Classic' );