fix tests broken by #25

rhysd · May 20, 2024 · b877faa · b877faa
1 parent bdc226c
commit b877faa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/test_default.vimspec b/test/test_default.vimspec
@@ -2,10 +2,10 @@ Describe Default settings
     It provide variables to customize
         Assert Exists('g:loaded_conflict_marker')
         Assert Equals(g:conflict_marker_highlight_group, 'Error')
-        Assert Equals(g:conflict_marker_begin, '^<<<<<<<')
-        Assert Equals(g:conflict_marker_common_ancestors, '^|||||||')
-        Assert Equals(g:conflict_marker_separator, '^=======$')
-        Assert Equals(g:conflict_marker_end, '^>>>>>>>')
+        Assert Equals(g:conflict_marker_begin, '^<<<<<<<\+')
+        Assert Equals(g:conflict_marker_common_ancestors, '^|||||||\+')
+        Assert Equals(g:conflict_marker_separator, '^=======\+$')
+        Assert Equals(g:conflict_marker_end, '^>>>>>>>\+')
         Assert Equals(g:conflict_marker_enable_mappings, 1)
         Assert Equals(g:conflict_marker_enable_hooks, 1)
         Assert Equals(g:conflict_marker_enable_highlight, 1)

diff --git a/test/test_matchit.vimspec b/test/test_matchit.vimspec
@@ -35,7 +35,7 @@ Describe matchit
 
     It defines b:match_words
         Assert Exists('b:match_words')
-        Assert Match(b:match_words, ',^<<<<<<<:^|||||||:^=======$:^>>>>>>>')
+        Assert Equals(b:match_words, ',^<<<<<<<\+:^|||||||\+:^=======\+$:^>>>>>>>\+')
     End
 
     It can jump within a conflict marker