summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-19 13:32:07 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-19 13:32:07 +0100
commit1f33e0a7c4cd278158b37f91a2aa44f0bcd1f21a (patch)
tree5d8bc2c8d3ca4df3f1f938c80ea0c1d535596cd2
parent8e7d6223f630690b72b387eaed704bf01f3f29d2 (diff)
downloadvim-git-1f33e0a7c4cd278158b37f91a2aa44f0bcd1f21a.tar.gz
patch 8.2.2161: arguments -T and -x not tested yetv8.2.2161
Problem: Arguments -T and -x not tested yet. Solution: Add a test. (Dominique Pellé, closes #7490
-rw-r--r--src/testdir/test_startup.vim47
-rw-r--r--src/version.c2
2 files changed, 49 insertions, 0 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 8b9b7e401..72c43eac9 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -741,6 +741,53 @@ func Test_t_arg()
call delete('Xfile1')
endfunc
+" Test the '-T' argument which sets the 'term' option.
+func Test_T_arg()
+ CheckNotGui
+ let after =<< trim [CODE]
+ call writefile([&term], "Xtest_T_arg")
+ qall
+ [CODE]
+
+ for t in ['builtin_dumb', 'builtin_ansi']
+ if RunVim([], after, '-T ' .. t)
+ let lines = readfile('Xtest_T_arg')
+ call assert_equal([t], lines)
+ endif
+ endfor
+
+ call delete('Xtest_T_arg')
+endfunc
+
+" Test the '-x' argument to read/write encrypted files.
+func Test_x_arg()
+ CheckRunVimInTerminal
+ CheckFeature cryptv
+
+ " Create an encrypted file Xtest_x_arg.
+ let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+ call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+ call term_sendkeys(buf, "foo\n")
+ call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+ call term_sendkeys(buf, "foo\n")
+ call WaitForAssert({-> assert_match(' All$', term_getline(buf, 10))})
+ call term_sendkeys(buf, "itest\<Esc>:w\<Enter>")
+ call WaitForAssert({-> assert_match('"Xtest_x_arg" \[New\]\[blowfish2\] 1L, 5B written',
+ \ term_getline(buf, 10))})
+ call StopVimInTerminal(buf)
+
+ " Read the encrypted file and check that it contains the expected content "test"
+ let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+ call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+ call term_sendkeys(buf, "foo\n")
+ call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+ call term_sendkeys(buf, "foo\n")
+ call WaitForAssert({-> assert_match('^test', term_getline(buf, 1))})
+ call StopVimInTerminal(buf)
+
+ call delete('Xtest_x_arg')
+endfunc
+
" Test for entering the insert mode on startup
func Test_start_insertmode()
let before =<< trim [CODE]
diff --git a/src/version.c b/src/version.c
index 69ec791d0..9d2632b09 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2161,
+/**/
2160,
/**/
2159,