From b2c0413a98e210cedd34fbe0f6ba051906da398f Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 29 Feb 2020 11:54:05 +0900 Subject: [bash] Fix --query argument of CTRL-R Fix #1898 --- test/test_go.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/test_go.rb b/test/test_go.rb index aa1589ca..7c448fe1 100755 --- a/test/test_go.rb +++ b/test/test_go.rb @@ -1853,12 +1853,15 @@ module TestShell def test_ctrl_r_abort skip "doesn't restore the original line when search is aborted pre Bash 4" if shell == :bash && /(?<= version )\d+/.match(`#{Shell.bash} --version`).to_s.to_i < 4 - tmux.send_keys 'foo' - tmux.until { |lines| lines[-1].start_with? 'foo' } - tmux.send_keys 'C-r' - tmux.until { |lines| lines[-1].start_with? '>' } - tmux.send_keys 'C-g' - tmux.until { |lines| lines[-1].start_with? 'foo' } + %w[foo ' "].each do |query| + tmux.prepare + tmux.send_keys(query) + tmux.until { |lines| lines[-1].start_with? query } + tmux.send_keys 'C-r' + tmux.until { |lines| lines[-1] == "> #{query}" } + tmux.send_keys 'C-g' + tmux.until { |lines| lines[-1].start_with? query } + end end def retries(times = 3) -- cgit v1.2.3