aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-06-15 10:44:26 -0400
committerGitHub <noreply@github.com>2016-06-15 10:44:26 -0400
commitef273f97be8abab8f05862236bd28eb8bbf7124f (patch)
treeef74ffc7ac2d7597b2696220512e8e68825997ab
parentaa22b5fd9a10a6094ea3d9cd88d3bfb3496a1acf (diff)
parentd45a665b00e4c96f2f856f750b1148506aa31e2a (diff)
downloadrneovim-ef273f97be8abab8f05862236bd28eb8bbf7124f.tar.gz
rneovim-ef273f97be8abab8f05862236bd28eb8bbf7124f.tar.bz2
rneovim-ef273f97be8abab8f05862236bd28eb8bbf7124f.zip
Merge pull request #4924 from jamessan/test-cleanup
Functional test cleanup
-rw-r--r--test/functional/ex_cmds/menu_spec.lua2
-rw-r--r--test/functional/ex_cmds/write_spec.lua9
2 files changed, 6 insertions, 5 deletions
diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua
index 10bcc5b7bb..52df9e1592 100644
--- a/test/functional/ex_cmds/menu_spec.lua
+++ b/test/functional/ex_cmds/menu_spec.lua
@@ -39,7 +39,7 @@ describe(':emenu', function()
end)
it('executes correct bindings in command mode', function()
- feed('ithis is a sentence<esc>^"+yiwo<esc>')
+ feed('ithis is a sentence<esc>^yiwo<esc>')
-- Invoke "Edit.Paste" in normal-mode.
nvim('command', 'emenu Edit.Paste')
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index 83513d747f..7f5eba1fc8 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -6,10 +6,13 @@ local eq, eval, clear, write_file, execute, source =
helpers.execute, helpers.source
describe(':write', function()
- it('&backupcopy=auto preserves symlinks', function()
- clear('set backupcopy=auto')
+ after_each(function()
os.remove('test_bkc_file.txt')
os.remove('test_bkc_link.txt')
+ end)
+
+ it('&backupcopy=auto preserves symlinks', function()
+ clear('set backupcopy=auto')
write_file('test_bkc_file.txt', 'content0')
execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt")
source([[
@@ -23,8 +26,6 @@ describe(':write', function()
it('&backupcopy=no replaces symlink with new file', function()
clear('set backupcopy=no')
- os.remove('test_bkc_file.txt')
- os.remove('test_bkc_link.txt')
write_file('test_bkc_file.txt', 'content0')
execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt")
source([[