test: reset cmdline abort state only after expect() has finished #32376

Problem:
cmdline abort state may be reset when intermediate states are received.

Solution:
Reset after `self:_wait()`.

1 files changed, 5 insertions, 6 deletions

diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 9ff29cd706..3333ac6c34 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -661,12 +661,6 @@ screen:redraw_debug() to show all intermediate screen states.]]
       end
     end
 
-    -- Only test the abort state of a cmdline level once.
-    if self.cmdline_hide_level ~= nil then
-      self.cmdline[self.cmdline_hide_level] = nil
-      self.cmdline_hide_level = nil
-    end
-
     if expected.hl_groups ~= nil then
       for name, id in pairs(expected.hl_groups) do
         local expected_hl = attr_state.ids[id]
@@ -698,6 +692,11 @@ screen:redraw_debug() to show all intermediate screen states.]]
       end
     end
   end, expected)
+  -- Only test the abort state of a cmdline level once.
+  if self.cmdline_hide_level ~= nil then
+    self.cmdline[self.cmdline_hide_level] = nil
+    self.cmdline_hide_level = nil
+  end
 end
 
 function Screen:expect_unchanged(intermediate, waittime_ms)