From b1f0b3d41b34465648963206d441c20326106d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <wp@iseulde.com>
Date: Sat, 15 May 2021 19:11:43 +0300
Subject: [PATCH] Fix intermittent embeds failure (#31860)

---
 .../various/__snapshots__/embedding.test.js.snap  |  4 ++--
 .../specs/editor/various/embedding.test.js        | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
index b66bee14aae4ee..8b3d0323430df9 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
@@ -51,8 +51,8 @@ https://www.youtube.com/watch?v=lXMskKTw3Bc
 </div></figure>
 <!-- /wp:embed -->
 
-<!-- wp:embed {\\"url\\":\\"https://cloudup.com/cQFlxqtY4ob\\"} -->
-<figure class=\\"wp-block-embed\\"><div class=\\"wp-block-embed__wrapper\\">
+<!-- wp:embed {\\"url\\":\\"https://cloudup.com/cQFlxqtY4ob\\",\\"type\\":\\"photo\\",\\"providerNameSlug\\":\\"cloudup\\",\\"responsive\\":true} -->
+<figure class=\\"wp-block-embed is-type-photo is-provider-cloudup wp-block-embed-cloudup\\"><div class=\\"wp-block-embed__wrapper\\">
 https://cloudup.com/cQFlxqtY4ob
 </div></figure>
 <!-- /wp:embed -->"
diff --git a/packages/e2e-tests/specs/editor/various/embedding.test.js b/packages/e2e-tests/specs/editor/various/embedding.test.js
index 170965215eceb0..1bc541ff4bbf83 100644
--- a/packages/e2e-tests/specs/editor/various/embedding.test.js
+++ b/packages/e2e-tests/specs/editor/various/embedding.test.js
@@ -33,6 +33,15 @@ const MOCK_EMBED_RICH_SUCCESS_RESPONSE = {
 	version: '1.0',
 };
 
+const MOCK_EMBED_PHOTO_SUCCESS_RESPONSE = {
+	url: 'https://cloudup.com/cQFlxqtY4ob',
+	html: '<p>Mock success response.</p>',
+	type: 'photo',
+	provider_name: 'Cloudup',
+	provider_url: 'https://cloudup.com',
+	version: '1.0',
+};
+
 const MOCK_EMBED_VIDEO_SUCCESS_RESPONSE = {
 	url: 'https://www.youtube.com/watch?v=lXMskKTw3Bc',
 	html: '<iframe width="16" height="9"></iframe>',
@@ -123,7 +132,7 @@ const MOCK_RESPONSES = [
 	},
 	{
 		match: createEmbeddingMatcher( 'https://cloudup.com/cQFlxqtY4ob' ),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_RICH_SUCCESS_RESPONSE ),
+		onRequestMatch: createJSONResponse( MOCK_EMBED_PHOTO_SUCCESS_RESPONSE ),
 	},
 	{
 		match: createEmbeddingMatcher( 'https://twitter.com/notnownikki' ),
@@ -208,6 +217,10 @@ describe( 'Embedding content', () => {
 
 		// Photo content. Should render valid figure element.
 		await insertEmbed( 'https://cloudup.com/cQFlxqtY4ob' );
+		await page.waitForSelector(
+			'iframe[title="Embedded content from cloudup"'
+		);
+
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );