1 files changed, 31 insertions, 26 deletions
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 858e23984d..229a169996 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -1,26 +1,28 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local helpers = require('test.functional.helpers')(after_each)
-local thelpers = require('test.functional.terminal.helpers')
-local clear, eq = helpers.clear, helpers.eq
-local feed, testprg = helpers.feed, helpers.testprg
-local eval = helpers.eval
-local command = helpers.command
-local poke_eventloop = helpers.poke_eventloop
-local retry = helpers.retry
-local api = helpers.api
-local feed_data = thelpers.feed_data
-local pcall_err = helpers.pcall_err
-local exec_lua = helpers.exec_lua
-local assert_alive = helpers.assert_alive
-local skip = helpers.skip
-local is_os = helpers.is_os
+local tt = require('test.functional.terminal.testutil')
+
+local clear, eq = n.clear, t.eq
+local feed, testprg = n.feed, n.testprg
+local eval = n.eval
+local command = n.command
+local poke_eventloop = n.poke_eventloop
+local retry = t.retry
+local api = n.api
+local feed_data = tt.feed_data
+local pcall_err = t.pcall_err
+local exec_lua = n.exec_lua
+local assert_alive = n.assert_alive
+local skip = t.skip
+local is_os = t.is_os
 
 describe(':terminal scrollback', function()
   local screen
 
   before_each(function()
     clear()
-    screen = thelpers.screen_setup(nil, nil, 30)
+    screen = tt.screen_setup(nil, nil, 30)
   end)
 
   describe('when the limit is exceeded', function()
@@ -361,16 +363,19 @@ describe(':terminal prints more lines than the screen height and exits', functio
       line8                         |
       line9                         |
                                     |
-      [Process exited 0]            |
-      -- TERMINAL --                |
+      [Process exited 0]{2: }           |
+      {5:-- TERMINAL --}                |
     ]])
     feed('<cr>')
     -- closes the buffer correctly after pressing a key
-    screen:expect([[
+    screen:expect {
+      grid = [[
       ^                              |
-      ~                             |*5
+      {1:~                             }|*5
                                     |
-    ]])
+    ]],
+      attr_ids = { [1] = { foreground = 12 } },
+    }
   end)
 end)
 
@@ -394,9 +399,9 @@ describe("'scrollback' option", function()
   it('set to 0 behaves as 1', function()
     local screen
     if is_os('win') then
-      screen = thelpers.screen_setup(nil, { 'cmd.exe' }, 30)
+      screen = tt.screen_setup(nil, { 'cmd.exe' }, 30)
     else
-      screen = thelpers.screen_setup(nil, { 'sh' }, 30)
+      screen = tt.screen_setup(nil, { 'sh' }, 30)
     end
 
     api.nvim_set_option_value('scrollback', 0, {})
@@ -411,10 +416,10 @@ describe("'scrollback' option", function()
     local screen
     if is_os('win') then
       command([[let $PROMPT='$$']])
-      screen = thelpers.screen_setup(nil, { 'cmd.exe' }, 30)
+      screen = tt.screen_setup(nil, { 'cmd.exe' }, 30)
     else
       command('let $PS1 = "$"')
-      screen = thelpers.screen_setup(nil, { 'sh' }, 30)
+      screen = tt.screen_setup(nil, { 'sh' }, 30)
     end
 
     api.nvim_set_option_value('scrollback', 200, {})
@@ -476,7 +481,7 @@ describe("'scrollback' option", function()
 
   it('deletes extra lines immediately', function()
     -- Scrollback is 10 on screen_setup
-    local screen = thelpers.screen_setup(nil, nil, 30)
+    local screen = tt.screen_setup(nil, nil, 30)
     local lines = {}
     for i = 1, 30 do
       table.insert(lines, 'line' .. tostring(i))