From 99a16121d4aa0affabbd37697bccc388d48d0229 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 18 Jul 2026 07:48:36 -0400
Subject: [PATCH] =?UTF-8?q?test:=20unreliable=20"put=20command=20.=20regis?=
 =?UTF-8?q?ter=20special=20=E2=80=A6=20ring=20the=20bell"=20#40812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:

    FAILED   …/put_spec.lua:894: …/put_spec.lua @ 898: put command . register special tests should ring the bell when deleting if not appropriate
    …/put_spec.lua:894: …/put_spec.lua:898: Bell was not rung after action

    Snapshot:
    screen:expect([[
      ^ine of words 1                                       |
      Line of words 2                                      |
      {1:~                                                    }|*4
      {3:[No Name] [+]                                        }|
                                                           |
      {1:~                                                    }|*4
      {UNKNOWN_HL_ID(4):[No Name]                                            }|
      {UNKNOWN_HL_ID(1):                                                     }|
    ]])
    stack traceback:
    …/ui/screen.lua:917: in function '_wait'
    …/ui/screen.lua:540: in function 'expect'
    …/editor/put_spec.lua:894: in function 'bell_test'
    …/editor/put_spec.lua:940: in function <…/editor/put_spec.lua:932>

Analysis:
The bell was asserted via the UI 'bell' event (screen.bell), but
vim_beep() rate-limits that to 3 per 500ms. These tests share one
long-lived session, so beeps from earlier tests could exhaust the window
and drop the asserted beep.

Solution:
Use assert_beeps()/assert_nobeep(), which check called_vim_beep (set
before the rate-limit gate).
---
 test/functional/editor/put_spec.lua | 49 ++++++-----------------------
 1 file changed, 10 insertions(+), 39 deletions(-)

diff --git a/test/functional/editor/put_spec.lua b/test/functional/editor/put_spec.lua
index 55dd13bf75..b44c0cd3b9 100644
--- a/test/functional/editor/put_spec.lua
+++ b/test/functional/editor/put_spec.lua
@@ -1,6 +1,5 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
-local Screen = require('test.functional.ui.screen')
 
 local clear = n.clear
 local insert = n.insert
@@ -879,54 +878,28 @@ describe('put command', function()
       )
     end)
 
-    local screen
-    setup(function()
-      screen = Screen.new()
-    end)
-
-    local function bell_test(actions, should_ring)
+    -- Asserts whether `keys` makes Nvim beep.
+    local function bell_test(keys, should_ring)
+      local cmd = 'normal! ' .. keys
       if should_ring then
-        -- check bell is not set by nvim before the action
-        screen:sleep(50)
+        eq(0, fn.assert_beeps(cmd))
+      else
+        eq(0, fn.assert_nobeep(cmd))
       end
-      t.ok(not screen.bell and not screen.visual_bell)
-      actions()
-      screen:expect {
-        condition = function()
-          if should_ring then
-            if not screen.bell and not screen.visual_bell then
-              error('Bell was not rung after action')
-            end
-          else
-            if screen.bell or screen.visual_bell then
-              error('Bell was rung after action')
-            end
-          end
-        end,
-        unchanged = not should_ring,
-      }
-      screen.bell = false
-      screen.visual_bell = false
     end
 
     it('should not ring the bell with gp at end of line', function()
-      bell_test(function()
-        feed('$".gp')
-      end)
+      bell_test('$".gp')
 
       -- Even if the last character is a multibyte character.
       reset()
       fn.setline(1, 'helloม')
-      bell_test(function()
-        feed('$".gp')
-      end)
+      bell_test('$".gp')
     end)
 
     it('should not ring the bell with gp and end of file', function()
       fn.setpos('.', { 0, 2, 1, 0 })
-      bell_test(function()
-        feed('$vl".gp')
-      end)
+      bell_test('$vl".gp')
     end)
 
     it('should ring the bell when deleting if not appropriate', function()
@@ -937,9 +910,7 @@ describe('put command', function()
       expect([[
       ine of words 1
       Line of words 2]])
-      bell_test(function()
-        feed('".P')
-      end, true)
+      bell_test('".P', true)
     end)
 
     it('should restore cursor position after undo of ".p', function()