Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 3 insertions, 7 deletions

diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index b40ff29dec..211fc1dc77 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -44,8 +44,7 @@ describe('UI receives option updates', function()
     clear_opts.args_rm = clear_opts.args_rm or {}
     table.insert(clear_opts.args_rm or {}, '--cmd')
     clear(clear_opts)
-    screen = Screen.new(20, 5)
-    screen:attach(screen_opts)
+    screen = Screen.new(20, 5, screen_opts)
     -- NB: UI test suite can be run in both "linegrid" and legacy grid mode.
     -- In both cases check that the received value is the one requested.
     defaults.ext_linegrid = screen._options.ext_linegrid or false
@@ -70,7 +69,6 @@ describe('UI receives option updates', function()
     function screen:_handle_mouse_off()
       table.insert(evs, 'mouse_off')
     end
-    screen:attach()
     screen:expect(function()
       eq({ 'mouse_on' }, evs)
     end)
@@ -215,24 +213,22 @@ describe('UI receives option updates', function()
 end)
 
 describe('UI can set terminal option', function()
-  local screen
   before_each(function()
     -- by default we implicitly "--cmd 'set bg=light'" which ruins everything
     clear { args_rm = { '--cmd' } }
-    screen = Screen.new(20, 5)
   end)
 
   it('term_name', function()
     eq('nvim', eval '&term')
 
-    screen:attach { term_name = 'xterm' }
+    local _ = Screen.new(20, 5, { term_name = 'xterm' })
     eq('xterm', eval '&term')
   end)
 
   it('term_colors', function()
     eq('256', eval '&t_Co')
 
-    screen:attach { term_colors = 8 }
+    local _ = Screen.new(20, 5, { term_colors = 8 })
     eq('8', eval '&t_Co')
   end)
 end)