From e61228a214ebda9845db9462dad0a8c362d3963f Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 11 Nov 2024 22:15:19 +0100
Subject: fix(tests): needing two calls to setup a screen is cringe

Before calling "attach" a screen object is just a dummy container for
(row, col) values whose purpose is to be sent as part of the "attach"
function call anyway.

Just create the screen in an attached state directly. Keep the complete
(row, col, options) config together. It is still completely valid to
later detach and re-attach as needed, including to another session.
---
 test/functional/options/belloff_spec.lua    | 1 -
 test/functional/options/chars_spec.lua      | 2 --
 test/functional/options/cursorbind_spec.lua | 1 -
 test/functional/options/defaults_spec.lua   | 2 --
 test/functional/options/shortmess_spec.lua  | 1 -
 5 files changed, 7 deletions(-)

(limited to 'test/functional/options')

diff --git a/test/functional/options/belloff_spec.lua b/test/functional/options/belloff_spec.lua
index 6bd96538d2..575e79d1a9 100644
--- a/test/functional/options/belloff_spec.lua
+++ b/test/functional/options/belloff_spec.lua
@@ -16,7 +16,6 @@ describe("'belloff'", function()
   before_each(function()
     clear()
     screen = Screen.new(42, 5)
-    screen:attach()
     screen:expect([[
       ^                                          |
       {1:~                                         }|*3
diff --git a/test/functional/options/chars_spec.lua b/test/functional/options/chars_spec.lua
index 8e63e07e09..42ca41a145 100644
--- a/test/functional/options/chars_spec.lua
+++ b/test/functional/options/chars_spec.lua
@@ -16,7 +16,6 @@ describe("'fillchars'", function()
   before_each(function()
     clear()
     screen = Screen.new(25, 5)
-    screen:attach()
   end)
 
   describe('"eob" flag', function()
@@ -157,7 +156,6 @@ describe("'listchars'", function()
   before_each(function()
     clear()
     screen = Screen.new(50, 5)
-    screen:attach()
   end)
 
   it('has global value', function()
diff --git a/test/functional/options/cursorbind_spec.lua b/test/functional/options/cursorbind_spec.lua
index 19551b928f..21e0ba8e75 100644
--- a/test/functional/options/cursorbind_spec.lua
+++ b/test/functional/options/cursorbind_spec.lua
@@ -18,7 +18,6 @@ describe("'cursorbind'", function()
       [3] = { reverse = true }, -- StatusLineNC
       [4] = { background = Screen.colors.Grey90 }, -- CursorLine, CursorColumn
     })
-    screen:attach()
     exec([[
       call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' ..
       \ ' nn oo pp qq rr ss tt uu vv ww xx yy zz')
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index e3d15fa30f..e7f47ef4e9 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -34,7 +34,6 @@ describe('startup defaults', function()
   describe(':filetype', function()
     local function expect_filetype(expected)
       local screen = Screen.new(50, 4)
-      screen:attach()
       command('filetype')
       screen:expect([[
         ^                                                  |
@@ -127,7 +126,6 @@ describe('startup defaults', function()
     it('vert/fold flags', function()
       clear()
       local screen = Screen.new(50, 5)
-      screen:attach()
       command('set laststatus=0')
       insert([[
         1
diff --git a/test/functional/options/shortmess_spec.lua b/test/functional/options/shortmess_spec.lua
index dcbf9d15e0..04dbada7d8 100644
--- a/test/functional/options/shortmess_spec.lua
+++ b/test/functional/options/shortmess_spec.lua
@@ -14,7 +14,6 @@ describe("'shortmess'", function()
   before_each(function()
     clear()
     screen = Screen.new(42, 5)
-    screen:attach()
   end)
 
   describe('"F" flag', function()
-- 
cgit