diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html new file mode 100644 index 0000000000..498c7752e3 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html @@ -0,0 +1,26 @@ + +
+ +
+ Image gallery image +
+ + + +
+ Image gallery image +
+ +
Gallery Caption
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json new file mode 100644 index 0000000000..12b5166066 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json @@ -0,0 +1,46 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "images": [], + "ids": [], + "shortCodeTransforms": [], + "caption": "Gallery Caption", + "imageCrop": true, + "fixedHeight": true, + "linkTo": "none", + "sizeSlug": "large", + "allowResize": false, + "className": "columns-2" + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190", + "alt": "Image gallery image", + "caption": "", + "id": 1421, + "sizeSlug": "large", + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580", + "alt": "Image gallery image", + "caption": "", + "id": 1440, + "sizeSlug": "large", + "linkDestination": "none" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json new file mode 100644 index 0000000000..619adef3d8 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json @@ -0,0 +1,62 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "linkTo": "none" + }, + "innerBlocks": [ + { + "blockName": "core/image", + "attrs": { + "id": 1421, + "sizeSlug": "large", + "linkDestination": "none", + "inheritedAttributes": { + "linkDestination": true, + "linkTarget": true, + "sizeSlug": true + } + }, + "innerBlocks": [], + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", + "innerContent": [ + "\n\t
\n\t\t\n\t
\n\t" + ] + }, + { + "blockName": "core/image", + "attrs": { + "id": 1440, + "sizeSlug": "large", + "linkDestination": "none", + "inheritedAttributes": { + "linkDestination": true, + "linkTarget": true, + "sizeSlug": true + } + }, + "innerBlocks": [], + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", + "innerContent": [ + "\n\t
\n\t\t\n\t
\n\t" + ] + } + ], + "innerHTML": "\n\n\t\n\n\t\n\t
Gallery Caption
\n\n", + "innerContent": [ + "\n\n\t", + null, + "\n\n\t", + null, + "\n\t
Gallery Caption
\n\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } + +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html new file mode 100644 index 0000000000..0eeab028d1 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html @@ -0,0 +1,9 @@ + +
+
Image gallery image
+ + + +
Image gallery image
+
Gallery Caption
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html new file mode 100644 index 0000000000..18e3f1d8c8 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html @@ -0,0 +1,26 @@ + +
+ +
+ Image gallery image +
+ + + +
+ Image gallery image +
+ +
Gallery Caption
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.html b/tests/phpunit/data/blocks/fixtures/core__gallery.html index 54f9991f88..3db587c8d7 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.html @@ -1,14 +1,24 @@ -
- +
+
- Image gallery image + Image gallery image
- +
- Image gallery image + Image gallery image
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.json b/tests/phpunit/data/blocks/fixtures/core__gallery.json index 0225422123..8b7a1000d3 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.json +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.json @@ -19,9 +19,10 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190", "alt": "Image gallery image", "caption": "", + "id": 1421, "sizeSlug": "large", "linkDestination": "none" }, @@ -31,9 +32,10 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "http://google.com/hi.png", + "url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580", "alt": "Image gallery image", "caption": "", + "id": 1440, "sizeSlug": "large", "linkDestination": "none" }, diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json index 00a75f5f13..4ddf4ca36e 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json @@ -9,44 +9,45 @@ { "blockName": "core/image", "attrs": { + "id": 1421, "sizeSlug": "large", "linkDestination": "none" }, "innerBlocks": [], - "innerHTML": "\n\t
\n\t\t\"Image\n\t
\n\t", + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", "innerContent": [ - "\n\t
\n\t\t\"Image\n\t
\n\t" + "\n\t
\n\t\t\n\t
\n\t" ] }, { "blockName": "core/image", "attrs": { + "id": 1440, "sizeSlug": "large", "linkDestination": "none" }, "innerBlocks": [], - "innerHTML": "\n\t
\n\t\t\"Image\n\t
\n\t", + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", "innerContent": [ - "\n\t
\n\t\t\"Image\n\t
\n\t" + "\n\t
\n\t\t\n\t
\n\t" ] } ], - "innerHTML": "\n
\n\t\n\n\t\n
\n", + "innerHTML": "\n\n\t\n\n\t\n
\n", "innerContent": [ - "\n
\n\t", + "\n\n\t", null, "\n\n\t", null, "\n
\n" ] }, - { - "blockName": null, - "attrs": {}, - "innerBlocks": [], - "innerHTML": "\n", - "innerContent": [ - "\n" - ] - } -] \ No newline at end of file + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } + +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html index bc5d6be414..6ab87b7c60 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html @@ -1,3 +1,9 @@ -
Image gallery image
Image gallery image
- \ No newline at end of file +
+
Image gallery image
+ + + +
Image gallery image
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html index 54757c5e30..fdea3c8cee 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html @@ -1,15 +1,25 @@ -
- -
- Image gallery image -
- +
-
- Image gallery image + Image gallery image
- + + + +
+ Image gallery image +
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html index 4f34167c17..b70ac2b6f0 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html @@ -1,14 +1,22 @@ - -
- + +
+
- Image gallery image + Image gallery image
- +
- Image gallery image + Image gallery image
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json index 4523d16b20..d0c40b3d3a 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json @@ -6,23 +6,23 @@ "images": [], "ids": [], "shortCodeTransforms": [], + "columns": 1, "caption": "", "imageCrop": true, "fixedHeight": true, "linkTo": "none", "sizeSlug": "large", - "allowResize": false, - "className": "columns-1", - "columns": 1 + "allowResize": false }, "innerBlocks": [ { "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190", "alt": "Image gallery image", "caption": "", + "id": 1421, "sizeSlug": "large", "linkDestination": "none" }, @@ -32,9 +32,10 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "http://google.com/hi.png", + "url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580", "alt": "Image gallery image", "caption": "", + "id": 1440, "sizeSlug": "large", "linkDestination": "none" }, diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json index d3d7c23893..b7a56415bf 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json @@ -2,51 +2,61 @@ { "blockName": "core/gallery", "attrs": { - "linkTo": "none", - "className": "columns-1" + "columns": 1, + "linkTo": "none" }, "innerBlocks": [ { "blockName": "core/image", "attrs": { + "id": 1421, "sizeSlug": "large", - "linkDestination": "none" + "linkDestination": "none", + "inheritedAttributes": { + "linkDestination": true, + "linkTarget": true, + "sizeSlug": true + } }, "innerBlocks": [], - "innerHTML": "\n\t
\n\t\t\"Image\n\t
\n\t", + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", "innerContent": [ - "\n\t
\n\t\t\"Image\n\t
\n\t" + "\n\t
\n\t\t\n\t
\n\t" ] }, { "blockName": "core/image", "attrs": { + "id": 1440, "sizeSlug": "large", - "linkDestination": "none" + "linkDestination": "none", + "inheritedAttributes": { + "linkDestination": true, + "linkTarget": true, + "sizeSlug": true + } }, "innerBlocks": [], - "innerHTML": "\n\t
\n\t\t\"Image\n\t
\n\t", + "innerHTML": "\n\t
\n\t\t\n\t
\n\t", "innerContent": [ - "\n\t
\n\t\t\"Image\n\t
\n\t" + "\n\t
\n\t\t\n\t
\n\t" ] } ], - "innerHTML": "\n
\n\t\n\n\t\n
\n", + "innerHTML": "\n
\n\t\n\n\t\n
\n", "innerContent": [ - "\n
\n\t", + "\n
\n\t", null, "\n\n\t", null, "\n
\n" ] }, - { - "blockName": null, - "attrs": {}, - "innerBlocks": [], - "innerHTML": "\n", - "innerContent": [ - "\n" - ] - } -] \ No newline at end of file + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html index 88464bedce..a139867795 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html @@ -1,3 +1,9 @@ - -
Image gallery image
Image gallery image
- \ No newline at end of file + +
+
Image gallery image
+ + + +
Image gallery image
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html index dfbd5b3008..33bf96793e 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html @@ -1,15 +1,17 @@ -
- +
- Image gallery image + Image gallery image
- - -
- Image gallery image + Image gallery image
-
- diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html new file mode 100644 index 0000000000..f982c52aa2 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html @@ -0,0 +1,10 @@ + +
+
+ title +
+
+ title +
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json new file mode 100644 index 0000000000..9e15ee7f1c --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json @@ -0,0 +1,35 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "columns": 2, + "imageCrop": true, + "linkTo": "none", + "align": "wide", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "alt": "title", + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "alt": "title", + "linkDestination": "none" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json new file mode 100644 index 0000000000..1f2ad33f72 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "columns": 2, + "align": "wide" + }, + "innerBlocks": [], + "innerHTML": "\n
\n\t
\n\t\t\"title\"\n\t
\n\t
\n\t\t\"title\"\n\t
\n
\n", + "innerContent": [ + "\n
\n\t
\n\t\t\"title\"\n\t
\n\t
\n\t\t\"title\"\n\t
\n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html new file mode 100644 index 0000000000..d0210e6ab6 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html @@ -0,0 +1,9 @@ + +
+
title
+ + + +
title
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html new file mode 100644 index 0000000000..edf07c2a72 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html @@ -0,0 +1,9 @@ + +
+
+ title +
+
+ title +
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html new file mode 100644 index 0000000000..7ff72ee6bc --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html @@ -0,0 +1,14 @@ + +
    +
  • +
    + title +
    +
    • +
  • +
    + title +
    +
    • +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json new file mode 100644 index 0000000000..a60776801e --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json @@ -0,0 +1,39 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "columns": 2, + "imageCrop": true, + "linkTo": "none", + "align": "wide", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "alt": "title", + "caption": "", + "id": 1, + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "alt": "title", + "caption": "", + "id": 2, + "linkDestination": "none" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json new file mode 100644 index 0000000000..84f1f77d5b --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "columns": 2, + "align": "wide" + }, + "innerBlocks": [], + "innerHTML": "\n
    \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n
\n", + "innerContent": [ + "\n
    \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html new file mode 100644 index 0000000000..cab51d71a3 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html @@ -0,0 +1,9 @@ + +
+
title
+ + + +
title
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html new file mode 100644 index 0000000000..4f47253ffb --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html @@ -0,0 +1,13 @@ + +
    +
  • +
    + title +
    +
    • +
  • +
    + title +
    +
    • +
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html new file mode 100644 index 0000000000..8b23e16a38 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html @@ -0,0 +1,14 @@ + +
    +
  • +
    + title +
    +
    • +
  • +
    + title +
    +
    • +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json new file mode 100644 index 0000000000..9ac2c19781 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json @@ -0,0 +1,36 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "imageCrop": true, + "linkTo": "none", + "align": "wide", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", + "alt": "title", + "caption": "", + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", + "alt": "title", + "caption": "", + "linkDestination": "none" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json new file mode 100644 index 0000000000..cbb35065cf --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "ids": [ null, null ], + "align": "wide" + }, + "innerBlocks": [], + "innerHTML": "\n
    \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n
\n", + "innerContent": [ + "\n
    \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n\t
  • \n\t\t
    \n\t\t\t\"title\"\n\t\t
    \n\t
    • \n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html new file mode 100644 index 0000000000..3cf2bb609d --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html @@ -0,0 +1,9 @@ + +
+
title
+ + + +
title
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html new file mode 100644 index 0000000000..9c58c81034 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html @@ -0,0 +1,13 @@ + +
    +
  • +
    + title +
    +
    • +
  • +
    + title +
    +
    • +
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html new file mode 100644 index 0000000000..2ec6368390 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html @@ -0,0 +1,21 @@ + +
+
    +
  • +
    + +
    +
    • +
  • +
    + +
    +
    • +
  • +
    + +
    +
    • +
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json new file mode 100644 index 0000000000..dad150cc96 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json @@ -0,0 +1,51 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "caption": "", + "imageCrop": true, + "linkTo": "none", + "align": "wide", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190", + "alt": "", + "caption": "", + "id": 1421, + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580", + "alt": "", + "caption": "", + "id": 1440, + "linkDestination": "none" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580", + "alt": "", + "caption": "", + "id": 1362, + "linkDestination": "none" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json new file mode 100644 index 0000000000..04dc77f799 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "ids": [ "1421", "1440", "1362" ], + "align": "wide" + }, + "innerBlocks": [], + "innerHTML": "\n
\n\t
    \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t
\n
\n", + "innerContent": [ + "\n
\n\t
    \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\"\"\n\t\t\t
    \n\t\t
    • \n\t
\n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html new file mode 100644 index 0000000000..7ecc6f852e --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html @@ -0,0 +1,13 @@ + +
+
+ + + +
+ + + +
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html new file mode 100644 index 0000000000..355dc4bdf4 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html @@ -0,0 +1,20 @@ + +
+
    +
  • +
    + +
    +
    • +
  • +
    + +
    +
    • +
  • +
    + +
    +
    • +
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html new file mode 100644 index 0000000000..d97624d43e --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html @@ -0,0 +1,48 @@ + +
+ +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json new file mode 100644 index 0000000000..9ef1f03ba0 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json @@ -0,0 +1,57 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "caption": "", + "imageCrop": true, + "linkTo": "media", + "sizeSlug": "large", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json new file mode 100644 index 0000000000..f2680567d8 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "ids": [ 705, 704, 703 ], + "linkTo": "media" + }, + "innerBlocks": [], + "innerHTML": "\n
\n\t\n
\n", + "innerContent": [ + "\n
\n\t\n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html new file mode 100644 index 0000000000..74fb0a124f --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html @@ -0,0 +1,13 @@ + +
+
+ + + +
+ + + +
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html new file mode 100644 index 0000000000..57c42cc3bd --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html @@ -0,0 +1,48 @@ + +
+ +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html new file mode 100644 index 0000000000..0dcf604233 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html @@ -0,0 +1,54 @@ + +
+ +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json new file mode 100644 index 0000000000..9ef1f03ba0 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json @@ -0,0 +1,57 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "caption": "", + "imageCrop": true, + "linkTo": "media", + "sizeSlug": "large", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json new file mode 100644 index 0000000000..2b42128d65 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json @@ -0,0 +1,21 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "ids": [ 705, 704, 703 ], + "linkTo": "media" + }, + "innerBlocks": [], + "innerHTML": "\n
\n\t
    \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t
\n
\n", + "innerContent": [ + "\n
\n\t
    \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t\t
  • \n\t\t\t
    \n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
    \n\t\t
    • \n\t
\n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html new file mode 100644 index 0000000000..74fb0a124f --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html @@ -0,0 +1,13 @@ + +
+
+ + + +
+ + + +
+
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html new file mode 100644 index 0000000000..9175cfa561 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html @@ -0,0 +1,54 @@ + +
+ +
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html new file mode 100644 index 0000000000..61b70f3385 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html @@ -0,0 +1,31 @@ + +
+ +
+ + + +
+ + + +
+ +
+ + +
+ +
+ + + +
+ + + +
+ +
This gallery has a caption
+
+ \ No newline at end of file diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json new file mode 100644 index 0000000000..4eaf85b469 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json @@ -0,0 +1,120 @@ +[ + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "images": [], + "ids": [], + "shortCodeTransforms": [], + "caption": "", + "imageCrop": true, + "fixedHeight": true, + "linkTo": "media", + "sizeSlug": "large", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + } + ] + }, + { + "name": "core/gallery", + "isValid": true, + "attributes": { + "images": [], + "ids": [], + "shortCodeTransforms": [], + "caption": "This gallery has a caption", + "imageCrop": true, + "fixedHeight": true, + "linkTo": "media", + "sizeSlug": "large", + "allowResize": false + }, + "innerBlocks": [ + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg", + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg", + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + }, + { + "name": "core/image", + "isValid": true, + "attributes": { + "url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "alt": "", + "caption": "", + "href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg", + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [] + } + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json new file mode 100644 index 0000000000..f59684073d --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json @@ -0,0 +1,123 @@ +[ + { + "blockName": "core/gallery", + "attrs": { + "linkTo": "media" + }, + "innerBlocks": [ + { + "blockName": "core/image", + "attrs": { + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t\t
\"\"
\n\t", + "innerContent": [ + "\n\t\t
\"\"
\n\t" + ] + }, + { + "blockName": "core/image", + "attrs": { + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t\t
\"\"
\n\t", + "innerContent": [ + "\n\t\t
\"\"
\n\t" + ] + }, + { + "blockName": "core/image", + "attrs": { + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t\t
\"\"
\n\t", + "innerContent": [ + "\n\t\t
\"\"
\n\t" + ] + } + ], + "innerHTML": "\n
\n\t\n\t\n\t\n\t\n\t\n
\n", + "innerContent": [ + "\n
\n\t", + null, + "\n\t\n\t", + null, + "\n\t\n\t", + null, + "\n
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ "\n" ] + }, + { + "blockName": "core/gallery", + "attrs": { + "linkTo": "media" + }, + "innerBlocks": [ + { + "blockName": "core/image", + "attrs": { + "id": 705, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t
\"\"
\n\t", + "innerContent": [ + "\n\t
\"\"
\n\t" + ] + }, + { + "blockName": "core/image", + "attrs": { + "id": 704, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t
\"\"
\n\t", + "innerContent": [ + "\n\t
\"\"
\n\t" + ] + }, + { + "blockName": "core/image", + "attrs": { + "id": 703, + "sizeSlug": "large", + "linkDestination": "media" + }, + "innerBlocks": [], + "innerHTML": "\n\t
\"\"
\n\t", + "innerContent": [ + "\n\t
\"\"
\n\t" + ] + } + ], + "innerHTML": "\n
\n\t\n\t\n\t\n\t\n\t\n\t
This gallery has a caption
\n
\n", + "innerContent": [ + "\n
\n\t", + null, + "\n\t\n\t", + null, + "\n\t\n\t", + null, + "\n\t
This gallery has a caption
\n
\n" + ] + } +] diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html new file mode 100644 index 0000000000..0aed527cce --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html @@ -0,0 +1,27 @@ + +
+
+ + + +
+ + + +
+
+ + + +
+
+ + + +
+ + + +
+
This gallery has a caption
+ diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html new file mode 100644 index 0000000000..d3fa62fdf5 --- /dev/null +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html @@ -0,0 +1,15 @@ + +
+
+
+
+
+ + +
+
+
+
+
This gallery has a caption
+
+ diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php index 73d274f4da..56905956df 100644 --- a/tests/phpunit/tests/blocks/render.php +++ b/tests/phpunit/tests/blocks/render.php @@ -227,6 +227,10 @@ class Tests_Blocks_Render extends WP_UnitTestCase { $normalized_html = preg_replace( '/wp-block-gallery-\d+/', 'wp-block-gallery-1', $normalized_html ); $expected_html = self::strip_r( file_get_contents( $server_html_path ) ); + // Convert HTML to be white space insensitive. + $normalized_html = preg_replace( '/(\s+$)/m', '', $normalized_html ); + $expected_html = preg_replace( '/(\s+$)/m', '', $expected_html ); + $this->assertSame( $expected_html, $normalized_html,