diff options
author | Adrian <adrian@planetcoding.net> | 2018-07-16 17:12:31 +0200 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2018-07-16 11:12:31 -0400 |
commit | 88eef609ab712097ff2b13a2ca45c31ea6fa7df2 (patch) | |
tree | d26bf886e26286f1611670f78c1364b9328231c1 /utils/markdown/text_range_test.go | |
parent | 940d0bbbc2d8f2778811641e45f8a90a88682786 (diff) | |
download | chat-88eef609ab712097ff2b13a2ca45c31ea6fa7df2.tar.gz chat-88eef609ab712097ff2b13a2ca45c31ea6fa7df2.tar.bz2 chat-88eef609ab712097ff2b13a2ca45c31ea6fa7df2.zip |
Merge consecutive text nodes when inspecting markdown (#9112)
* Fix assertion order
expected/actual were in wrong order, resulting in misleading output in
case of failing tests
* Merge consesutive markdown text nodes
This ensures that parser quirks such as "hello!" being parsed as
two separate nodes ("hello" and "!") are not exposed to code inspecting
a markdown strings.
Diffstat (limited to 'utils/markdown/text_range_test.go')
-rw-r--r-- | utils/markdown/text_range_test.go | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/utils/markdown/text_range_test.go b/utils/markdown/text_range_test.go index 9c0efea85..25c13c40d 100644 --- a/utils/markdown/text_range_test.go +++ b/utils/markdown/text_range_test.go @@ -22,8 +22,8 @@ func TestTextRanges(t *testing.T) { }, "simple2": { Markdown: "hello!", - ExpectedRanges: []Range{{0, 5}, {5, 6}}, - ExpectedValues: []string{"hello", "!"}, + ExpectedRanges: []Range{{0, 6}}, + ExpectedValues: []string{"hello!"}, }, "multiline": { Markdown: "hello world\nfoobar", @@ -37,13 +37,13 @@ func TestTextRanges(t *testing.T) { }, "notcode": { Markdown: "hello ` world", - ExpectedRanges: []Range{{0, 6}, {6, 7}, {7, 13}}, - ExpectedValues: []string{"hello ", "`", " world"}, + ExpectedRanges: []Range{{0, 13}}, + ExpectedValues: []string{"hello ` world"}, }, "escape": { Markdown: "\\*hello\\*", - ExpectedRanges: []Range{{1, 2}, {2, 7}, {8, 9}}, - ExpectedValues: []string{"*", "hello", "*"}, + ExpectedRanges: []Range{{1, 7}, {8, 9}}, + ExpectedValues: []string{"*hello", "*"}, }, "escapeescape": { Markdown: "\\\\", @@ -52,28 +52,28 @@ func TestTextRanges(t *testing.T) { }, "notescape": { Markdown: "foo\\x", - ExpectedRanges: []Range{{0, 3}, {3, 4}, {4, 5}}, - ExpectedValues: []string{"foo", "\\", "x"}, + ExpectedRanges: []Range{{0, 5}}, + ExpectedValues: []string{"foo\\x"}, }, "notlink": { Markdown: "[foo", - ExpectedRanges: []Range{{0, 1}, {1, 4}}, - ExpectedValues: []string{"[", "foo"}, + ExpectedRanges: []Range{{0, 4}}, + ExpectedValues: []string{"[foo"}, }, "notlinkend": { Markdown: "[foo]", - ExpectedRanges: []Range{{0, 1}, {1, 4}, {4, 5}}, - ExpectedValues: []string{"[", "foo", "]"}, + ExpectedRanges: []Range{{0, 5}}, + ExpectedValues: []string{"[foo]"}, }, "notimage": { Markdown: "![foo", - ExpectedRanges: []Range{{0, 2}, {2, 5}}, - ExpectedValues: []string{"![", "foo"}, + ExpectedRanges: []Range{{0, 5}}, + ExpectedValues: []string{"![foo"}, }, "notimage2": { Markdown: "!foo", - ExpectedRanges: []Range{{0, 1}, {1, 4}}, - ExpectedValues: []string{"!", "foo"}, + ExpectedRanges: []Range{{0, 4}}, + ExpectedValues: []string{"!foo"}, }, "charref": { Markdown: ""test", @@ -82,13 +82,13 @@ func TestTextRanges(t *testing.T) { }, "notcharref": { Markdown: "& test", - ExpectedRanges: []Range{{0, 1}, {1, 9}}, - ExpectedValues: []string{"&", "amp test"}, + ExpectedRanges: []Range{{0, 9}}, + ExpectedValues: []string{"& test"}, }, "notcharref2": { Markdown: "&mattermost;", - ExpectedRanges: []Range{{0, 1}, {1, 12}}, - ExpectedValues: []string{"&", "mattermost;"}, + ExpectedRanges: []Range{{0, 12}}, + ExpectedValues: []string{"&mattermost;"}, }, } { t.Run(name, func(t *testing.T) { @@ -101,8 +101,8 @@ func TestTextRanges(t *testing.T) { } return true }) - assert.Equal(t, ranges, tc.ExpectedRanges) - assert.Equal(t, values, tc.ExpectedValues) + assert.Equal(t, tc.ExpectedRanges, ranges) + assert.Equal(t, tc.ExpectedValues, values) }) } |