From 77874b473c90960c7d057117c241d74ce721b0a2 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Thu, 12 Jan 2023 23:37:23 +0900
Subject: [PATCH] Update Rubocop dependencies
---
.github/workflows/linux.yml | 4 ++--
.rubocop.yml | 2 ++
test/test_go.rb | 14 +++++++-------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8de186f9..69abf80f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -27,13 +27,13 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
- ruby-version: 3.0.0
+ ruby-version: 3.1.0
- name: Install packages
run: sudo apt-get install --yes zsh fish tmux
- name: Install Ruby gems
- run: sudo gem install --no-document minitest:5.14.2 rubocop:1.0.0 rubocop-minitest:0.10.1 rubocop-performance:1.8.1
+ run: sudo gem install --no-document minitest:5.17.0 rubocop:1.43.0 rubocop-minitest:0.25.1 rubocop-performance:1.15.2
- name: Rubocop
run: rubocop --require rubocop-minitest --require rubocop-performance
diff --git a/.rubocop.yml b/.rubocop.yml
index d4260019..80baa491 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -28,3 +28,5 @@ Style/WordArray:
MinSize: 1
Minitest/AssertEqual:
Enabled: false
+Naming/VariableNumber:
+ Enabled: false
diff --git a/test/test_go.rb b/test/test_go.rb
index 2ae52981..5a3659d5 100755
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -922,7 +922,7 @@ class TestGoFZF < TestBase
end
wait do
assert_path_exists history_file
- assert_equal input[1..-1], File.readlines(history_file, chomp: true)
+ assert_equal input[1..], File.readlines(history_file, chomp: true)
end
# Update history entries (not changed on disk)
@@ -1946,7 +1946,7 @@ class TestGoFZF < TestBase
file = Tempfile.new('fzf-follow')
file.sync = true
- tmux.send_keys %[seq 100 | #{FZF} --preview 'tail -f "#{file.path}"' --preview-window follow --bind 'up:preview-up,down:preview-down,space:change-preview-window:follow|nofollow' --preview-window '~3'], :Enter
+ tmux.send_keys %(seq 100 | #{FZF} --preview 'tail -f "#{file.path}"' --preview-window follow --bind 'up:preview-up,down:preview-down,space:change-preview-window:follow|nofollow' --preview-window '~3'), :Enter
tmux.until { |lines| lines.item_count == 100 }
# Write to the temporary file, and check if the preview window is showing
@@ -2003,7 +2003,7 @@ class TestGoFZF < TestBase
assert_includes lines[1], '/1010'
assert_includes lines[-2], 'bbb'
end
- rescue
+ rescue StandardError
file.close
file.unlink
end
@@ -2634,7 +2634,7 @@ module TestShell
tmux.prepare
tmux.send_keys :Escape, :c
lines = tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
- expected = lines.reverse.find { |l| l.start_with?('> ') }[2..-1]
+ expected = lines.reverse.find { |l| l.start_with?('> ') }[2..]
tmux.send_keys :Enter
tmux.prepare
tmux.send_keys :pwd, :Enter
@@ -2687,7 +2687,7 @@ module TestShell
def test_ctrl_r_multiline
tmux.send_keys 'echo "foo', :Enter, 'bar"', :Enter
- tmux.until { |lines| assert_equal %w[foo bar], lines[-2..-1] }
+ tmux.until { |lines| assert_equal %w[foo bar], lines[-2..] }
tmux.prepare
tmux.send_keys 'C-r'
tmux.until { |lines| assert_equal '>', lines[-1] }
@@ -2696,7 +2696,7 @@ module TestShell
tmux.send_keys :Enter
tmux.until { |lines| assert lines[-1]&.end_with?('bar"') }
tmux.send_keys :Enter
- tmux.until { |lines| assert_equal %w[foo bar], lines[-2..-1] }
+ tmux.until { |lines| assert_equal %w[foo bar], lines[-2..] }
end
def test_ctrl_r_abort
@@ -2887,7 +2887,7 @@ module CompletionTest
tmux.send_keys :Enter
tmux.until(true) { |lines| assert_match(/cat .*fzf-unicode.*1.* .*fzf-unicode.*2/, lines[-1]) }
tmux.send_keys :Enter
- tmux.until { |lines| assert_equal %w[test3 test4], lines[-2..-1] }
+ tmux.until { |lines| assert_equal %w[test3 test4], lines[-2..] }
end
def test_custom_completion_api