Fix fixture serialization with double newline ending (#2069)

blocks/test/fixtures/core__cover-text.json

@@ -1,12 +1,14 @@
 [
     {
         "uid": "_uid_0",
-        "isValid": false,
         "name": "core/cover-text",
+        "isValid": false,
         "attributes": {
             "backgroundColor": "#fcb900",
             "content": [
-                [ "Text with color." ]
+                [
+                    "Text with color."
+                ]
             ]
         },
         "originalContent": "<div style=\"background-color:#fcb900\"><p>Text with color.</p></div>"

blocks/test/fixtures/core__latest-posts.html

@@ -1 +1 @@
-<!-- wp:core/latest-posts {"postsToShow":5,"displayPostDate":true} /-->
+<!-- wp:core/latest-posts {"postsToShow":5,"displayPostDate":false} /-->

blocks/test/fixtures/core__latest-posts.json

@@ -4,10 +4,10 @@
         "name": "core/latest-posts",
         "isValid": true,
         "attributes": {
-            "columns": 3,
             "postsToShow": 5,
-            "displayPostDate": true,
-            "layout": "list"
+            "displayPostDate": false,
+            "layout": "list",
+            "columns": 3
         }
     }
 ]

blocks/test/fixtures/core__latest-posts.parsed.json

@@ -3,7 +3,7 @@
         "blockName": "core/latest-posts",
         "attrs": {
             "postsToShow": 5,
-            "displayPostDate": true
+            "displayPostDate": false
         },
         "rawContent": ""
     },

blocks/test/fixtures/core__latest-posts.serialized.html

@@ -1 +1 @@
-<!-- wp:core/latest-posts {"displayPostDate":true} /-->
+<!-- wp:core/latest-posts /-->

blocks/test/fixtures/core__latest-posts__displayPostDate.html

@@ -0,0 +1 @@
+<!-- wp:core/latest-posts {"postsToShow":5,"displayPostDate":true} /-->

blocks/test/fixtures/core__latest-posts__displayPostDate.json

@@ -0,0 +1,13 @@
+[
+    {
+        "uid": "_uid_0",
+        "name": "core/latest-posts",
+        "isValid": true,
+        "attributes": {
+            "postsToShow": 5,
+            "displayPostDate": true,
+            "layout": "list",
+            "columns": 3
+        }
+    }
+]

blocks/test/fixtures/core__latest-posts__displayPostDate.parsed.json

@@ -0,0 +1,14 @@
+[
+    {
+        "blockName": "core/latest-posts",
+        "attrs": {
+            "postsToShow": 5,
+            "displayPostDate": true
+        },
+        "rawContent": ""
+    },
+    {
+        "attrs": {},
+        "rawContent": "\n"
+    }
+]

blocks/test/fixtures/core__latest-posts__displayPostDate.serialized.html

@@ -0,0 +1 @@
+<!-- wp:core/latest-posts {"displayPostDate":true} /-->

blocks/test/fixtures/core__text__align-right.json

@@ -4,13 +4,13 @@
         "name": "core/text",
         "isValid": true,
         "attributes": {
+            "dropCap": false,
             "align": "right",
             "content": [
                 [
                     "... like this one, which is separate from the above and right aligned."
                 ]
-            ],
-            "dropCap": false
+            ]
         }
     }
 ]

blocks/test/full-content.js

@@ -3,7 +3,7 @@
  */
 import fs from 'fs';
 import path from 'path';
-import { uniq, isObject, omit, startsWith } from 'lodash';
+import { uniq, isObject, omit, startsWith, get } from 'lodash';
 import { format } from 'util';
 
 /**
@@ -172,7 +172,7 @@ describe( 'full post content fixture', () => {
 
 			if ( ! serializedExpected ) {
 				if ( process.env.GENERATE_MISSING_FIXTURES ) {
-					serializedExpected = serializedActual + '\n';
+					serializedExpected = serializedActual;
 					writeFixtureFile( f + '.serialized.html', serializedExpected );
 				} else {
 					throw new Error(
@@ -204,15 +204,23 @@ describe( 'full post content fixture', () => {
 					startsWith( basename, nameToFilename + '__' )
 				) )
 				.map( basename => {
-					const filename = basename + '.html';
-					const parsedBlockFilename = basename + '.json';
+					// The file that contains the input HTML for this test.
+					const inputFilename = basename + '.html';
+					// The parser output for this test.  For missing files,
+					// JSON.parse( null ) === null.
+					const parserOutput = JSON.parse(
+						readFixtureFile( basename + '.json' )
+					);
+					// The name of the first block that this fixture file
+					// contains (if any).
+					const firstBlock = get( parserOutput, [ '0', 'name' ], null );
 					return {
-						filename,
-						contents: readFixtureFile( filename ),
-						parsed: JSON.parse( readFixtureFile( parsedBlockFilename ) )[ 0 ],
+						filename: inputFilename,
+						parserOutput,
+						firstBlock,
 					};
 				} )
-				.filter( fixture => fixture.contents !== null );
+				.filter( fixture => fixture.parserOutput !== null );
 
 			if ( ! foundFixtures.length ) {
 				errors.push( format(
@@ -223,7 +231,7 @@ describe( 'full post content fixture', () => {
 			}
 
 			foundFixtures.forEach( fixture => {
-				if ( name !== fixture.parsed.name ) {
+				if ( name !== fixture.firstBlock ) {
 					errors.push( format(
 						'Expected fixture file \'%s\' to test the \'%s\' block.',
 						fixture.filename,

package.json

@@ -127,6 +127,9 @@
     "dev": "cross-env BABEL_ENV=default webpack --watch",
     "test": "npm run lint && npm run test-unit",
     "ci": "concurrently \"npm run lint && npm run build\" \"npm run test-unit:coverage-ci\"",
+    "fixtures:clean": "rimraf \"blocks/test/fixtures/*.+(json|serialized.html)\"",
+    "fixtures:generate": "GENERATE_MISSING_FIXTURES=y npm run test-unit",
+    "fixtures:regenerate": "npm run fixtures:clean && npm run fixtures:generate",
     "package-plugin": "./bin/build-plugin-zip.sh",
     "docs-start": "./docutron/bin/cli.js start",
     "docs-build": "./docutron/bin/cli.js build",