From 87895f13b004964a76ed3275e1d8228c09722538 Mon Sep 17 00:00:00 2001 From: Fred Carlsen Date: Wed, 20 Dec 2023 15:09:58 +0100 Subject: [PATCH] fix(block-tools): fix broken unit tests Signed-off-by: Fred Carlsen --- .../tests/HtmlDeserializer/gdocs/output.json | 73 +++++-------------- .../HtmlDeserializer/gdocsFirefox/output.json | 73 +++++-------------- .../gdocsWhitespaceNormalize/output.json | 73 +++++-------------- .../gdocsWhitespaceRemove/output.json | 73 +++++-------------- .../gdocsWhitespaceRemoveFirefox/output.json | 73 +++++-------------- 5 files changed, 95 insertions(+), 270 deletions(-) diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json index 96691f6c66e..7e34c7f7fdc 100644 --- a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json +++ b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json @@ -4,9 +4,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem:", "_key": "randomKey10" } @@ -278,9 +276,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem:", "_key": "randomKey190" }, @@ -300,9 +296,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey200" } @@ -316,9 +310,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem: ", "_key": "randomKey210" }, @@ -338,9 +330,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey220" }, @@ -388,9 +378,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Bold", "_key": "randomKey250" } @@ -404,9 +392,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Italic", "_key": "randomKey260" } @@ -420,7 +406,7 @@ "children": [ { "_type": "span", - "marks": [], + "marks": ["underline"], "text": "Underline", "_key": "randomKey270" } @@ -448,9 +434,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem", "_key": "randomKey290" } @@ -492,9 +476,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey320" } @@ -570,9 +552,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey370" } @@ -632,9 +612,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey410" } @@ -710,9 +688,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey460" } @@ -726,9 +702,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey470" } @@ -742,9 +716,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem", "_key": "randomKey480" } @@ -758,10 +730,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong", - "em" - ], + "marks": ["strong", "em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey490" } @@ -789,9 +758,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem Lorem:", "_key": "randomKey510" }, @@ -1321,9 +1288,7 @@ }, { "_type": "span", - "marks": [ - "randomKey0" - ], + "marks": ["randomKey0", "underline"], "text": "Lorem Lorem", "_key": "randomKey881" }, @@ -1358,4 +1323,4 @@ "_type": "block", "style": "normal" } -] \ No newline at end of file +] diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json index 1bf2fa31e3b..f91c4b8e080 100644 --- a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json +++ b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json @@ -4,9 +4,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem:", "_key": "randomKey10" } @@ -278,9 +276,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem:", "_key": "randomKey190" }, @@ -300,9 +296,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey200" } @@ -316,9 +310,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem: ", "_key": "randomKey210" }, @@ -338,9 +330,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey220" }, @@ -388,9 +378,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Bold", "_key": "randomKey250" } @@ -404,9 +392,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Italic", "_key": "randomKey260" } @@ -420,7 +406,7 @@ "children": [ { "_type": "span", - "marks": [], + "marks": ["underline"], "text": "Underline", "_key": "randomKey270" } @@ -448,9 +434,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem", "_key": "randomKey290" } @@ -492,9 +476,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey320" } @@ -570,9 +552,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey370" } @@ -632,9 +612,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey410" } @@ -710,9 +688,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey460" } @@ -726,9 +702,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey470" } @@ -742,9 +716,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem", "_key": "randomKey480" } @@ -758,10 +730,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong", - "em" - ], + "marks": ["strong", "em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey490" } @@ -789,9 +758,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem Lorem:", "_key": "randomKey510" }, @@ -1321,9 +1288,7 @@ }, { "_type": "span", - "marks": [ - "randomKey0" - ], + "marks": ["randomKey0", "underline"], "text": "Lorem Lorem", "_key": "randomKey881" }, @@ -1344,4 +1309,4 @@ "_type": "block", "style": "normal" } -] \ No newline at end of file +] diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json index 98336c7b0af..408438d333f 100644 --- a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json +++ b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json @@ -4,9 +4,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem:", "_key": "randomKey10" } @@ -404,9 +402,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem:", "_key": "randomKey280" }, @@ -426,9 +422,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey290" } @@ -442,9 +436,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem: ", "_key": "randomKey300" }, @@ -464,9 +456,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey310" }, @@ -514,9 +504,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Bold", "_key": "randomKey340" } @@ -530,9 +518,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Italic", "_key": "randomKey350" } @@ -546,7 +532,7 @@ "children": [ { "_type": "span", - "marks": [], + "marks": ["underline"], "text": "Underline", "_key": "randomKey360" } @@ -574,9 +560,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem", "_key": "randomKey380" } @@ -618,9 +602,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey410" } @@ -696,9 +678,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey460" } @@ -758,9 +738,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey500" } @@ -836,9 +814,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey550" } @@ -852,9 +828,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey560" } @@ -868,9 +842,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem", "_key": "randomKey570" } @@ -884,10 +856,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong", - "em" - ], + "marks": ["strong", "em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey580" } @@ -915,9 +884,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem Lorem:", "_key": "randomKey600" }, @@ -1475,9 +1442,7 @@ }, { "_type": "span", - "marks": [ - "randomKey0" - ], + "marks": ["randomKey0", "underline"], "text": "Lorem Lorem", "_key": "randomKey991" }, @@ -1512,4 +1477,4 @@ "_type": "block", "style": "normal" } -] \ No newline at end of file +] diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json index bbde8570148..5866f0f72da 100644 --- a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json +++ b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json @@ -4,9 +4,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem:", "_key": "randomKey10" } @@ -222,9 +220,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem:", "_key": "randomKey150" }, @@ -244,9 +240,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey160" } @@ -260,9 +254,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem: ", "_key": "randomKey170" }, @@ -282,9 +274,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey180" }, @@ -318,9 +308,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Bold", "_key": "randomKey200" } @@ -334,9 +322,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Italic", "_key": "randomKey210" } @@ -350,7 +336,7 @@ "children": [ { "_type": "span", - "marks": [], + "marks": ["underline"], "text": "Underline", "_key": "randomKey220" } @@ -364,9 +350,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem", "_key": "randomKey230" } @@ -394,9 +378,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey250" } @@ -458,9 +440,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey290" } @@ -506,9 +486,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey320" } @@ -570,9 +548,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey360" } @@ -586,9 +562,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey370" } @@ -602,9 +576,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem", "_key": "randomKey380" } @@ -618,10 +590,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong", - "em" - ], + "marks": ["strong", "em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey390" } @@ -635,9 +604,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem Lorem:", "_key": "randomKey400" }, @@ -943,9 +910,7 @@ }, { "_type": "span", - "marks": [ - "randomKey0" - ], + "marks": ["randomKey0", "underline"], "text": "Lorem Lorem", "_key": "randomKey611" }, @@ -980,4 +945,4 @@ "_type": "block", "style": "normal" } -] \ No newline at end of file +] diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json index a67d92c4d65..d1d628e6af2 100644 --- a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json +++ b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json @@ -4,9 +4,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem:", "_key": "randomKey10" } @@ -222,9 +220,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem:", "_key": "randomKey150" }, @@ -244,9 +240,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey160" } @@ -260,9 +254,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem: ", "_key": "randomKey170" }, @@ -282,9 +274,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem:", "_key": "randomKey180" }, @@ -318,9 +308,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Bold", "_key": "randomKey200" } @@ -334,9 +322,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Italic", "_key": "randomKey210" } @@ -350,7 +336,7 @@ "children": [ { "_type": "span", - "marks": [], + "marks": ["underline"], "text": "Underline", "_key": "randomKey220" } @@ -364,9 +350,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem", "_key": "randomKey230" } @@ -394,9 +378,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey250" } @@ -458,9 +440,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem", "_key": "randomKey290" } @@ -506,9 +486,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey320" } @@ -570,9 +548,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem", "_key": "randomKey360" } @@ -586,9 +562,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey370" } @@ -602,9 +576,7 @@ "children": [ { "_type": "span", - "marks": [ - "em" - ], + "marks": ["em"], "text": "Lorem Lorem", "_key": "randomKey380" } @@ -618,10 +590,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong", - "em" - ], + "marks": ["strong", "em"], "text": "Lorem Lorem Lorem Lorem Lorem Lorem", "_key": "randomKey390" } @@ -635,9 +604,7 @@ "children": [ { "_type": "span", - "marks": [ - "strong" - ], + "marks": ["strong"], "text": "Lorem Lorem Lorem Lorem:", "_key": "randomKey400" }, @@ -943,9 +910,7 @@ }, { "_type": "span", - "marks": [ - "randomKey0" - ], + "marks": ["randomKey0", "underline"], "text": "Lorem Lorem", "_key": "randomKey611" }, @@ -966,4 +931,4 @@ "_type": "block", "style": "normal" } -] \ No newline at end of file +]