From 74bb68a3df29ef2331005fc9b629ad4dc4411940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <andres.maneiro@automattic.com>
Date: Fri, 9 Oct 2020 13:37:27 +0200
Subject: [PATCH] Fix core__quote__style-2 test

---
 .../blocks/core__quote__deprecated-2.json      |  3 +--
 .../core__quote__deprecated-2.serialized.html  |  5 ++++-
 .../fixtures/blocks/core__quote__style-2.html  |  2 +-
 .../fixtures/blocks/core__quote__style-2.json  | 17 ++++++++++++++---
 .../blocks/core__quote__style-2.parsed.json    | 18 +++++++++++++++---
 .../core__quote__style-2.serialized.html       |  4 +++-
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.json
index 7270825d5ea7e..7b9320632cc52 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.json
@@ -2,9 +2,8 @@
     {
         "clientId": "_clientId_0",
         "name": "core/quote",
-        "isValid": true,
+        "isValid": false,
         "attributes": {
-            "value": "<p>Testing deprecated quote block...</p>",
             "citation": "...with a caption",
             "align": "right"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.serialized.html
index 08271ab418b33..ea7b81be52e9d 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__deprecated-2.serialized.html
@@ -1,3 +1,6 @@
 <!-- wp:quote {"align":"right"} -->
-<blockquote class="wp-block-quote has-text-align-right"><p>Testing deprecated quote block...</p><cite>...with a caption</cite></blockquote>
+<blockquote style="text-align:right" class="wp-block-quote">
+	<p>Testing deprecated quote block...</p>
+	<cite>...with a caption</cite>
+</blockquote>
 <!-- /wp:quote -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.html b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.html
index d4ecdca350df1..ad3d70fb09879 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.html
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.html
@@ -1,3 +1,3 @@
 <!-- wp:core/quote {"className":"is-style-large"} -->
-<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>
+<blockquote class="wp-block-quote is-style-large"><!-- wp:core/paragraph --><p>There is no greater agony than bearing an untold story inside you.</p><!-- /wp:core/paragraph --><cite>Maya Angelou</cite></blockquote>
 <!-- /wp:core/quote -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.json b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.json
index 300770c72c007..365cf3f95af74 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.json
@@ -4,11 +4,22 @@
         "name": "core/quote",
         "isValid": true,
         "attributes": {
-            "value": "<p>There is no greater agony than bearing an untold story inside you.</p>",
             "citation": "Maya Angelou",
             "className": "is-style-large"
         },
-        "innerBlocks": [],
-        "originalContent": "<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>"
+        "innerBlocks": [
+            {
+                "clientId": "_clientId_0",
+                "name": "core/paragraph",
+                "isValid": true,
+                "attributes": {
+                    "content": "There is no greater agony than bearing an untold story inside you.",
+                    "dropCap": false
+                },
+                "innerBlocks": [],
+                "originalContent": "<p>There is no greater agony than bearing an untold story inside you.</p>"
+            }
+        ],
+        "originalContent": "<blockquote class=\"wp-block-quote is-style-large\"><cite>Maya Angelou</cite></blockquote>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.parsed.json b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.parsed.json
index 5543ac33cfd6c..37c3b5eacec59 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.parsed.json
@@ -4,10 +4,22 @@
         "attrs": {
             "className": "is-style-large"
         },
-        "innerBlocks": [],
-        "innerHTML": "\n<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>\n",
+        "innerBlocks": [
+            {
+                "blockName": "core/paragraph",
+                "attrs": {},
+                "innerBlocks": [],
+                "innerHTML": "<p>There is no greater agony than bearing an untold story inside you.</p>",
+                "innerContent": [
+                    "<p>There is no greater agony than bearing an untold story inside you.</p>"
+                ]
+            }
+        ],
+        "innerHTML": "\n<blockquote class=\"wp-block-quote is-style-large\"><cite>Maya Angelou</cite></blockquote>\n",
         "innerContent": [
-            "\n<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>\n"
+            "\n<blockquote class=\"wp-block-quote is-style-large\">",
+            null,
+            "<cite>Maya Angelou</cite></blockquote>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.serialized.html
index b257de24088e9..13c2762059ecf 100644
--- a/packages/e2e-tests/fixtures/blocks/core__quote__style-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__quote__style-2.serialized.html
@@ -1,3 +1,5 @@
 <!-- wp:quote {"className":"is-style-large"} -->
-<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>
+<blockquote class="wp-block-quote is-style-large"><!-- wp:paragraph -->
+<p>There is no greater agony than bearing an untold story inside you.</p>
+<!-- /wp:paragraph --><cite>Maya Angelou</cite></blockquote>
 <!-- /wp:quote -->