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/ui/bufhl_spec.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/functional/ui/bufhl_spec.lua') diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua index 53fe303762..b0be91c4e9 100644 --- a/test/functional/ui/bufhl_spec.lua +++ b/test/functional/ui/bufhl_spec.lua @@ -1,7 +1,7 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert -local execute, request, neq = helpers.execute, helpers.request, helpers.neq +local command, request, neq = helpers.command, helpers.request, helpers.neq if helpers.pending_win32(pending) then return end @@ -11,7 +11,7 @@ describe('Buffer highlighting', function() before_each(function() clear() - execute("syntax on") + command("syntax on") screen = Screen.new(40, 8) screen:attach() screen:set_default_attr_ids({ @@ -106,7 +106,7 @@ describe('Buffer highlighting', function() combining highlights from different sources]]) - execute("hi ImportantWord gui=bold cterm=bold") + command("hi ImportantWord gui=bold cterm=bold") id1 = add_hl(0, "ImportantWord", 0, 2, 8) add_hl(id1, "ImportantWord", 1, 12, -1) add_hl(id1, "ImportantWord", 2, 0, 9) @@ -192,7 +192,7 @@ describe('Buffer highlighting', function() | ]]) - execute(':3move 4') + command(':3move 4') screen:expect([[ a {5:longer} example | | -- cgit From ddaa41dee4077247b7742df5762413ef8e3dc7f8 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 9 Apr 2017 03:07:02 +0300 Subject: functests: Fix ui/bufhl_spec --- test/functional/ui/bufhl_spec.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'test/functional/ui/bufhl_spec.lua') diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua index b0be91c4e9..536a5c43ee 100644 --- a/test/functional/ui/bufhl_spec.lua +++ b/test/functional/ui/bufhl_spec.lua @@ -1,7 +1,10 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') +local Paths = require('test.config.paths') + local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert local command, request, neq = helpers.command, helpers.request, helpers.neq +local meths = helpers.meths if helpers.pending_win32(pending) then return end @@ -11,6 +14,9 @@ describe('Buffer highlighting', function() before_each(function() clear() + meths.set_var('source_path', Paths.test_source_path) + command('let $VIMRUNTIME=source_path . "/runtime"') + command('set runtimepath=$VIMRUNTIME') command("syntax on") screen = Screen.new(40, 8) screen:attach() @@ -131,7 +137,7 @@ describe('Buffer highlighting', function() {1:~ }| {1:~ }| {1:~ }| - :hi ImportantWord gui=bold cterm=bold | + | ]]) end) @@ -145,7 +151,7 @@ describe('Buffer highlighting', function() {1:~ }| {1:~ }| {1:~ }| - :hi ImportantWord gui=bold cterm=bold | + | ]]) end) @@ -159,7 +165,7 @@ describe('Buffer highlighting', function() {1:~ }| {1:~ }| {1:~ }| - :hi ImportantWord gui=bold cterm=bold | + | ]]) end) @@ -175,7 +181,7 @@ describe('Buffer highlighting', function() {1:~ }| {1:~ }| {1:~ }| - :hi ImportantWord gui=bold cterm=bold | + | ]]) end) @@ -201,7 +207,7 @@ describe('Buffer highlighting', function() {1:~ }| {1:~ }| {1:~ }| - ::3move 4 | + | ]]) end) end) -- cgit From 0ac2afdec73711d8006d6227fcb1d7b658ccf184 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 9 Apr 2017 03:23:16 +0300 Subject: functests: Fix some ui/*_spec tests --- test/functional/ui/bufhl_spec.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'test/functional/ui/bufhl_spec.lua') diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua index 536a5c43ee..e1e11203e0 100644 --- a/test/functional/ui/bufhl_spec.lua +++ b/test/functional/ui/bufhl_spec.lua @@ -1,10 +1,8 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') -local Paths = require('test.config.paths') local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert local command, request, neq = helpers.command, helpers.request, helpers.neq -local meths = helpers.meths if helpers.pending_win32(pending) then return end @@ -14,10 +12,7 @@ describe('Buffer highlighting', function() before_each(function() clear() - meths.set_var('source_path', Paths.test_source_path) - command('let $VIMRUNTIME=source_path . "/runtime"') - command('set runtimepath=$VIMRUNTIME') - command("syntax on") + command('syntax on') screen = Screen.new(40, 8) screen:attach() screen:set_default_attr_ids({ -- cgit