diff options
author | ZyX <kp-pav@yandex.ru> | 2017-04-10 19:12:56 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2017-04-10 19:12:56 +0300 |
commit | 22fb9d8d25f5354bb878b953ba49b439961c8476 (patch) | |
tree | d3c21e80d09f7b1cf1a7c525643c2e20fb5a925e /test/functional/legacy/autoformat_join_spec.lua | |
parent | acc52a953b99f78435c34337b8ca9b6716a057a1 (diff) | |
parent | 9aface8c4d1edd25d4fed3e099e3c2c02b0a282a (diff) | |
download | rneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.tar.gz rneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.tar.bz2 rneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.zip |
Merge branch 'master' into 1476-changes
Diffstat (limited to 'test/functional/legacy/autoformat_join_spec.lua')
-rw-r--r-- | test/functional/legacy/autoformat_join_spec.lua | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/functional/legacy/autoformat_join_spec.lua b/test/functional/legacy/autoformat_join_spec.lua index 4110d66f5b..84d661c190 100644 --- a/test/functional/legacy/autoformat_join_spec.lua +++ b/test/functional/legacy/autoformat_join_spec.lua @@ -1,9 +1,9 @@ --- vim: set foldmethod=marker foldmarker=[[,]] : -- Tests for setting the '[,'] marks when joining lines. local helpers = require('test.functional.helpers')(after_each) local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert -local execute, expect = helpers.execute, helpers.expect +local command, expect = helpers.command, helpers.expect +local wait = helpers.wait describe('autoformat join', function() setup(clear) @@ -21,12 +21,13 @@ Results:]]) feed('gg') feed('0gqj<cr>') + wait() - execute([[let a=string(getpos("'[")).'/'.string(getpos("']"))]]) - execute("g/^This line/;'}-join") - execute([[let b=string(getpos("'[")).'/'.string(getpos("']"))]]) - execute("$put ='First test: Start/End '.string(a)") - execute("$put ='Second test: Start/End '.string(b)") + command([[let a=string(getpos("'[")).'/'.string(getpos("']"))]]) + command("g/^This line/;'}-join") + command([[let b=string(getpos("'[")).'/'.string(getpos("']"))]]) + command("$put ='First test: Start/End '.string(a)") + command("$put ='Second test: Start/End '.string(b)") expect([[ O sodales, ludite, vos qui attamen consulite per voster honur. |