use BufReadPost instead of BufEnter to trigger conflict detection

rhysd · Nov 1, 2022 · 11a4d42 · 11a4d42
1 parent 3df8be7
commit 11a4d42
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/test/test_default.vimspec b/test/test_default.vimspec
@@ -52,7 +52,7 @@ Describe Default settings
             for l in range(1, len(lines))
                 call setline(l, lines[l-1])
             endfor
-            doautocmd BufEnter
+            doautocmd BufReadPost
 
             Assert NotEmpty(mapcheck(']x', 'n'))
             Assert NotEmpty(mapcheck('[x', 'n'))

diff --git a/test/test_hooks.vimspec b/test/test_hooks.vimspec
@@ -24,7 +24,7 @@ Describe g:conflict_marker_hooks
     It does nothing if does not have on_detected hook
         let g:conflict_marker_hooks = {}
         " Check exception is not thrown
-        doautocmd BufEnter
+        doautocmd BufReadPost
     End
 
     It execute on_detected hook specified by string
@@ -34,7 +34,7 @@ Describe g:conflict_marker_hooks
         endfunction
         let g:conflict_marker_hooks = {'on_detected' : 'TestHook'}
 
-        doautocmd BufEnter
+        doautocmd BufReadPost
         Assert g:test_hooked
         unlet g:test_hooked
     End
@@ -46,7 +46,7 @@ Describe g:conflict_marker_hooks
             let g:test_hooked = 1
         endfunction
 
-        doautocmd BufEnter
+        doautocmd BufReadPost
         Assert g:test_hooked
         unlet g:test_hooked
     End

diff --git a/test/test_matchit.vimspec b/test/test_matchit.vimspec
@@ -26,7 +26,7 @@ Describe matchit
         for l in range(1, len(s:lines))
             call setline(l, s:lines[l-1])
         endfor
-        doautocmd BufEnter
+        doautocmd BufReadPost
     End
 
     After
@@ -57,7 +57,7 @@ Describe matchit with diff3
         for l in range(1, len(s:lines_diff3))
             call setline(l, s:lines_diff3[l-1])
         endfor
-        doautocmd BufEnter
+        doautocmd BufReadPost
     End
 
     After

diff --git a/test/test_resolve.vimspec b/test/test_resolve.vimspec
@@ -27,7 +27,7 @@ function! s:load(lines)
     for l in range(1, len(a:lines))
         call setline(l, a:lines[l-1])
     endfor
-    doautocmd BufEnter
+    doautocmd BufReadPost
 endfunction
 
 Describe :ConflictMarkerThemselves

diff --git a/test/test_syntax.vimspec b/test/test_syntax.vimspec
@@ -38,7 +38,7 @@ Describe Conflict marker
     End
 
     It is highlighted
-        doautocmd BufEnter
+        doautocmd BufReadPost
         for l in [1, 8, 15]
             Assert Equals(GetHighlight(l, 1), 'ConflictMarkerBegin')
             Assert Equals(GetHighlight(l+1, 2), 'ConflictMarkerOurs')
@@ -48,7 +48,7 @@ Describe Conflict marker
         endfor
     End
 
-    It is not highlighted if no marker is detected at BufEnter
+    It is not highlighted if no marker is detected at BufReadPost
         for l in [1, 8, 15]
             Assert NotEquals(GetHighlight(l, 1), 'ConflictMarkerBegin')
             Assert NotEquals(GetHighlight(l+1, 2), 'ConflictMarkerOurs')
@@ -69,7 +69,7 @@ Describe Conflict marker
 
         It can disable detection (#18)
             let g:conflict_marker_enable_detect = 0
-            doautocmd BufEnter
+            doautocmd BufReadPost
             for l in [1, 8, 15]
                 Assert NotEquals(GetHighlight(l, 1), 'ConflictMarkerBegin')
                 Assert NotEquals(GetHighlight(l+1, 2), 'ConflictMarkerOurs')