From 65fb622000af8e3dbb65480e1581758ecf4ba3e2 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 9 Apr 2017 00:12:26 +0300 Subject: functests: Replace execute with either command or feed_command Hope this will make people using feed_command less likely: this hides bugs. Already found at least two: 1. msgpackparse() will show internal error: hash_add() in case of duplicate keys, though it will still work correctly. Currently silenced. 2. ttimeoutlen was spelled incorrectly, resulting in option not being set when expected. Test was still functioning somehow though. Currently fixed. --- test/functional/plugin/health_spec.lua | 10 ++++++---- test/functional/plugin/matchparen_spec.lua | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'test/functional/plugin') diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua index 52dc008707..644cd46092 100644 --- a/test/functional/plugin/health_spec.lua +++ b/test/functional/plugin/health_spec.lua @@ -1,6 +1,8 @@ local helpers = require('test.functional.helpers')(after_each) local plugin_helpers = require('test.functional.plugin.helpers') +local command = helpers.command + describe('health.vim', function() before_each(function() plugin_helpers.reset() @@ -8,7 +10,7 @@ describe('health.vim', function() -- health#broken#check() -- health#success1#check() -- health#success2#check() - helpers.execute("set runtimepath+=test/functional/fixtures") + command("set runtimepath+=test/functional/fixtures") end) it("reports", function() @@ -43,7 +45,7 @@ describe('health.vim', function() describe(":CheckHealth", function() it("concatenates multiple reports", function() - helpers.execute("CheckHealth success1 success2") + command("CheckHealth success1 success2") helpers.expect([[ health#success1#check @@ -62,7 +64,7 @@ describe('health.vim', function() end) it("gracefully handles broken healthcheck", function() - helpers.execute("CheckHealth broken") + command("CheckHealth broken") helpers.expect([[ health#broken#check @@ -74,7 +76,7 @@ describe('health.vim', function() end) it("gracefully handles invalid healthcheck", function() - helpers.execute("CheckHealth non_existent_healthcheck") + command("CheckHealth non_existent_healthcheck") helpers.expect([[ health#non_existent_healthcheck#check diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua index 3e1ab70daf..51ec7e4870 100644 --- a/test/functional/plugin/matchparen_spec.lua +++ b/test/functional/plugin/matchparen_spec.lua @@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')(after_each) local plugin_helpers = require('test.functional.plugin.helpers') local Screen = require('test.functional.ui.screen') -local execute = helpers.execute +local command = helpers.command local meths = helpers.meths local feed = helpers.feed local eq = helpers.eq @@ -23,7 +23,7 @@ describe('matchparen', function() end) it('uses correct column after i_. Vim patch 7.4.1296', function() - execute('set noautoindent nosmartindent nocindent laststatus=0') + command('set noautoindent nosmartindent nocindent laststatus=0') eq(1, meths.get_var('loaded_matchparen')) feed('ivoid f_test()') feed('{') -- cgit