Skip to content

Commit 3b38a0e

Browse files
committed
Make test_option_equals_completion more robust to capture --opt= prefix leaking
1 parent 9c81c5e commit 3b38a0e

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

test/test_shell_integration.rb

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -475,40 +475,52 @@ def test_option_equals_completion
475475
# Test --opt=**<TAB>
476476
if shell != :zsh
477477
tmux.send_keys "some-command --output=/tmp/fzf-test-opt-eq/file#{trigger}", :Tab
478-
tmux.until { |lines| assert_equal 2, lines.match_count }
478+
tmux.until do |lines|
479+
assert_equal 2, lines.match_count
480+
assert_includes lines, '> file'
481+
end
479482
tmux.send_keys '1'
480483
tmux.until { |lines| assert_equal 1, lines.match_count }
481484
tmux.send_keys :Enter
482485
tmux.until(true) { |lines| assert lines[-1]&.include?('--output=/tmp/fzf-test-opt-eq/file1.txt') }
483486
end
484487

485488
# Test -o=**<TAB>
486-
if shell == :bash
489+
if shell != :zsh
487490
tmux.send_keys 'C-u'
488491
tmux.send_keys "some-command -o=/tmp/fzf-test-opt-eq/file#{trigger}", :Tab
489-
tmux.until { |lines| assert_equal 2, lines.match_count }
492+
tmux.until do |lines|
493+
assert_equal 2, lines.match_count
494+
assert_includes lines, '> file'
495+
end
490496
tmux.send_keys '2'
491497
tmux.until { |lines| assert_equal 1, lines.match_count }
492498
tmux.send_keys :Enter
493499
tmux.until(true) { |lines| assert lines[-1]&.include?('-o=/tmp/fzf-test-opt-eq/file2.txt') }
494500
end
495501

496502
# Test -- --opt=**<TAB>
497-
if shell == :bash
503+
if shell != :zsh
498504
tmux.send_keys 'C-u'
499505
tmux.send_keys "some-command -- --output=/tmp/fzf-test-opt-eq/file#{trigger}", :Tab
500-
tmux.until { |lines| assert_equal 2, lines.match_count }
506+
tmux.until do |lines|
507+
assert_equal 2, lines.match_count
508+
assert_includes lines, '> file'
509+
end
501510
tmux.send_keys '1'
502511
tmux.until { |lines| assert_equal 1, lines.match_count }
503512
tmux.send_keys :Enter
504513
tmux.until(true) { |lines| assert lines[-1]&.include?('-- --output=/tmp/fzf-test-opt-eq/file1.txt') }
505514
end
506515

507516
# Test -- -o=**<TAB>
508-
if shell == :bash
517+
if shell != :zsh
509518
tmux.send_keys 'C-u'
510519
tmux.send_keys "some-command -- -o=/tmp/fzf-test-opt-eq/file#{trigger}", :Tab
511-
tmux.until { |lines| assert_equal 2, lines.match_count }
520+
tmux.until do |lines|
521+
assert_equal 2, lines.match_count
522+
assert_includes lines, '> file'
523+
end
512524
tmux.send_keys '2'
513525
tmux.until { |lines| assert_equal 1, lines.match_count }
514526
tmux.send_keys :Enter

0 commit comments

Comments
 (0)