diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-16 08:22:49 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-16 08:22:49 +0800 |
| commit | cb95f71f71f665b21848cf25780d83278cd1dcf0 (patch) | |
| tree | 4ebdf96b731ae839f8beb326e36dcb0b429bc453 /test | |
| parent | 8cc49f9f1ad4edface62284c32f05ef1140d8220 (diff) | |
| parent | 4dee942e732d41ad62b732c0a39719d9405bc928 (diff) | |
| download | rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.tar.gz rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.tar.bz2 rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.zip | |
merge upstream/master
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/plugin/health_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/plugin/shada_spec.lua | 9 | ||||
| -rw-r--r-- | test/functional/ui/mouse_spec.lua | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua index 644cd46092..3739540b09 100644 --- a/test/functional/plugin/health_spec.lua +++ b/test/functional/plugin/health_spec.lua @@ -70,7 +70,7 @@ describe('health.vim', function() health#broken#check ======================================================================== - ERROR: Failed to run healthcheck for "broken" plugin. Exception: - function health#check[20]..health#broken#check, line 1 + function health#check[21]..health#broken#check, line 1 caused an error ]]) end) diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua index 639833071b..dbc78e63f0 100644 --- a/test/functional/plugin/shada_spec.lua +++ b/test/functional/plugin/shada_spec.lua @@ -2076,13 +2076,14 @@ describe('In autoload/shada.vim', function() end it('works', function() + local version = nvim('get_vvar', 'version') getbstrings_eq({{timestamp='current', type=1, value={ generator='shada.vim', - version=704, + version=version, }}}, {}) getbstrings_eq({ {timestamp='current', type=1, value={ - generator='shada.vim', version=704 + generator='shada.vim', version=version }}, {timestamp=0, type=1, value={generator='test'}} }, { @@ -2093,11 +2094,11 @@ describe('In autoload/shada.vim', function() nvim('set_var', 'shada#add_own_header', 1) getbstrings_eq({{timestamp='current', type=1, value={ generator='shada.vim', - version=704, + version=version, }}}, {}) getbstrings_eq({ {timestamp='current', type=1, value={ - generator='shada.vim', version=704 + generator='shada.vim', version=version }}, {timestamp=0, type=1, value={generator='test'}} }, { diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua index 35af34015d..3daf92eea0 100644 --- a/test/functional/ui/mouse_spec.lua +++ b/test/functional/ui/mouse_spec.lua @@ -13,9 +13,6 @@ describe('ui/mouse/input', function() clear() meths.set_option('mouse', 'a') meths.set_option('listchars', 'eol:$') - -- set mousetime to very high value to ensure that even in valgrind/travis, - -- nvim will still pick multiple clicks - meths.set_option('mousetime', 5000) screen = Screen.new(25, 5) screen:attach() screen:set_default_attr_ids({ @@ -119,7 +116,6 @@ describe('ui/mouse/input', function() sel = { bold=true }, fill = { reverse=true } }) - screen.timeout = 15000 end) it('in tabline on filler space moves tab to the end', function() |