From 35f2bb05a5cb84af405a094f040b92461a824e61 Mon Sep 17 00:00:00 2001 From: bfredl Date: Tue, 26 Mar 2024 21:23:36 +0100 Subject: refactor(tests): use new global defaults instead of set_default_attr_ids This will be done in batches. --- test/functional/ui/screen_basic_spec.lua | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'test/functional/ui/screen_basic_spec.lua') diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua index 42e2b4d4b5..adb1fd31f4 100644 --- a/test/functional/ui/screen_basic_spec.lua +++ b/test/functional/ui/screen_basic_spec.lua @@ -27,17 +27,13 @@ describe('screen', function() set_session(screen_nvim) screen = Screen.new() screen:attach() - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = 255 }, - [1] = { bold = true, reverse = true }, - }) end) it('default initial screen', function() screen:expect([[ ^ | - {0:~ }|*11 - {1:[No Name] }| + {1:~ }|*11 + {3:[No Name] }| | ]]) end) @@ -811,9 +807,6 @@ end) it("showcmd doesn't cause empty grid_line with redrawdebug=compositor #22593", function() clear() local screen = Screen.new(30, 2) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, - }) screen:attach() command('set showcmd redrawdebug=compositor') feed('d') -- cgit From 7035125b2b26aa68fcfb7cda39377ac79926a0f9 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 8 Apr 2024 11:03:20 +0200 Subject: test: improve test conventions Work on https://github.com/neovim/neovim/issues/27004. --- test/functional/ui/screen_basic_spec.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/functional/ui/screen_basic_spec.lua') diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua index adb1fd31f4..259baf725a 100644 --- a/test/functional/ui/screen_basic_spec.lua +++ b/test/functional/ui/screen_basic_spec.lua @@ -1,15 +1,15 @@ -local helpers = require('test.functional.helpers')(after_each) +local t = require('test.functional.testutil')(after_each) local Screen = require('test.functional.ui.screen') -local spawn, set_session, clear = helpers.spawn, helpers.set_session, helpers.clear -local feed, command = helpers.feed, helpers.command -local insert = helpers.insert -local eq = helpers.eq -local fn, api = helpers.fn, helpers.api +local spawn, set_session, clear = t.spawn, t.set_session, t.clear +local feed, command = t.feed, t.command +local insert = t.insert +local eq = t.eq +local fn, api = t.fn, t.api describe('screen', function() local screen local nvim_argv = { - helpers.nvim_prog, + t.nvim_prog, '-u', 'NONE', '-i', @@ -700,7 +700,7 @@ describe('Screen default colors', function() local extra = (light and ' background=light') or '' local nvim_argv = { - helpers.nvim_prog, + t.nvim_prog, '-u', 'NONE', '-i', -- cgit From 81fc27124b9e1b375e0ce9605ae69c3c2a2d9222 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Tue, 9 Apr 2024 12:26:16 +0100 Subject: refactor(test): inject after_each differently --- test/functional/ui/screen_basic_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/ui/screen_basic_spec.lua') diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua index 259baf725a..1bbe845bdd 100644 --- a/test/functional/ui/screen_basic_spec.lua +++ b/test/functional/ui/screen_basic_spec.lua @@ -1,4 +1,4 @@ -local t = require('test.functional.testutil')(after_each) +local t = require('test.functional.testutil')() local Screen = require('test.functional.ui.screen') local spawn, set_session, clear = t.spawn, t.set_session, t.clear local feed, command = t.feed, t.command -- cgit From 052498ed42780a76daea589d063cd8947a894673 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 20 Apr 2024 17:44:13 +0200 Subject: test: improve test conventions Specifically, functions that are run in the context of the test runner are put in module `test/testutil.lua` while the functions that are run in the context of the test session are put in `test/functional/testnvim.lua`. Closes https://github.com/neovim/neovim/issues/27004. --- test/functional/ui/screen_basic_spec.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'test/functional/ui/screen_basic_spec.lua') diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua index 1bbe845bdd..54580bf47c 100644 --- a/test/functional/ui/screen_basic_spec.lua +++ b/test/functional/ui/screen_basic_spec.lua @@ -1,15 +1,17 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local spawn, set_session, clear = t.spawn, t.set_session, t.clear -local feed, command = t.feed, t.command -local insert = t.insert + +local spawn, set_session, clear = n.spawn, n.set_session, n.clear +local feed, command = n.feed, n.command +local insert = n.insert local eq = t.eq -local fn, api = t.fn, t.api +local fn, api = n.fn, n.api describe('screen', function() local screen local nvim_argv = { - t.nvim_prog, + n.nvim_prog, '-u', 'NONE', '-i', @@ -700,7 +702,7 @@ describe('Screen default colors', function() local extra = (light and ' background=light') or '' local nvim_argv = { - t.nvim_prog, + n.nvim_prog, '-u', 'NONE', '-i', -- cgit