aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-09-08 18:40:46 -0700
committerGitHub <noreply@github.com>2019-09-08 18:40:46 -0700
commit74c362cec029ba39a8eb0bbd629148e4b6b54968 (patch)
treea8a8af880cb83f0bfb1da9284226868dcf64372f /test
parentccd947ca4a25edb59e00724d6fb20fb01f3b73f7 (diff)
parenta9e2bae0eb6942829dbedfc9c422060da020d8e4 (diff)
downloadrneovim-74c362cec029ba39a8eb0bbd629148e4b6b54968.tar.gz
rneovim-74c362cec029ba39a8eb0bbd629148e4b6b54968.tar.bz2
rneovim-74c362cec029ba39a8eb0bbd629148e4b6b54968.zip
Merge #10975 'paste: fix various bugs'
Diffstat (limited to 'test')
-rw-r--r--test/functional/terminal/tui_spec.lua19
1 files changed, 13 insertions, 6 deletions
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index e0d29d27ff..2bd114b505 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -319,7 +319,7 @@ describe('TUI', function()
{1:x} |
{4:~ }|
{5:[No Name] [+] 3,1 All}|
- |
+ :set ruler |
{3:-- TERMINAL --} |
]]
local expected_attr = {
@@ -353,7 +353,11 @@ describe('TUI', function()
expect_child_buf_lines({''})
-- CRLF input
feed_data('\027[200~'..table.concat(expected_lf,'\r\n')..'\027[201~')
- screen:expect{grid=expected_grid1, attr_ids=expected_attr}
+ screen:expect{
+ grid=expected_grid1:gsub(
+ ':set ruler *',
+ '3 fewer lines; before #1 0 seconds ago '),
+ attr_ids=expected_attr}
expect_child_buf_lines(expected_crlf)
end)
@@ -363,7 +367,10 @@ describe('TUI', function()
feed_data('\027[D') -- <Left> to place cursor between quotes.
wait_for_mode('c')
-- "bracketed paste"
- feed_data('\027[200~line 1\nline 2\n\027[201~')
+ feed_data('\027[200~line 1\nline 2\n')
+ wait_for_mode('c')
+ feed_data('line 3\nline 4\n\027[201~')
+ wait_for_mode('c')
screen:expect{grid=[[
foo |
|
@@ -478,9 +485,9 @@ describe('TUI', function()
feed_data('\n') -- <CR>
screen:expect{grid=[[
foo |
- typed input...line A |
+ typed input..line A |
line B |
- {1: } |
+ {1:.} |
{5:[No Name] [+] }|
|
{3:-- TERMINAL --} |
@@ -505,7 +512,7 @@ describe('TUI', function()
|
{4:~ }|
{5: }|
- {8:paste: Error executing lua: vim.lua:197: Vim:E21: }|
+ {8:paste: Error executing lua: vim.lua:195: Vim:E21: }|
{8:Cannot make changes, 'modifiable' is off} |
{10:Press ENTER or type command to continue}{1: } |
{3:-- TERMINAL --} |