diff --git a/packages/e2e-tests/fixtures/block-transforms.js b/packages/e2e-tests/fixtures/block-transforms.js index bf1e218958c41..6813381a4dd10 100644 --- a/packages/e2e-tests/fixtures/block-transforms.js +++ b/packages/e2e-tests/fixtures/block-transforms.js @@ -7,6 +7,12 @@ export const EXPECTED_TRANSFORMS = { originalBlock: 'Archives', availableTransforms: [], }, + core__audio: { + originalBlock: 'Audio', + availableTransforms: [ + 'File', + ], + }, core__button__center: { originalBlock: 'Button', availableTransforms: [], @@ -15,6 +21,36 @@ export const EXPECTED_TRANSFORMS = { originalBlock: 'Calendar', availableTransforms: [], }, + 'core__media-text': { + originalBlock: 'Media & Text', + availableTransforms: [ + 'Image', + ], + }, + 'core__media-text__image-alt-no-align': { + originalBlock: 'Media & Text', + availableTransforms: [ + 'Image', + ], + }, + 'core__media-text__is-stacked-on-mobile': { + originalBlock: 'Media & Text', + availableTransforms: [ + 'Video', + ], + }, + 'core__media-text__media-right-custom-width': { + originalBlock: 'Media & Text', + availableTransforms: [ + 'Video', + ], + }, + 'core__media-text__video': { + originalBlock: 'Media & Text', + availableTransforms: [ + 'Video', + ], + }, core__categories: { originalBlock: 'Categories', availableTransforms: [], @@ -29,10 +65,52 @@ export const EXPECTED_TRANSFORMS = { originalBlock: 'Columns', availableTransforms: [], }, + core__cover: { + availableTransforms: [ + 'Image', + ], + originalBlock: 'Cover', + }, + core__cover__video: { + availableTransforms: [ + 'Video', + ], + originalBlock: 'Cover', + }, + 'core__cover__video-overlay': { + availableTransforms: [ + 'Video', + ], + originalBlock: 'Cover', + }, core__embed: { originalBlock: 'Embed', availableTransforms: [], }, + 'core__file__new-window': { + originalBlock: 'File', + availableTransforms: [], + }, + 'core__file__no-download-button': { + originalBlock: 'File', + availableTransforms: [], + }, + 'core__file__no-text-link': { + originalBlock: 'File', + availableTransforms: [], + }, + core__gallery: { + originalBlock: 'Gallery', + availableTransforms: [ + 'Image', + ], + }, + core__gallery__columns: { + originalBlock: 'Gallery', + availableTransforms: [ + 'Image', + ], + }, 'core__heading__h2-em': { originalBlock: 'Heading', availableTransforms: [ @@ -51,6 +129,69 @@ export const EXPECTED_TRANSFORMS = { originalBlock: 'Custom HTML', availableTransforms: [], }, + core__image: { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__attachment-link': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__center-caption': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__custom-link': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__custom-link-class': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__custom-link-rel': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, + 'core__image__media-link': { + originalBlock: 'Image', + availableTransforms: [ + 'Gallery', + 'Cover', + 'File', + 'Media & Text', + ], + }, 'core__latest-comments': { originalBlock: 'Latest Comments', availableTransforms: [], @@ -175,4 +316,12 @@ export const EXPECTED_TRANSFORMS = { 'Paragraph', ], }, + core__video: { + originalBlock: 'Video', + availableTransforms: [ + 'Cover', + 'File', + 'Media & Text', + ], + }, }; diff --git a/packages/e2e-tests/fixtures/blocks/core__audio.html b/packages/e2e-tests/fixtures/blocks/core__audio.html index cfa3f20267c4b..0427dd2b8115d 100644 --- a/packages/e2e-tests/fixtures/blocks/core__audio.html +++ b/packages/e2e-tests/fixtures/blocks/core__audio.html @@ -1,5 +1,5 @@
- +
diff --git a/packages/e2e-tests/fixtures/blocks/core__audio.json b/packages/e2e-tests/fixtures/blocks/core__audio.json index f9acbfdd8ce2d..3bdbd2f5c104a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__audio.json +++ b/packages/e2e-tests/fixtures/blocks/core__audio.json @@ -4,13 +4,13 @@ "name": "core/audio", "isValid": true, "attributes": { - "src": "https://media.simplecast.com/episodes/audio/80564/draft-podcast-51-livePublish2.mp3", + "src": "data:audio/mpeg;base64,/+MYxAAAAANIAAAAAExBTUUzLjk4LjIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "caption": "", "autoplay": false, "loop": false, "align": "right" }, "innerBlocks": [], - "originalContent": "
\n \n
" + "originalContent": "
\n \n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json b/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json index 8024c293a5498..3dd1c181b54c1 100644 --- a/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__audio.parsed.json @@ -5,9 +5,9 @@ "align": "right" }, "innerBlocks": [], - "innerHTML": "\n
\n \n
\n", + "innerHTML": "\n
\n \n
\n", "innerContent": [ - "\n
\n \n
\n" + "\n
\n \n
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__audio.serialized.html b/packages/e2e-tests/fixtures/blocks/core__audio.serialized.html index f7b69332aa882..af9ba1212fdb3 100644 --- a/packages/e2e-tests/fixtures/blocks/core__audio.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__audio.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.html b/packages/e2e-tests/fixtures/blocks/core__cover.html index a95fdd0d43f78..bea1456539066 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover.html @@ -1,7 +1,7 @@ - +
diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.json b/packages/e2e-tests/fixtures/blocks/core__cover.json index 8dfaaf80485a8..78ce136bea2b6 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover.json @@ -4,7 +4,7 @@ "name": "core/cover", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "hasParallax": false, "dimRatio": 40, "backgroundType": "image" @@ -25,6 +25,6 @@ "originalContent": "

\n\t\t\tGuten Berg!\n\t\t

" } ], - "originalContent": "\n\t
\n\t\t\n\t
\n
" + "originalContent": "\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json b/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json index 116012372ec34..d682ebabe0b9f 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__cover.parsed.json @@ -2,7 +2,7 @@ { "blockName": "core/cover", "attrs": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "dimRatio": 40 }, "innerBlocks": [ @@ -20,9 +20,9 @@ ] } ], - "innerHTML": "\n\n\t
\n\t\t\n\t
\n\n", + "innerHTML": "\n\n\t
\n\t\t\n\t
\n\n", "innerContent": [ - "\n\n\t
\n\t\t", + "\n\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html b/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html index 306a5a740160a..0539f03f168f8 100644 --- a/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__cover.serialized.html @@ -1,5 +1,5 @@ - -
+ +

Guten Berg!

diff --git a/packages/e2e-tests/fixtures/blocks/core__file__new-window.html b/packages/e2e-tests/fixtures/blocks/core__file__new-window.html index 9c489088ce505..eeded36a76419 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__new-window.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__new-window.html @@ -1,3 +1,3 @@ - +
6546Download
diff --git a/packages/e2e-tests/fixtures/blocks/core__file__new-window.json b/packages/e2e-tests/fixtures/blocks/core__file__new-window.json index 378ae6dd78d74..ec9d04253aae3 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__new-window.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__new-window.json @@ -4,7 +4,6 @@ "name": "core/file", "isValid": true, "attributes": { - "id": 176, "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", "fileName": "6546", "textLinkHref": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", diff --git a/packages/e2e-tests/fixtures/blocks/core__file__new-window.parsed.json b/packages/e2e-tests/fixtures/blocks/core__file__new-window.parsed.json index a29bea33c5b2b..9893cf0858e14 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__new-window.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__new-window.parsed.json @@ -3,8 +3,7 @@ "blockName": "core/file", "attrs": { "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", - "showDownloadButton": true, - "id": 176 + "showDownloadButton": true }, "innerBlocks": [], "innerHTML": "\n
6546Download
\n", diff --git a/packages/e2e-tests/fixtures/blocks/core__file__new-window.serialized.html b/packages/e2e-tests/fixtures/blocks/core__file__new-window.serialized.html index f132127db9bab..32e45ba306d0b 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__new-window.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__new-window.serialized.html @@ -1,3 +1,3 @@ - +
6546Download
diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.html b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.html index 54d82d4391f0e..28574abb0e365 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.html @@ -1,3 +1,3 @@ - -
lkjfijwef
+ +
lkjfijwef
diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.json b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.json index 44ff5553acbe1..6b034cf8b9cdb 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.json @@ -4,14 +4,13 @@ "name": "core/file", "isValid": true, "attributes": { - "id": 176, "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", "fileName": "lkjfijwef", - "textLinkHref": "http://localhost:8888/?attachment_id=176", + "textLinkHref": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", "showDownloadButton": false, "downloadButtonText": "" }, "innerBlocks": [], - "originalContent": "
lkjfijwef
" + "originalContent": "
lkjfijwef
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.parsed.json b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.parsed.json index ac019b969423c..bf500bf663d40 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.parsed.json @@ -3,13 +3,12 @@ "blockName": "core/file", "attrs": { "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", - "showDownloadButton": false, - "id": 176 + "showDownloadButton": false }, "innerBlocks": [], - "innerHTML": "\n
lkjfijwef
\n", + "innerHTML": "\n
lkjfijwef
\n", "innerContent": [ - "\n
lkjfijwef
\n" + "\n
lkjfijwef
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.serialized.html b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.serialized.html index 639e3e6c9d8a2..28574abb0e365 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-download-button.serialized.html @@ -1,3 +1,3 @@ - -
lkjfijwef
+ +
lkjfijwef
diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.html b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.html index 02fd463de11d8..22bae9ce86a8a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.html @@ -1,3 +1,3 @@ - +
Download
diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.json b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.json index ec3e7b670b8b2..75db9d2bb0f85 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.json @@ -4,7 +4,6 @@ "name": "core/file", "isValid": true, "attributes": { - "id": 176, "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", "fileName": "", "showDownloadButton": true, diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.parsed.json b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.parsed.json index d70321c12c06d..62bc3d8904098 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.parsed.json @@ -3,8 +3,7 @@ "blockName": "core/file", "attrs": { "href": "http://localhost:8888/wp-content/uploads/2018/05/keycodes.js", - "showDownloadButton": true, - "id": 176 + "showDownloadButton": true }, "innerBlocks": [], "innerHTML": "\n
Download
\n", diff --git a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.serialized.html b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.serialized.html index 1289b3128720d..b872fd5de21b0 100644 --- a/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__file__no-text-link.serialized.html @@ -1,3 +1,3 @@ - +
Download
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.html b/packages/e2e-tests/fixtures/blocks/core__gallery.html index a5842fd7dd581..b91a575be9ca5 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery.html +++ b/packages/e2e-tests/fixtures/blocks/core__gallery.html @@ -2,12 +2,12 @@
  • - title + title
  • - title + title
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json index 1e87ee42c8702..4825848d9e6c4 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery.json +++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json @@ -6,12 +6,12 @@ "attributes": { "images": [ { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "title", "caption": "" }, { - "url": "http://google.com/hi.png", + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "alt": "title", "caption": "" } @@ -24,6 +24,6 @@ "linkTo": "none" }, "innerBlocks": [], - "originalContent": "
    \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
" + "originalContent": "
    \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
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json index e070b1f70b5f6..99c1ac20ed956 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json @@ -8,9 +8,9 @@ ] }, "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", + "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" + "\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" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html index 55a1e6bab0377..813f97c645287 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html @@ -1,3 +1,3 @@ -
  • title
  • title
+
  • title
  • title
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html index 6493c70309dad..e97f7b9f87f3c 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html +++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html @@ -2,12 +2,12 @@
  • - title + title
  • - title + title
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json index d96473e9d8d04..f149e3faf630a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json +++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json @@ -6,12 +6,12 @@ "attributes": { "images": [ { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "title", "caption": "" }, { - "url": "http://google.com/hi.png", + "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "alt": "title", "caption": "" } @@ -25,6 +25,6 @@ "linkTo": "none" }, "innerBlocks": [], - "originalContent": "
    \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
" + "originalContent": "
    \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
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json index 6a2b71ac242f1..14a5b12897804 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json @@ -9,9 +9,9 @@ "columns": 1 }, "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", + "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" + "\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" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html index 7c5c369cc4199..cb2b112acad9e 100644 --- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html @@ -1,3 +1,3 @@ -
  • title
  • title
+
  • title
  • title
diff --git a/packages/e2e-tests/fixtures/blocks/core__image.html b/packages/e2e-tests/fixtures/blocks/core__image.html index eda663561a38b..a4385309da7a4 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image.html +++ b/packages/e2e-tests/fixtures/blocks/core__image.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image.json b/packages/e2e-tests/fixtures/blocks/core__image.json index 4369150f0c929..22c56bcf68131 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image.json +++ b/packages/e2e-tests/fixtures/blocks/core__image.json @@ -4,12 +4,12 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", "linkDestination": "none" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image.parsed.json index d7e16a440ddef..37fc14fff5075 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image.parsed.json @@ -3,9 +3,9 @@ "blockName": "core/image", "attrs": {}, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image.serialized.html index 5dfb0bac3e5b7..d6fe6d2d99a04 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.html b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.html index 908250d8ca249..5a684ff99083b 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.json b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.json index 5d169589043a5..9a82085c205ee 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.json @@ -4,13 +4,13 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", "href": "http://localhost:8888/?attachment_id=7", "linkDestination": "attachment" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.parsed.json index fae6604516028..26278ee5b85a1 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.parsed.json @@ -5,9 +5,9 @@ "linkDestination": "attachment" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.serialized.html index f5ebb9af4182c..3f74e96cbcb27 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__attachment-link.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.html b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.html index bfe40d190fa66..1f5d724f5498e 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.html @@ -1,3 +1,3 @@ -
Give it a try. Press the "really wide" button on the image toolbar.
+
Give it a try. Press the "really wide" button on the image toolbar.
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.json b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.json index f569bda22c81b..525502f15232e 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.json @@ -4,13 +4,13 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/YLYhpou2oq.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "Give it a try. Press the \"really wide\" button on the image toolbar.", "align": "center", "linkDestination": "none" }, "innerBlocks": [], - "originalContent": "
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
" + "originalContent": "
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.parsed.json index 02ff95e3ae8cb..f7b2a79de7214 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.parsed.json @@ -5,9 +5,9 @@ "align": "center" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
\n", + "innerHTML": "\n
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
\n", "innerContent": [ - "\n
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
\n" + "\n
\"\"
Give it a try. Press the "really wide" button on the image toolbar.
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.serialized.html index 3410b04fdf121..fe1a5c2b03a13 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__center-caption.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__center-caption.serialized.html @@ -1,3 +1,3 @@ -
Give it a try. Press the "really wide" button on the image toolbar.
+
Give it a try. Press the "really wide" button on the image toolbar.
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.html index 57cc46c9c39bb..18201cdd3b105 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.json index d47fe4162c9c6..173999d24f169 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.json @@ -4,7 +4,7 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", "href": "https://wordpress.org/", @@ -12,6 +12,6 @@ "linkDestination": "custom" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.parsed.json index c69b53dcc08aa..0d8664f1e1548 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.parsed.json @@ -5,9 +5,9 @@ "linkDestination": "custom" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.serialized.html index 9ac1f7a7a914e..42addd52db772 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-class.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.html index 3424ed3fff3d7..97761d08043a4 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.json index 6000da69608e6..c877e3cc5e4bd 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.json @@ -4,7 +4,7 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", "href": "https://wordpress.org/", @@ -12,6 +12,6 @@ "linkDestination": "custom" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.parsed.json index 91649db09a595..7fa19efad7f21 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.parsed.json @@ -5,9 +5,9 @@ "linkDestination": "custom" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.serialized.html index 92702548c11d9..13d5d132df490 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link-rel.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.html index 353dc5376b7a4..e3c4630e53e36 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.json index 735e552282662..58ac7320330cf 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.json @@ -4,13 +4,13 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", "href": "https://wordpress.org/", "linkDestination": "custom" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.parsed.json index a3625c6a1f683..7817fc00fdeaf 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.parsed.json @@ -5,9 +5,9 @@ "linkDestination": "custom" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.serialized.html index 47357bea6b9d4..27dc6f69f23ca 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__custom-link.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__custom-link.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__media-link.html b/packages/e2e-tests/fixtures/blocks/core__image__media-link.html index 90b3d227117b0..2afbd21f98c5d 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__media-link.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__media-link.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__image__media-link.json b/packages/e2e-tests/fixtures/blocks/core__image__media-link.json index 690fa778b6fd5..18be10b3db12b 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__media-link.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__media-link.json @@ -4,13 +4,13 @@ "name": "core/image", "isValid": true, "attributes": { - "url": "https://cldup.com/uuUqE_dXzy.jpg", + "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "alt": "", "caption": "", - "href": "https://cldup.com/uuUqE_dXzy.jpg", + "href": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==", "linkDestination": "media" }, "innerBlocks": [], - "originalContent": "
\"\"
" + "originalContent": "
\"\"
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__image__media-link.parsed.json b/packages/e2e-tests/fixtures/blocks/core__image__media-link.parsed.json index 46458a7eec3d7..8ae21f34994ee 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__media-link.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__image__media-link.parsed.json @@ -5,9 +5,9 @@ "linkDestination": "media" }, "innerBlocks": [], - "innerHTML": "\n
\"\"
\n", + "innerHTML": "\n
\"\"
\n", "innerContent": [ - "\n
\"\"
\n" + "\n
\"\"
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__image__media-link.serialized.html b/packages/e2e-tests/fixtures/blocks/core__image__media-link.serialized.html index 721abac903ff3..27020b189fcb5 100644 --- a/packages/e2e-tests/fixtures/blocks/core__image__media-link.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__image__media-link.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text.html b/packages/e2e-tests/fixtures/blocks/core__media-text.html index ec516a98eb94d..1752272d14857 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text.html @@ -1,7 +1,7 @@ - +
- +
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text.json b/packages/e2e-tests/fixtures/blocks/core__media-text.json index 09e4f0c6f68f3..e46863def4583 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text.json @@ -7,8 +7,7 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", - "mediaId": 17985, - "mediaUrl": "http://localhost/wp-content/uploads/2018/09/1600px-Mount_Everest_as_seen_from_Drukair2_PLW_edit.jpg", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": false @@ -28,6 +27,6 @@ "originalContent": "

My Content

" } ], - "originalContent": "
\n\t
\n\t\t\"\"\n\t
\n\t
\n\t\t\n\t
\n
" + "originalContent": "
\n\t
\n\t\t\"\"/\n\t
\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text.parsed.json index 7c758d02aa73a..297be55236b46 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text.parsed.json @@ -2,7 +2,6 @@ { "blockName": "core/media-text", "attrs": { - "mediaId": 17985, "mediaType": "image" }, "innerBlocks": [ @@ -19,9 +18,9 @@ ] } ], - "innerHTML": "\n
\n\t
\n\t\t\"\"\n\t
\n\t
\n\t\t\n\t
\n
\n", + "innerHTML": "\n
\n\t
\n\t\t\"\"/\n\t
\n\t
\n\t\t\n\t
\n
\n", "innerContent": [ - "\n
\n\t
\n\t\t\"\"\n\t
\n\t
\n\t\t", + "\n
\n\t
\n\t\t\"\"/\n\t
\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text.serialized.html index 51d3cce84b74e..22f1ac4f57ad9 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text.serialized.html @@ -1,5 +1,5 @@ - -
+ +

My Content

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.html b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.html index 0c383e4537a57..0537698f3e381 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.html @@ -1,7 +1,7 @@ - +
- my alt + my alt
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.json b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.json index 0efacb35ee5b0..8aed7923b1cca 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.json @@ -7,8 +7,7 @@ "align": "none", "mediaAlt": "my alt", "mediaPosition": "left", - "mediaId": 17985, - "mediaUrl": "http://localhost/wp-content/uploads/2018/09/1600px-Mount_Everest_as_seen_from_Drukair2_PLW_edit.jpg", + "mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=", "mediaType": "image", "mediaWidth": 50, "isStackedOnMobile": false @@ -28,6 +27,6 @@ "originalContent": "

Content

" } ], - "originalContent": "
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t\n\t
\n
" + "originalContent": "
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.parsed.json index 9068878ecf502..a0e37007f86a1 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.parsed.json @@ -3,7 +3,6 @@ "blockName": "core/media-text", "attrs": { "align": "none", - "mediaId": 17985, "mediaType": "image" }, "innerBlocks": [ @@ -20,9 +19,9 @@ ] } ], - "innerHTML": "\n
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t\n\t
\n
\n", + "innerHTML": "\n
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t\n\t
\n
\n", "innerContent": [ - "\n
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t", + "\n
\n\t
\n\t\t\"my\n\t
\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.serialized.html index 9e00e7ce93ca1..495c3b0df08e9 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__image-alt-no-align.serialized.html @@ -1,5 +1,5 @@ - -
my alt
+ +
my alt

Content

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.html b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.html index 0aa403f6c3017..8aab369319b39 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.html @@ -1,7 +1,7 @@ - +
- +
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.json b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.json index 85d29db70eaf7..c3c9b460bf619 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.json @@ -7,8 +7,7 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", - "mediaId": 17897, - "mediaUrl": "http://localhost/wp-content/uploads/2018/09/Jul-26-2018-11-34-54.mp4", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 50, "isStackedOnMobile": true @@ -28,6 +27,6 @@ "originalContent": "

My Content

" } ], - "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" + "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.parsed.json index 3451267ab6897..1e5df74e4d13a 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.parsed.json @@ -2,7 +2,6 @@ { "blockName": "core/media-text", "attrs": { - "mediaId": 17897, "mediaType": "video", "isStackedOnMobile": true }, @@ -20,9 +19,9 @@ ] } ], - "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", + "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", "innerContent": [ - "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", + "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.serialized.html index b9a82b9d842cc..b24fdf0a1fd43 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__is-stacked-on-mobile.serialized.html @@ -1,5 +1,5 @@ - -
+ +

My Content

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html index b0772fb7b44d9..45252b7a306b8 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.html @@ -1,7 +1,7 @@ - +
- +
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json index 42d3a5ab16bce..b3bf94da24828 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.json @@ -7,8 +7,7 @@ "align": "full", "mediaAlt": "", "mediaPosition": "right", - "mediaId": 17897, - "mediaUrl": "http://localhost/wp-content/uploads/2018/09/Jul-26-2018-11-34-54.mp4", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 41, "isStackedOnMobile": false @@ -29,6 +28,6 @@ "originalContent": "

My video

" } ], - "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" + "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json index 37484502190c7..ee577a366f0f8 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.parsed.json @@ -4,7 +4,6 @@ "attrs": { "align": "full", "mediaPosition": "right", - "mediaId": 17897, "mediaType": "video", "mediaWidth": 41 }, @@ -23,9 +22,9 @@ ] } ], - "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", + "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", "innerContent": [ - "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", + "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html index a11efac920f28..857ad7de389cd 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__media-right-custom-width.serialized.html @@ -1,5 +1,5 @@ - -
+ +

My video

diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__video.html b/packages/e2e-tests/fixtures/blocks/core__media-text__video.html index 48c13cac64d08..9122112e50be5 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__video.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__video.html @@ -1,7 +1,7 @@ - +
- +
diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__video.json b/packages/e2e-tests/fixtures/blocks/core__media-text__video.json index 427195d751016..e9876c510fd41 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__video.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__video.json @@ -7,8 +7,7 @@ "align": "wide", "mediaAlt": "", "mediaPosition": "left", - "mediaId": 17897, - "mediaUrl": "http://localhost/wp-content/uploads/2018/09/Jul-26-2018-11-34-54.mp4", + "mediaUrl": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "mediaType": "video", "mediaWidth": 50, "isStackedOnMobile": false @@ -28,6 +27,6 @@ "originalContent": "

My Content

" } ], - "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" + "originalContent": "
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__video.parsed.json b/packages/e2e-tests/fixtures/blocks/core__media-text__video.parsed.json index 4e06eb858a520..fe2ec87d1eeb0 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__video.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__video.parsed.json @@ -2,7 +2,6 @@ { "blockName": "core/media-text", "attrs": { - "mediaId": 17897, "mediaType": "video" }, "innerBlocks": [ @@ -19,9 +18,9 @@ ] } ], - "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", + "innerHTML": "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t\n\t
\n
\n", "innerContent": [ - "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", + "\n
\n\t
\n\t\t\n\t
\n\t
\n\t\t", null, "\n\t
\n
\n" ] diff --git a/packages/e2e-tests/fixtures/blocks/core__media-text__video.serialized.html b/packages/e2e-tests/fixtures/blocks/core__media-text__video.serialized.html index f7302c9a33c5d..a428bf311c8ee 100644 --- a/packages/e2e-tests/fixtures/blocks/core__media-text__video.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__media-text__video.serialized.html @@ -1,5 +1,5 @@ - -
+ +

My Content

diff --git a/packages/e2e-tests/fixtures/blocks/core__video.html b/packages/e2e-tests/fixtures/blocks/core__video.html index dd720ecda8bf5..67f6f86fec095 100644 --- a/packages/e2e-tests/fixtures/blocks/core__video.html +++ b/packages/e2e-tests/fixtures/blocks/core__video.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__video.json b/packages/e2e-tests/fixtures/blocks/core__video.json index 7b9f36d1aa30c..c926e1332b5e5 100644 --- a/packages/e2e-tests/fixtures/blocks/core__video.json +++ b/packages/e2e-tests/fixtures/blocks/core__video.json @@ -10,10 +10,10 @@ "loop": false, "muted": false, "preload": "metadata", - "src": "https://awesome-fake.video/file.mp4", + "src": "data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=", "playsInline": false }, "innerBlocks": [], - "originalContent": "
" + "originalContent": "
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__video.parsed.json b/packages/e2e-tests/fixtures/blocks/core__video.parsed.json index 5fd5505e395f7..e270252ee3874 100644 --- a/packages/e2e-tests/fixtures/blocks/core__video.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__video.parsed.json @@ -3,9 +3,9 @@ "blockName": "core/video", "attrs": {}, "innerBlocks": [], - "innerHTML": "\n
\n", + "innerHTML": "\n
\n", "innerContent": [ - "\n
\n" + "\n
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__video.serialized.html b/packages/e2e-tests/fixtures/blocks/core__video.serialized.html index 48dca62aecd32..b3d567b5c0d69 100644 --- a/packages/e2e-tests/fixtures/blocks/core__video.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__video.serialized.html @@ -1,3 +1,3 @@ -
+
diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap index 677a85dc97bda..13e2f3c192ccf 100644 --- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap +++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap @@ -1,5 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`Block transforms correctly transform block Audio in fixture core__audio into the File block 1`] = ` +" +
Download
+" +`; + exports[`Block transforms correctly transform block Code in fixture core__code into the Preformatted block 1`] = ` " 
export default function MyButton() {
@@ -8,6 +14,44 @@ exports[`Block transforms correctly transform block Code in fixture core__code i
 "
 `;
 
+exports[`Block transforms correctly transform block Cover in fixture core__cover into the Image block 1`] = `
+"
+
\\"\\"/

+"
+`;
+
+exports[`Block transforms correctly transform block Cover in fixture core__cover__video into the Video block 1`] = `
+"
+

+"
+`;
+
+exports[`Block transforms correctly transform block Cover in fixture core__cover__video-overlay into the Video block 1`] = `
+"
+

+"
+`;
+
+exports[`Block transforms correctly transform block Gallery in fixture core__gallery into the Image block 1`] = `
+"
+
\\"title\\"/

+
+
+
+
\\"title\\"/

+"
+`;
+
+exports[`Block transforms correctly transform block Gallery in fixture core__gallery__columns into the Image block 1`] = `
+"
+
\\"title\\"/

+
+
+
+
\\"title\\"/

+"
+`;
+
 exports[`Block transforms correctly transform block Heading in fixture core__heading__h2 into the Paragraph block 1`] = `
 "
 
A picture is worth a thousand words, or so the saying goes

@@ -32,6 +76,202 @@ exports[`Block transforms correctly transform block Heading in fixture core__hea
 "
 `;
 
+exports[`Block transforms correctly transform block Image in fixture core__image into the Cover block 1`] = `
+"
+

+

+

+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image into the File block 1`] = `
+"
+
Download

+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image into the Gallery block 1`] = `
+"
+
    
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image into the Media & Text block 1`] = `
+"
+
    \\"\\"/
    
+
    
+
    
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Cover block 1`] = `
+"
+
    
+
    
+
    
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the File block 1`] = `
+"
+
    Download
    
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Gallery block 1`] = `
+"
+
      
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Media & Text block 1`] = `
+"
+
      \\"\\"/
      
+
      
+
      
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Cover block 1`] = `
+"
+
      
+
      
+
      
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the File block 1`] = `
+"
+
      Give it a try. Press the \\"really wide\\" button on the image toolbar.Download
      
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Gallery block 1`] = `
+"
+
        
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Media & Text block 1`] = `
+"
+
        \\"\\"/
        
+
        
+
        
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Cover block 1`] = `
+"
+
        
+
        
+
        
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the File block 1`] = `
+"
+
        Download
        
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Gallery block 1`] = `
+"
+
          
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Media & Text block 1`] = `
+"
+
          \\"\\"/
          
+
          
+
          
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Cover block 1`] = `
+"
+
          
+
          
+
          
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the File block 1`] = `
+"
+
          Download
          
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Gallery block 1`] = `
+"
+
            
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Media & Text block 1`] = `
+"
+
            \\"\\"/
            
+
            
+
            
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Cover block 1`] = `
+"
+
            
+
            
+
            
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the File block 1`] = `
+"
+
            Download
            
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Gallery block 1`] = `
+"
+
              
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Media & Text block 1`] = `
+"
+
              \\"\\"/
              
+
              
+
              
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Cover block 1`] = `
+"
+
              
+
              
+
              
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the File block 1`] = `
+"
+
              Download
              
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Gallery block 1`] = `
+"
+
                
+"
+`;
+
+exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Media & Text block 1`] = `
+"
+
                \\"\\"/
                
+
                
+
                
+"
+`;
+
 exports[`Block transforms correctly transform block List in fixture core__list__ul into the Paragraph block 1`] = `
 "
 
                Text & Headings
                
@@ -64,6 +304,36 @@ exports[`Block transforms correctly transform block List in fixture core__list__
 "
 `;
 
+exports[`Block transforms correctly transform block Media & Text in fixture core__media-text into the Image block 1`] = `
+"
+
                \\"\\"/
                
+"
+`;
+
+exports[`Block transforms correctly transform block Media & Text in fixture core__media-text__image-alt-no-align into the Image block 1`] = `
+"
+
                \\"my
                
+"
+`;
+
+exports[`Block transforms correctly transform block Media & Text in fixture core__media-text__is-stacked-on-mobile into the Video block 1`] = `
+"
+
                
+"
+`;
+
+exports[`Block transforms correctly transform block Media & Text in fixture core__media-text__media-right-custom-width into the Video block 1`] = `
+"
+
                
+"
+`;
+
+exports[`Block transforms correctly transform block Media & Text in fixture core__media-text__video into the Video block 1`] = `
+"
+
                
+"
+`;
+
 exports[`Block transforms correctly transform block Paragraph in fixture core__paragraph__align-right into the Heading block 1`] = `
 "
 
                ... like this one, which is separate from the above and right aligned.
                
@@ -181,3 +451,25 @@ exports[`Block transforms correctly transform block Verse in fixture core__verse
 
                A verse…
                And more!
                
 "
 `;
+
+exports[`Block transforms correctly transform block Video in fixture core__video into the Cover block 1`] = `
+"
+
                
+
                
+
                
+"
+`;
+
+exports[`Block transforms correctly transform block Video in fixture core__video into the File block 1`] = `
+"
+
                Download
                
+"
+`;
+
+exports[`Block transforms correctly transform block Video in fixture core__video into the Media & Text block 1`] = `
+"
+
                
+
                
+
                
+"
+`;
diff --git a/packages/e2e-tests/specs/block-transforms.test.js b/packages/e2e-tests/specs/block-transforms.test.js
index d76f546ebc984..8a4a2a38461bb 100644
--- a/packages/e2e-tests/specs/block-transforms.test.js
+++ b/packages/e2e-tests/specs/block-transforms.test.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import {
-	filter,
 	flatMap,
 	map,
 	mapValues,
@@ -98,32 +97,11 @@ const getTransformResult = async ( blockContent, transformName ) => {
 // Skipping all the tests when plugins are enabled
 // makes sure the tests are not executed, and no unused snapshots errors are thrown.
 const maybeDescribe = process.env.POPULAR_PLUGINS ?
-	describe :
-	describe.skip;
+	describe.skip :
+	describe;
 
 maybeDescribe( 'Block transforms', () => {
-	// Todo: Remove the filter as soon as all fixtures are corrected,
-	// and its direct usage on the editor does not trigger errors.
-	// Currently some fixtures trigger errors (mainly media related)
-	// because when loaded in the editor,
-	// some requests are triggered that have a 404 response.
-	const fileBasenames = filter(
-		getAvailableBlockFixturesBasenames(),
-		( basename ) => (
-			! some(
-				[
-					'core__image',
-					'core__gallery',
-					'core__video',
-					'core__file',
-					'core__media-text',
-					'core__audio',
-					'core__cover',
-				],
-				( exclude ) => basename.startsWith( exclude )
-			)
-		)
-	);
+	const fileBasenames = getAvailableBlockFixturesBasenames();
 
 	const transformStructure = {};
 	beforeAll( async () => {