aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/061_undo_tree_spec.lua
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-09 00:12:26 +0300
committerZyX <kp-pav@yandex.ru>2017-04-09 03:24:08 +0300
commit65fb622000af8e3dbb65480e1581758ecf4ba3e2 (patch)
tree7d83429d3762b1f0a44d04eb8fc780eedc0ec049 /test/functional/legacy/061_undo_tree_spec.lua
parent9158cc171f46ebae0a0d3d1721aa5b7d829bcba5 (diff)
downloadrneovim-65fb622000af8e3dbb65480e1581758ecf4ba3e2.tar.gz
rneovim-65fb622000af8e3dbb65480e1581758ecf4ba3e2.tar.bz2
rneovim-65fb622000af8e3dbb65480e1581758ecf4ba3e2.zip
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.
Diffstat (limited to 'test/functional/legacy/061_undo_tree_spec.lua')
-rw-r--r--test/functional/legacy/061_undo_tree_spec.lua46
1 files changed, 23 insertions, 23 deletions
diff --git a/test/functional/legacy/061_undo_tree_spec.lua b/test/functional/legacy/061_undo_tree_spec.lua
index aeb2001d11..1a8ef067d0 100644
--- a/test/functional/legacy/061_undo_tree_spec.lua
+++ b/test/functional/legacy/061_undo_tree_spec.lua
@@ -1,8 +1,8 @@
-- Tests for undo tree and :earlier and :later.
local helpers = require('test.functional.helpers')(after_each)
+local feed_command = helpers.feed_command
local write_file = helpers.write_file
-local execute = helpers.execute
local command = helpers.command
local source = helpers.source
local expect = helpers.expect
@@ -44,7 +44,7 @@ describe('undo tree:', function()
-- function to allow multiple attempts.
local function test_earlier_later()
clear()
- execute('e Xtest')
+ feed_command('e Xtest')
-- Assert that no undo history is present.
eq({}, eval('undotree().entries'))
-- Delete three characters and undo.
@@ -88,13 +88,13 @@ describe('undo tree:', function()
feed('Ab<esc>')
feed('Ac<esc>')
expect_line('123456abc')
- execute('earlier 1s')
+ feed_command('earlier 1s')
expect_line('123456')
- execute('earlier 3s')
+ feed_command('earlier 3s')
expect_line('123456789')
- execute('later 1s')
+ feed_command('later 1s')
expect_line('123456')
- execute('later 1h')
+ feed_command('later 1h')
expect_line('123456abc')
end
@@ -103,28 +103,28 @@ describe('undo tree:', function()
it('file-write specifications', function()
feed('ione one one<esc>')
- execute('w Xtest')
+ feed_command('w Xtest')
feed('otwo<esc>')
feed('otwo<esc>')
- execute('w')
+ feed_command('w')
feed('othree<esc>')
- execute('earlier 1f')
+ feed_command('earlier 1f')
expect([[
one one one
two
two]])
- execute('earlier 1f')
+ feed_command('earlier 1f')
expect('one one one')
- execute('earlier 1f')
+ feed_command('earlier 1f')
expect_empty_buffer()
- execute('later 1f')
+ feed_command('later 1f')
expect('one one one')
- execute('later 1f')
+ feed_command('later 1f')
expect([[
one one one
two
two]])
- execute('later 1f')
+ feed_command('later 1f')
expect([[
one one one
two
@@ -193,20 +193,20 @@ describe('undo tree:', function()
feed('ob<esc>')
feed([[o1<esc>a2<C-R>=setline('.','1234')<cr><esc>]])
expect([[
-
+
a
b
12034]])
feed('uu')
expect([[
-
+
a
b
1]])
feed('oc<esc>')
feed([[o1<esc>a2<C-R>=setline('.','1234')<cr><esc>]])
expect([[
-
+
a
b
1
@@ -214,16 +214,16 @@ describe('undo tree:', function()
12034]])
feed('u')
expect([[
-
+
a
b
1
c
12]])
feed('od<esc>')
- execute('so! Xtest.source')
+ feed_command('so! Xtest.source')
expect([[
-
+
a
b
1
@@ -233,7 +233,7 @@ describe('undo tree:', function()
12123]])
feed('u')
expect([[
-
+
a
b
1
@@ -246,7 +246,7 @@ describe('undo tree:', function()
-- interactive use (even in Vim; see ":help :undojoin"):
feed(normal_commands)
expect([[
-
+
a
b
1
@@ -256,7 +256,7 @@ describe('undo tree:', function()
12123]])
feed('u')
expect([[
-
+
a
b
1