summaryrefslogtreecommitdiffstats
path: root/src/testdir/test_diffmode.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-03 22:55:50 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-03 22:55:50 +0200
commit3c8ee629745737aa231fdd123826ae021e398e49 (patch)
treeede1f3b7673776045644a1059d14af30295cfe51 /src/testdir/test_diffmode.vim
parentac92e25a33c37ec5becbfffeccda136c73b761ac (diff)
patch 8.1.1804: no test for display updating without a scroll regionv8.1.1804
Problem: No test for display updating without a scroll region. Solution: Add a test.
Diffstat (limited to 'src/testdir/test_diffmode.vim')
-rw-r--r--src/testdir/test_diffmode.vim19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index f82a11c925..aae8b363b3 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1,6 +1,7 @@
" Tests for diff mode
source shared.vim
source screendump.vim
+source check.vim
func Test_diff_fold_sync()
enew!
@@ -748,9 +749,9 @@ func VerifyInternal(buf, dumpfile, extra)
endfunc
func Test_diff_screen()
- if !CanRunVimInTerminal() || !has('menu')
- throw 'Skipped: cannot make screendumps and/or menu feature missing'
- endif
+ CheckScreendump
+ CheckFeature menu
+
" clean up already existing swap files, just in case
call delete('.Xfile1.swp')
call delete('.Xfile2.swp')
@@ -880,9 +881,7 @@ func Test_diff_screen()
endfunc
func Test_diff_with_cursorline()
- if !CanRunVimInTerminal()
- throw 'Skipped: cannot run Vim in a terminal window'
- endif
+ CheckScreendump
call writefile([
\ 'hi CursorLine ctermbg=red ctermfg=white',
@@ -907,12 +906,8 @@ func Test_diff_with_cursorline()
endfunc
func Test_diff_of_diff()
- if !CanRunVimInTerminal()
- throw 'Skipped: cannot run Vim in a terminal window'
- endif
- if !has("rightleft")
- throw 'Skipped: rightleft not supported'
- endif
+ CheckScreendump
+ CheckFeature rightleft
call writefile([
\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',