From b556bd1a535d39418b75fe5403e8f117f7f3166c Mon Sep 17 00:00:00 2001 From: bfredl Date: Wed, 27 Mar 2024 10:35:50 +0100 Subject: refactor(tests): use global defaults instead of set_default_attr_ids (2) --- test/functional/legacy/edit_spec.lua | 52 +++++++++++++----------------------- 1 file changed, 19 insertions(+), 33 deletions(-) (limited to 'test/functional/legacy/edit_spec.lua') diff --git a/test/functional/legacy/edit_spec.lua b/test/functional/legacy/edit_spec.lua index 0762e5e671..056ec78397 100644 --- a/test/functional/legacy/edit_spec.lua +++ b/test/functional/legacy/edit_spec.lua @@ -30,22 +30,17 @@ describe('edit', function() -- oldtest: Test_edit_insert_reg() it('inserting a register using CTRL-R', function() local screen = Screen.new(10, 6) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { foreground = Screen.colors.Blue }, -- SpecialKey - [2] = { bold = true }, -- ModeMsg - }) screen:attach() feed('a') screen:expect([[ - {1:^"} | - {0:~ }|*4 - {2:-- INSERT --}| + {18:^"} | + {1:~ }|*4 + {5:-- INSERT --}| ]]) feed('=') screen:expect([[ - {1:"} | - {0:~ }|*4 + {18:"} | + {1:~ }|*4 =^ | ]]) end) @@ -53,51 +48,42 @@ describe('edit', function() -- oldtest: Test_edit_ctrl_r_failed() it('positioning cursor after CTRL-R expression failed', function() local screen = Screen.new(60, 6) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { foreground = Screen.colors.Blue }, -- SpecialKey - [2] = { foreground = Screen.colors.SlateBlue }, - [3] = { bold = true }, -- ModeMsg - [4] = { reverse = true, bold = true }, -- MsgSeparator - [5] = { background = Screen.colors.Red, foreground = Screen.colors.White }, -- ErrorMsg - [6] = { foreground = Screen.colors.SeaGreen, bold = true }, -- MoreMsg - }) screen:attach() feed('i') screen:expect([[ - {1:^"} | - {0:~ }|*4 - {3:-- INSERT --} | + {18:^"} | + {1:~ }|*4 + {5:-- INSERT --} | ]]) feed('={}') screen:expect([[ - {1:"} | - {0:~ }|*4 - ={2:{}}^ | + {18:"} | + {1:~ }|*4 + ={16:{}}^ | ]]) -- trying to insert a dictionary produces an error feed('') screen:expect([[ - {1:"} | - {0:~ }| - {4: }| - ={2:{}} | - {5:E731: Using a Dictionary as a String} | + {18:"} | + {1:~ }| + {3: }| + ={16:{}} | + {9:E731: Using a Dictionary as a String} | {6:Press ENTER or type command to continue}^ | ]]) feed(':') screen:expect([[ :^ | - {0:~ }|*4 - {3:-- INSERT --} | + {1:~ }|*4 + {5:-- INSERT --} | ]]) -- ending Insert mode should put the cursor back on the ':' feed('') screen:expect([[ ^: | - {0:~ }|*4 + {1:~ }|*4 | ]]) end) -- cgit