aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-07-29 20:59:38 +0200
committerGitHub <noreply@github.com>2019-07-29 20:59:38 +0200
commitbae02eb3968be1c9677283d030fbbe6dd02cb180 (patch)
tree826839463784f5464c8b4203eafc1c0d98205b91 /test
parent6e03f87e0991b5b0dfffa79ae580b87e40468da1 (diff)
parentd6b31721bfadabf5eaa817321706d403ecfbf805 (diff)
downloadrneovim-bae02eb3968be1c9677283d030fbbe6dd02cb180.tar.gz
rneovim-bae02eb3968be1c9677283d030fbbe6dd02cb180.tar.bz2
rneovim-bae02eb3968be1c9677283d030fbbe6dd02cb180.zip
Merge #10645 from janlazo/vim-8.1.0999
vim-patch:8.1.{1005,1041,1049,1052,1053,1086,1394}
Diffstat (limited to 'test')
-rw-r--r--test/functional/eval/system_spec.lua4
-rw-r--r--test/functional/ui/cmdline_highlight_spec.lua2
-rw-r--r--test/functional/ui/messages_spec.lua4
3 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua
index 865a890acf..13134bc6e7 100644
--- a/test/functional/eval/system_spec.lua
+++ b/test/functional/eval/system_spec.lua
@@ -275,7 +275,7 @@ describe('system()', function()
~ |
~ |
~ |
- Type :qa! and press <E...all changes and exit Nvim |
+ Type :qa and press <Enter> to exit Nvim |
]])
end)
end)
@@ -481,7 +481,7 @@ describe('systemlist()', function()
~ |
~ |
~ |
- Type :qa! and press <E...all changes and exit Nvim |
+ Type :qa and press <Enter> to exit Nvim |
]])
end)
end)
diff --git a/test/functional/ui/cmdline_highlight_spec.lua b/test/functional/ui/cmdline_highlight_spec.lua
index 45808b3b1b..052414a43d 100644
--- a/test/functional/ui/cmdline_highlight_spec.lua
+++ b/test/functional/ui/cmdline_highlight_spec.lua
@@ -494,7 +494,7 @@ describe('Command-line coloring', function()
{EOB:~ }|
{EOB:~ }|
{EOB:~ }|
- Type :qa! and pr...nges and exit Nvim |
+ Type :qa and pre...nter> to exit Nvim |
]])
end)
it('works fine with NUL, NL, CR', function()
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 2857c2fe1e..9a1a0f66a2 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -631,7 +631,7 @@ describe('ui/ext_messages', function()
{1:~ }|
{1:~ }|
]], messages={{
- content = {{ "Type :qa! and press <Enter> to abandon all changes and exit Nvim" }},
+ content = {{ "Type :qa and press <Enter> to exit Nvim" }},
kind = ""}
}}
@@ -678,7 +678,7 @@ describe('ui/ext_messages', function()
{1:~ }|
]], messages={
{kind="echomsg", content={{"howdy"}}},
- {kind="", content={{"Type :qa! and press <Enter> to abandon all changes and exit Nvim"}}},
+ {kind="", content={{"Type :qa and press <Enter> to exit Nvim"}}},
{kind="echoerr", content={{"bork", 2}}},
{kind="emsg", content={{"E117: Unknown function: nosuchfunction", 2}}}
}}