aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Malcomson <hardenedapple@gmail.com>2017-03-30 18:00:34 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-03-30 19:00:34 +0200
commit66b336d89bd5b45e60587b3c1689c7435019d775 (patch)
tree53b4303e722c90709464bdac0dca5d24d7b6ce3c
parent75b98f7c3f23b18e30c362028af3bf3dae663a02 (diff)
downloadrneovim-66b336d89bd5b45e60587b3c1689c7435019d775.tar.gz
rneovim-66b336d89bd5b45e60587b3c1689c7435019d775.tar.bz2
rneovim-66b336d89bd5b45e60587b3c1689c7435019d775.zip
test: set 'nomore' by default (#6360)
Escaping from a '-- More --' prompt in tests is awkward as it doesn't take keys from the typebuffer, requiring a call to `feed()` in lua at the correct time. Moreover, it's rarer that a test will want the '-- More --' prompt to be activated than not.
-rw-r--r--test/functional/helpers.lua2
-rw-r--r--test/functional/legacy/051_highlight_spec.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 7ce95d0b7c..ab36508262 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -23,7 +23,7 @@ local nvim_prog = os.getenv('NVIM_PROG') or os.getenv('NVIM_PRG') or 'build/bin/
-- Default settings for the test session.
local nvim_set = 'set shortmess+=I background=light noswapfile noautoindent'
..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.'
- ..' belloff= noshowcmd noruler'
+ ..' belloff= noshowcmd noruler nomore'
local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
'--cmd', nvim_set, '--embed'}
diff --git a/test/functional/legacy/051_highlight_spec.lua b/test/functional/legacy/051_highlight_spec.lua
index ef392d8c67..d4d9b7d997 100644
--- a/test/functional/legacy/051_highlight_spec.lua
+++ b/test/functional/legacy/051_highlight_spec.lua
@@ -16,7 +16,7 @@ describe(':highlight', function()
local screen = Screen.new(35, 10)
screen:attach()
-- Basic test if ":highlight" doesn't crash
- execute('highlight')
+ execute('set more', 'highlight')
-- FIXME(tarruda): We need to be sure the prompt is displayed before
-- continuing, or risk a race condition where some of the following input
-- is discarded resulting in test failure