aboutsummaryrefslogtreecommitdiff
path: root/test/functional/plugin
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-10 22:21:06 +0300
committerZyX <kp-pav@yandex.ru>2017-04-10 22:21:06 +0300
commitab4d13e2fa09db538756cc5cfb36f81681e5ff7a (patch)
treeb8bded415655f09bc323a23d21ed8d7e74b1c8da /test/functional/plugin
parenta40a969e9a4776f1e274dcf0e59c8f1ec1770ca0 (diff)
parent9aface8c4d1edd25d4fed3e099e3c2c02b0a282a (diff)
downloadrneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.gz
rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.bz2
rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.zip
Merge branch 'master' into luaviml'/lua
Diffstat (limited to 'test/functional/plugin')
-rw-r--r--test/functional/plugin/health_spec.lua10
-rw-r--r--test/functional/plugin/matchparen_spec.lua4
2 files changed, 8 insertions, 6 deletions
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_<Up>. 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()<cr>')
feed('{<cr>')