When a new line exists at the end of an HTML fixture file the parser …

…interprets this as an empty block. The result is an empty block object in the resulting parsed JSON. (#30981) Trimming the output string of the HTML prevents this from occurring. We're also re-generating the fixtures to remove the empty blocks.
WordPress · Apr 20, 2021 · b3fe0be · b3fe0be
1 parent 20b9705
commit b3fe0be
Show file tree

Hide file tree

Showing 195 changed files with 172 additions and 1,339 deletions.
diff --git a/packages/e2e-tests/fixtures/blocks/core__4-invalid-starting-letter.parsed.json b/packages/e2e-tests/fixtures/blocks/core__4-invalid-starting-letter.parsed.json
@@ -3,7 +3,9 @@
 		"blockName": null,
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "<!-- wp:core/4-invalid /-->\n",
-		"innerContent": [ "<!-- wp:core/4-invalid /-->\n" ]
+		"innerHTML": "<!-- wp:core/4-invalid /-->",
+		"innerContent": [
+			"<!-- wp:core/4-invalid /-->"
+		]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json b/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json
@@ -9,12 +9,5 @@
 		"innerContent": [
 			"\n<figure class=\"wp-block-audio alignright\">\n    <audio controls=\"\" src=\"data:audio/mpeg;base64,/+MYxAAAAANIAAAAAExBTUUzLjk4LjIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"></audio>\n</figure>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__audio__deprecated-1.parsed.json b/packages/e2e-tests/fixtures/blocks/core__audio__deprecated-1.parsed.json
@@ -7,12 +7,5 @@
 		"innerContent": [
 			"\n<figure class=\"wp-block-audio\"><audio controls></audio></figure>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__block.parsed.json b/packages/e2e-tests/fixtures/blocks/core__block.parsed.json
@@ -7,12 +7,5 @@
 		"innerBlocks": [],
 		"innerHTML": "",
 		"innerContent": []
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__button__border_radius__deprecated.parsed.json b/packages/e2e-tests/fixtures/blocks/core__button__border_radius__deprecated.parsed.json
@@ -15,6 +15,8 @@
 		"attrs": {},
 		"innerBlocks": [],
 		"innerHTML": "</div>",
-		"innerContent": [ "</div>" ]
+		"innerContent": [
+			"</div>"
+		]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__button__center__deprecated.parsed.json b/packages/e2e-tests/fixtures/blocks/core__button__center__deprecated.parsed.json
@@ -9,12 +9,5 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-button aligncenter\"><a class=\"wp-block-button__link\" href=\"https://github.com/WordPress/gutenberg\">Help build Gutenberg</a></div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__button__squared.parsed.json b/packages/e2e-tests/fixtures/blocks/core__button__squared.parsed.json
@@ -17,12 +17,5 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-button\"><a class=\"wp-block-button__link no-border-radius has-text-color has-background\" style=\"background-color:#aa5a20;color:#1b9b6c\">My button</a></div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__buttons.parsed.json b/packages/e2e-tests/fixtures/blocks/core__buttons.parsed.json
@@ -33,12 +33,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__buttons__deprecated-1.parsed.json b/packages/e2e-tests/fixtures/blocks/core__buttons__deprecated-1.parsed.json
@@ -32,12 +32,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__calendar.parsed.json b/packages/e2e-tests/fixtures/blocks/core__calendar.parsed.json
@@ -5,12 +5,5 @@
 		"innerBlocks": [],
 		"innerHTML": "",
 		"innerContent": []
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__categories.parsed.json b/packages/e2e-tests/fixtures/blocks/core__categories.parsed.json
@@ -9,12 +9,5 @@
 		"innerBlocks": [],
 		"innerHTML": "",
 		"innerContent": []
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__code.parsed.json b/packages/e2e-tests/fixtures/blocks/core__code.parsed.json
@@ -7,12 +7,5 @@
 		"innerContent": [
 			"\n<pre class=\"wp-block-code\"><code>export default function MyButton() {\n\treturn &lt;Button&gt;Click Me!&lt;/Button&gt;;\n}</code></pre>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__column.parsed.json b/packages/e2e-tests/fixtures/blocks/core__column.parsed.json
@@ -8,14 +8,18 @@
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<p>Column One, Paragraph One</p>\n\t",
-				"innerContent": [ "\n\t<p>Column One, Paragraph One</p>\n\t" ]
+				"innerContent": [
+					"\n\t<p>Column One, Paragraph One</p>\n\t"
+				]
 			},
 			{
 				"blockName": "core/paragraph",
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<p>Column One, Paragraph Two</p>\n\t",
-				"innerContent": [ "\n\t<p>Column One, Paragraph Two</p>\n\t" ]
+				"innerContent": [
+					"\n\t<p>Column One, Paragraph Two</p>\n\t"
+				]
 			}
 		],
 		"innerHTML": "\n<div class=\"wp-block-column\">\n\t\n\t\n</div>\n",
@@ -26,12 +30,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__column__deprecated-1.parsed.json b/packages/e2e-tests/fixtures/blocks/core__column__deprecated-1.parsed.json
@@ -10,14 +10,18 @@
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<p>Column One, Paragraph One</p>\n\t",
-				"innerContent": [ "\n\t<p>Column One, Paragraph One</p>\n\t" ]
+				"innerContent": [
+					"\n\t<p>Column One, Paragraph One</p>\n\t"
+				]
 			},
 			{
 				"blockName": "core/paragraph",
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<p>Column One, Paragraph Two</p>\n\t",
-				"innerContent": [ "\n\t<p>Column One, Paragraph Two</p>\n\t" ]
+				"innerContent": [
+					"\n\t<p>Column One, Paragraph Two</p>\n\t"
+				]
 			}
 		],
 		"innerHTML": "\n<div class=\"wp-block-column\" style=\"flex-basis:33.33%\">\n\t\n\t\n</div>\n",
@@ -28,12 +32,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__columns.parsed.json
@@ -78,12 +78,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.parsed.json b/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.parsed.json
@@ -62,12 +62,5 @@
 			null,
 			"\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json
@@ -26,12 +26,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-1.parsed.json
@@ -10,12 +10,5 @@
 		"innerContent": [
 			"\n<section class=\"wp-block-cover-image has-background-dim\" style=\"background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==)\"><h2><strong>Cover Image</strong></h2></section>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-2.parsed.json
@@ -10,12 +10,5 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-cover-image has-background-dim\" style=\"background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==)\"><p class=\"wp-block-cover-image-text\"><strong>Cover Block</strong></p></div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-3.parsed.json
@@ -10,12 +10,5 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-cover has-background-dim\" style=\"background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==)\"><p class=\"wp-block-cover-text\"><strong>Cover Block</strong></p></div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-4.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-4.parsed.json
@@ -30,12 +30,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-5.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-5.parsed.json
@@ -26,12 +26,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-6.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__deprecated-6.parsed.json
@@ -32,7 +32,9 @@
 		"attrs": {},
 		"innerBlocks": [],
 		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
+		"innerContent": [
+			"\n"
+		]
 	},
 	{
 		"blockName": "core/cover",
@@ -54,7 +56,9 @@
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t\t<p></p>\n\t\t",
-				"innerContent": [ "\n\t\t<p></p>\n\t\t" ]
+				"innerContent": [
+					"\n\t\t<p></p>\n\t\t"
+				]
 			}
 		],
 		"innerHTML": "\n<div\n\tclass=\"wp-block-cover alignfull\"\n\tstyle=\"background-image: url( https://example.com/some-background-image.png ); min-height: 48vw; background-position: 50% 40%;\"\n>\n\t<div class=\"wp-block-cover__inner-container\">\n\t\t\n\t</div>\n</div>\n",
@@ -69,7 +73,9 @@
 		"attrs": {},
 		"innerBlocks": [],
 		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
+		"innerContent": [
+			"\n"
+		]
 	},
 	{
 		"blockName": "core/cover",
@@ -99,12 +105,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__gradient-image.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__gradient-image.parsed.json
@@ -27,12 +27,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover__gradient-video.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover__gradient-video.parsed.json
@@ -28,12 +28,5 @@
 			null,
 			"\n\t</div>\n</div>\n"
 		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n",
-		"innerContent": [ "\n" ]
 	}
 ]