Remove empty attributes from JSON test fixtures

Only applies to nested elements, not to blocks themselves.
WordPress · May 23, 2017 · 5c6d335 · 5c6d335
1 parent 4333b90
commit 5c6d335
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/blocks/test/fixtures/core-heading-h2-em.json b/blocks/test/fixtures/core-heading-h2-em.json
@@ -7,7 +7,6 @@
                 "The ",
                 {
                     "type": "em",
-                    "attributes": {},
                     "children": "Inserter"
                 },
                 " Tool"

diff --git a/blocks/test/fixtures/core-list-ul.json b/blocks/test/fixtures/core-list-ul.json
@@ -7,37 +7,30 @@
             "values": [
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": "Text & Headings"
                 },
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": "Images & Videos"
                 },
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": "Galleries"
                 },
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": "Embeds, like YouTube, Tweets, or other WordPress posts."
                 },
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": "Layout blocks, like Buttons, Hero Images, Separators, etc."
                 },
                 {
                     "type": "li",
-                    "attributes": {},
                     "children": [
                         "And ",
                         {
                             "type": "em",
-                            "attributes": {},
                             "children": "Lists"
                         },
                         " like this one of course :)"

diff --git a/blocks/test/fixtures/core-preformatted.json b/blocks/test/fixtures/core-preformatted.json
@@ -7,13 +7,11 @@
                 "Some ",
                 {
                     "type": "em",
-                    "attributes": {},
                     "children": "preformatted"
                 },
                 " text...",
                 {
-                    "type": "br",
-                    "attributes": {}
+                    "type": "br"
                 },
                 "And more!"
             ]

diff --git a/blocks/test/fixtures/core-text-multi-paragraph.json b/blocks/test/fixtures/core-text-multi-paragraph.json
@@ -6,25 +6,21 @@
             "content": [
                 {
                     "type": "p",
-                    "attributes": {},
                     "children": [
                         "The goal of this new editor is to make adding rich content to WordPress simple and enjoyable. This whole post is composed of ",
                         {
                             "type": "em",
-                            "attributes": {},
                             "children": "pieces of content"
                         },
                         "—somewhat similar to LEGO bricks—that you can move around and interact with. Move your cursor around and you'll notice the different blocks light up with outlines and arrows. Press the arrows to reposition blocks quickly, without fearing about losing things in the process of copying and pasting."
                     ]
                 },
                 {
                     "type": "p",
-                    "attributes": {},
                     "children": [
                         "What you are reading now is a ",
                         {
                             "type": "strong",
-                            "attributes": {},
                             "children": "text block"
                         },
                         ", the most basic block of all. A text block can have multiple paragraphs, if that's how you prefer to write your posts. But you can also split it by hitting enter twice. Once blocks are split they get their own controls to be moved freely around the post..."

diff --git a/blocks/test/full-content.js b/blocks/test/full-content.js
@@ -53,8 +53,11 @@ function normalizeReactTree( element ) {
 	if ( isObject( element ) ) {
 		const toReturn = {
 			type: element.type,
-			attributes: omit( element.props, 'children' ),
 		};
+		const attributes = omit( element.props, 'children' );
+		if ( Object.keys( attributes ).length ) {
+			toReturn.attributes = attributes;
+		}
 		if ( element.props.children ) {
 			toReturn.children = normalizeReactTree( element.props.children );
 		}