diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index a2e90709b..5a5fc0e77 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -638,6 +638,41 @@ func RegisterHash(h Hash, f func() hash.Hash) { | x -> hey -> y`, }, + { + name: "md_code_inline", + script: `md: |md +` + "`code`" + ` +| +a -> md -> b +`, + }, + { + name: "md_code_block_fenced", + script: `md: |md +` + "```" + ` +{ + fenced: "block", + of: "json", +} +` + "```" + ` +| +a -> md -> b +`, + }, + { + name: "md_code_block_indented", + script: `md: |md +a line of text and an + + { + indented: "block", + of: "json", + } + +| +a -> md -> b +`, + }, } runa(t, tcs) diff --git a/e2etests/testdata/todo/md_code_block_fenced/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/board.exp.json similarity index 100% rename from e2etests/testdata/todo/md_code_block_fenced/board.exp.json rename to e2etests/testdata/stable/md_code_block_fenced/board.exp.json diff --git a/e2etests/testdata/todo/md_code_block_fenced/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_fenced/sketch.exp.svg similarity index 100% rename from e2etests/testdata/todo/md_code_block_fenced/sketch.exp.svg rename to e2etests/testdata/stable/md_code_block_fenced/sketch.exp.svg diff --git a/e2etests/testdata/todo/md_code_block_indented/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/board.exp.json similarity index 89% rename from e2etests/testdata/todo/md_code_block_indented/board.exp.json rename to e2etests/testdata/stable/md_code_block_indented/board.exp.json index 0db1ae053..b3d0d09ea 100644 --- a/e2etests/testdata/todo/md_code_block_indented/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/board.exp.json @@ -8,8 +8,8 @@ "x": 0, "y": 226 }, - "width": 208, - "height": 24, + "width": 212, + "height": 151, "level": 1, "opacity": 1, "strokeDash": 0, @@ -27,7 +27,7 @@ "fields": null, "methods": null, "columns": null, - "label": "{\n indented: \"block\",\n of: \"json\",\n}", + "label": "a line of text and an\n\n\t{\n\t\tindented: \"block\",\n\t\tof: \"json\",\n\t}\n", "fontSize": 16, "fontFamily": "DEFAULT", "language": "markdown", @@ -35,14 +35,14 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 208, - "labelHeight": 24 + "labelWidth": 212, + "labelHeight": 151 }, { "id": "a", "type": "", "pos": { - "x": 48, + "x": 50, "y": 0 }, "width": 113, @@ -80,8 +80,8 @@ "id": "b", "type": "", "pos": { - "x": 48, - "y": 350 + "x": 50, + "y": 477 }, "width": 113, "height": 126, @@ -142,19 +142,19 @@ "labelPercentage": 0, "route": [ { - "x": 104, + "x": 106, "y": 126 }, { - "x": 104, + "x": 106, "y": 166 }, { - "x": 104, + "x": 106, "y": 186 }, { - "x": 104, + "x": 106, "y": 226 } ], @@ -189,20 +189,20 @@ "labelPercentage": 0, "route": [ { - "x": 104, - "y": 250 + "x": 106, + "y": 377 }, { - "x": 104, - "y": 290 + "x": 106, + "y": 417 }, { - "x": 104, - "y": 310 + "x": 106, + "y": 437 }, { - "x": 104, - "y": 350 + "x": 106, + "y": 477 } ], "isCurve": true, diff --git a/e2etests/testdata/todo/md_code_block_indented/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_indented/sketch.exp.svg similarity index 78% rename from e2etests/testdata/todo/md_code_block_indented/sketch.exp.svg rename to e2etests/testdata/stable/md_code_block_indented/sketch.exp.svg index 288d808fa..c01a5157d 100644 --- a/e2etests/testdata/todo/md_code_block_indented/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_indented/sketch.exp.svg @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/e2etests/testdata/todo/md_code_inline/board.exp.json b/e2etests/testdata/stable/md_code_inline/board.exp.json similarity index 100% rename from e2etests/testdata/todo/md_code_inline/board.exp.json rename to e2etests/testdata/stable/md_code_inline/board.exp.json diff --git a/e2etests/testdata/todo/md_code_inline/sketch.exp.svg b/e2etests/testdata/stable/md_code_inline/sketch.exp.svg similarity index 100% rename from e2etests/testdata/todo/md_code_inline/sketch.exp.svg rename to e2etests/testdata/stable/md_code_inline/sketch.exp.svg diff --git a/e2etests/todo_test.go b/e2etests/todo_test.go index 9ae90c4aa..3459d052a 100644 --- a/e2etests/todo_test.go +++ b/e2etests/todo_test.go @@ -6,45 +6,7 @@ import ( ) func testTodo(t *testing.T) { - tcs := []testCase{ - // https://github.com/terrastruct/d2/issues/24 - // string monstrosity from not being able to escape backticks within string literals - { - name: "md_code_inline", - script: `md: |md -` + "`code`" + ` -| -a -> md -> b -`, - }, - { - name: "md_code_block_fenced", - script: `md: |md -` + "```" + ` -{ - fenced: "block", - of: "json", -} -` + "```" + ` -| -a -> md -> b -`, - }, - { - name: "md_code_block_indented", - script: `md: |md -a line of text and an - - { - indented: "block", - of: "json", - } - -| -a -> md -> b -`, - }, - } + tcs := []testCase{} runa(t, tcs) }