rubocop 0.21.0 → 0.22.0

data/spec/rubocop/cli_spec.rb

@@ -35,6 +35,18 @@ describe Rubocop::CLI, :isolated_environment do
     end
 
     describe '--auto-correct' do
+      it 'honors Exclude settings in individual cops' do
+        source = ['# encoding: utf-8',
+                  'puts %x(ls)']
+        create_file('example.rb', source)
+        create_file('.rubocop.yml', ['UnneededPercentX:',
+                                     '  Exclude:',
+                                     '    - example.rb'])
+        expect(cli.run(['--auto-correct'])).to eq(0)
+        expect($stdout.string).to include('no offenses detected')
+        expect(IO.read('example.rb')).to eq(source.join("\n") + "\n")
+      end
+
       it 'can correct two problems with blocks' do
         # {} should be do..end and space is missing.
         create_file('example.rb', ['# encoding: utf-8',
@@ -111,10 +123,6 @@ describe Rubocop::CLI, :isolated_environment do
                   'comment.',
                   "#{e}:3:1: C: [Corrected] Indent access modifiers like " \
                   '`private`.',
-                  "#{e}:3:1: C: Keep a blank line before and after `private`.",
-                  "#{e}:3:1: W: Useless `private` access modifier.",
-                  # An offense that moves around during auto-correction will
-                  # appear to be duplicated:
                   "#{e}:3:3: C: Keep a blank line before and after `private`.",
                   "#{e}:3:3: W: Useless `private` access modifier.",
                   "#{e}:4:7: C: [Corrected] Use `%w` or `%W` " \
@@ -122,7 +130,6 @@ describe Rubocop::CLI, :isolated_environment do
                   "#{e}:4:8: C: [Corrected] Prefer single-quoted strings " \
                   "when you don't need string interpolation or special " \
                   'symbols.',
-                  # Another instance of the same offense reported twice:
                   "#{e}:4:15: C: [Corrected] Prefer single-quoted strings " \
                   "when you don't need string interpolation or special " \
                   'symbols.',
@@ -422,7 +429,7 @@ describe Rubocop::CLI, :isolated_environment do
                   ''].join("\n"))
       end
 
-      it 'should not hang SpaceAfterPunctuation and SpaceInsideParens' do
+      it 'does not hang SpaceAfterPunctuation and SpaceInsideParens' do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      'some_method(a, )'])
@@ -435,7 +442,7 @@ describe Rubocop::CLI, :isolated_environment do
                                              ''].join("\n"))
       end
 
-      it 'should not hang SpaceAfterPunctuation and SpaceInsideBrackets' do
+      it 'does not hang SpaceAfterPunctuation and SpaceInsideBrackets' do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      'puts [1, ]'])
@@ -456,11 +463,11 @@ describe Rubocop::CLI, :isolated_environment do
                                     '#' * 85,
                                     'y ',
                                     'puts x'])
-        create_file('rubocop-todo.yml', ['LineLength:',
-                                         '  Enabled: false'])
-        create_file('.rubocop.yml', ['inherit_from: rubocop-todo.yml'])
+        create_file('.rubocop_todo.yml', ['LineLength:',
+                                          '  Enabled: false'])
+        create_file('.rubocop.yml', ['inherit_from: .rubocop_todo.yml'])
         expect(cli.run(['--auto-gen-config'])).to eq(1)
-        expect(IO.readlines('rubocop-todo.yml')[7..-1].map(&:chomp))
+        expect(IO.readlines('.rubocop_todo.yml')[7..-1].map(&:chomp))
           .to eq(['# Offense count: 1',
                   'LineLength:',
                   '  Max: 85',
@@ -508,9 +515,9 @@ describe Rubocop::CLI, :isolated_environment do
         expect(cli.run(['--auto-gen-config'])).to eq(1)
         expect($stderr.string).to eq('')
         expect($stdout.string)
-          .to include(['Created rubocop-todo.yml.',
-                       'Run `rubocop --config rubocop-todo.yml`, or',
-                       'add inherit_from: rubocop-todo.yml in a ' \
+          .to include(['Created .rubocop_todo.yml.',
+                       'Run `rubocop --config .rubocop_todo.yml`, or',
+                       'add inherit_from: .rubocop_todo.yml in a ' \
                        '.rubocop.yml file.',
                        ''].join("\n"))
         expected =
@@ -523,6 +530,11 @@ describe Rubocop::CLI, :isolated_environment do
            'again.',
            '',
            '# Offense count: 1',
+           '# Cop supports --auto-correct.',
+           'CommentIndentation:',
+           '  Enabled: false',
+           '',
+           '# Offense count: 1',
            '# Configuration parameters: AllowedVariables.',
            'GlobalVars:',
            '  Enabled: false',
@@ -549,7 +561,7 @@ describe Rubocop::CLI, :isolated_environment do
            '# Cop supports --auto-correct.',
            'TrailingWhitespace:',
            '  Enabled: false']
-        actual = IO.read('rubocop-todo.yml').split($RS)
+        actual = IO.read('.rubocop_todo.yml').split($RS)
         expected.each_with_index do |line, ix|
           if line.is_a?(String)
             expect(actual[ix]).to eq(line)
@@ -579,13 +591,18 @@ describe Rubocop::CLI, :isolated_environment do
            '',
            '# Offense count: 1',
            '# Cop supports --auto-correct.',
+           'CommentIndentation:',
+           '  Enabled: false',
+           '',
+           '# Offense count: 1',
+           '# Cop supports --auto-correct.',
            'IndentationConsistency:',
            '  Enabled: false',
            '',
            '# Offense count: 1',
            'Tab:',
            '  Enabled: false']
-        actual = IO.read('rubocop-todo.yml').split($RS)
+        actual = IO.read('.rubocop_todo.yml').split($RS)
         expect(actual.length).to eq(expected.length)
         expected.each_with_index do |line, ix|
           if line.is_a?(String)
@@ -617,7 +634,7 @@ describe Rubocop::CLI, :isolated_environment do
            '# Offense count: 1',
            'RegexpLiteral:',
            '  MaxSlashes: 0']
-        actual = IO.read('rubocop-todo.yml').split($RS)
+        actual = IO.read('.rubocop_todo.yml').split($RS)
         expected.each_with_index do |line, ix|
           if line.is_a?(String)
             expect(actual[ix]).to eq(line)
@@ -626,7 +643,7 @@ describe Rubocop::CLI, :isolated_environment do
           end
         end
         $stdout = StringIO.new
-        result = cli.run(%w(--config rubocop-todo.yml --format emacs))
+        result = cli.run(%w(--config .rubocop_todo.yml --format emacs))
         expect($stdout.string).to eq('')
         expect(result).to eq(0)
       end
@@ -908,7 +925,7 @@ describe Rubocop::CLI, :isolated_environment do
             cli.run(['--format', 'simple', 'example.rb'])
             expect($stdout.string)
               .to include(["== #{target_file} ==",
-                           'C:  2: 80: Line is too long. [90/79]'].join("\n"))
+                           'C:  2: 81: Line is too long. [90/80]'].join("\n"))
           end
         end
 
@@ -941,14 +958,18 @@ describe Rubocop::CLI, :isolated_environment do
                       'example1.rb:2:5: C: Trailing whitespace detected.',
                       'x= 0 ',
                       '    ^',
-                      'example1.rb:3:80: C: Line is too long. [85/79]',
+                      'example1.rb:3:81: C: Line is too long. [85/80]',
                       '###################################################' \
                       '##################################',
                       '                                                   ' \
-                      '                            ^^^^^^',
+                      '                             ^^^^^',
                       'example1.rb:4:2: C: Trailing whitespace detected.',
                       'y ',
                       ' ^',
+                      'example2.rb:1:1: C: Incorrect indentation detected' \
+                      ' (column 0 instead of 1).',
+                      '# encoding: utf-8',
+                      '^^^^^^^^^^^^^^^^^',
                       'example2.rb:2:1: C: Tab detected.',
                       "\tx",
                       '^',
@@ -963,6 +984,10 @@ describe Rubocop::CLI, :isolated_environment do
                       'example3.rb:2:5: C: Use snake_case for methods.',
                       'def badName',
                       '    ^^^^^^^',
+                      'example3.rb:3:3: C: Use a guard clause instead of ' \
+                      'wrapping the code inside a conditional expression.',
+                      '  if something',
+                      '  ^^',
                       'example3.rb:3:3: C: Favor modifier if usage ' \
                       'when having a single-line body. Another good ' \
                       'alternative is the usage of control flow &&/||.',
@@ -973,7 +998,7 @@ describe Rubocop::CLI, :isolated_environment do
                       '    end',
                       '    ^^^',
                       '',
-                      '3 files inspected, 10 offenses detected',
+                      '3 files inspected, 12 offenses detected',
                       ''].join("\n"))
           end
         end
@@ -994,6 +1019,8 @@ describe Rubocop::CLI, :isolated_environment do
                " for operator '='.",
                "#{abs('example1.rb')}:2:5: C: Trailing whitespace detected.",
                "#{abs('example1.rb')}:3:2: C: Trailing whitespace detected.",
+               "#{abs('example2.rb')}:1:1: C: Incorrect indentation detected" \
+               ' (column 0 instead of 1).',
                "#{abs('example2.rb')}:2:1: C: Tab detected.",
                "#{abs('example2.rb')}:3:1: C: Inconsistent indentation " \
                'detected.',
@@ -1059,9 +1086,9 @@ describe Rubocop::CLI, :isolated_environment do
         cli.run(['--format', 'simple', '--format', 'emacs', 'example.rb'])
         expect($stdout.string)
           .to include(["== #{target_file} ==",
-                       'C:  2: 80: Line is too long. [90/79]',
-                       "#{abs(target_file)}:2:80: C: Line is too long. " \
-                       '[90/79]'].join("\n"))
+                       'C:  2: 81: Line is too long. [90/80]',
+                       "#{abs(target_file)}:2:81: C: Line is too long. " \
+                       '[90/80]'].join("\n"))
       end
     end
 
@@ -1084,13 +1111,13 @@ describe Rubocop::CLI, :isolated_environment do
                  target_file])
 
         expect($stdout.string).to eq(["== #{target_file} ==",
-                                      'C:  2: 80: Line is too long. [90/79]',
+                                      'C:  2: 81: Line is too long. [90/80]',
                                       '',
                                       '1 file inspected, 1 offense detected',
                                       ''].join("\n"))
 
         expect(File.read('emacs_output.txt'))
-          .to eq("#{abs(target_file)}:2:80: C: Line is too long. [90/79]\n")
+          .to eq("#{abs(target_file)}:2:81: C: Line is too long. [90/80]\n")
       end
     end
 
@@ -1102,11 +1129,11 @@ describe Rubocop::CLI, :isolated_environment do
                                   '#' * 90])
       end
 
-      it 'should be failed when option is less than the severity level' do
+      it 'fails when option is less than the severity level' do
         expect(cli.run(['--fail-level', 'convention', target_file])).to eq(1)
       end
 
-      it 'should be success when option is greater than the severity level' do
+      it 'succeed when option is greater than the severity level' do
         expect(cli.run(['--fail-level', 'warning', target_file])).to eq(0)
       end
     end
@@ -1146,21 +1173,21 @@ describe Rubocop::CLI, :isolated_environment do
   end
 
   describe '#trap_interrupt' do
+    let(:interrupt_handlers) { [] }
     before do
-      @interrupt_handlers = []
       allow(Signal).to receive(:trap).with('INT') do |&block|
-        @interrupt_handlers << block
+        interrupt_handlers << block
       end
     end
 
     def interrupt
-      @interrupt_handlers.each(&:call)
+      interrupt_handlers.each(&:call)
     end
 
     it 'adds a handler for SIGINT' do
-      expect(@interrupt_handlers).to be_empty
+      expect(interrupt_handlers).to be_empty
       cli.trap_interrupt
-      expect(@interrupt_handlers.size).to eq(1)
+      expect(interrupt_handlers.size).to eq(1)
     end
 
     context 'with SIGINT once' do
@@ -1265,7 +1292,7 @@ describe Rubocop::CLI, :isolated_environment do
       # all cops were disabled, then 2 were enabled again, so we
       # should get 2 offenses reported.
       expect($stdout.string)
-        .to eq(["#{abs('example.rb')}:8:80: C: Line is too long. [95/79]",
+        .to eq(["#{abs('example.rb')}:8:81: C: Line is too long. [95/80]",
                 "#{abs('example.rb')}:10:5: C: Prefer single-quoted " \
                 "strings when you don't need string interpolation or " \
                 'special symbols.',
@@ -1290,7 +1317,7 @@ describe Rubocop::CLI, :isolated_environment do
       # 3 cops were disabled, then 2 were enabled again, so we
       # should get 2 offenses reported.
       expect($stdout.string)
-        .to eq(["#{abs('example.rb')}:8:80: C: Line is too long. [95/79]",
+        .to eq(["#{abs('example.rb')}:8:81: C: Line is too long. [95/80]",
                 "#{abs('example.rb')}:10:5: C: Prefer single-quoted " \
                 "strings when you don't need string interpolation or " \
                 'special symbols.',
@@ -1315,7 +1342,7 @@ describe Rubocop::CLI, :isolated_environment do
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
       expect($stdout.string)
         .to eq(
-               ["#{abs('example.rb')}:3:80: C: Line is too long. [95/79]",
+               ["#{abs('example.rb')}:3:81: C: Line is too long. [95/80]",
                 ''].join("\n"))
     end
   end
@@ -1715,7 +1742,7 @@ describe Rubocop::CLI, :isolated_environment do
       expect(cli.run(%w(--format simple example))).to eq(1)
       expect($stdout.string).to eq(
                                    ['== example/lib/example1.rb ==',
-                                    'C:  2: 80: Line is too long. [90/79]',
+                                    'C:  2: 81: Line is too long. [90/80]',
                                     '',
                                     '2 files inspected, 1 offense detected',
                                     ''].join("\n"))
@@ -1755,7 +1782,7 @@ describe Rubocop::CLI, :isolated_environment do
       expect(cli.run(%w(--format simple example))).to eq(1)
       expect($stdout.string).to eq(
                                    ['== example/tmp/test/example1.rb ==',
-                                    'C:  2: 80: Line is too long. [90/79]',
+                                    'C:  2: 81: Line is too long. [90/80]',
                                     '',
                                     '1 file inspected, 1 offense detected',
                                     ''].join("\n"))
@@ -1917,7 +1944,7 @@ describe Rubocop::CLI, :isolated_environment do
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stdout.string)
         .to eq(['== example/example1.rb ==',
-                'E:  2: 80: Line is too long. [90/79]',
+                'E:  2: 81: Line is too long. [90/80]',
                 '',
                 '1 file inspected, 1 offense detected',
                 ''].join("\n"))
@@ -1937,5 +1964,24 @@ describe Rubocop::CLI, :isolated_environment do
                'Valid severities are refactor, convention, ' \
                "warning, error, fatal.\n")
     end
+
+    context 'when a file inherits from the old auto generated file' do
+      before do
+        create_file('rubocop-todo.yml', '')
+        create_file('.rubocop.yml', ['inherit_from: rubocop-todo.yml'])
+      end
+
+      it 'prints no warning when --auto-gen-config is not set' do
+        expect { cli.run(%w(-c .rubocop.yml)) }.not_to exit_with_code(1)
+      end
+
+      it 'prints a warning when --auto-gen-config is set' do
+        expect { cli.run(%w(-c .rubocop.yml --auto-gen-config)) }
+          .to exit_with_code(1)
+        expect($stderr.string)
+          .to eq('Attention: rubocop-todo.yml has been renamed to ' \
+                 ".rubocop_todo.yml\n")
+      end
+    end
   end
 end

data/spec/rubocop/comment_config_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Rubocop::CommentConfig do
-  subject(:comment_config) { Rubocop::CommentConfig.new(parse_source(source)) }
+  subject(:comment_config) { described_class.new(parse_source(source)) }
 
   describe '#cop_enabled_at_line?' do
     let(:source) do

data/spec/rubocop/config_loader_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::ConfigLoader do
   include FileHelper
 
-  let(:default_config) { Rubocop::ConfigLoader.default_configuration }
+  let(:default_config) { described_class.default_configuration }
 
   describe '.configuration_file_for', :isolated_environment do
     subject(:configuration_file_for) do
@@ -214,7 +214,7 @@ describe Rubocop::ConfigLoader do
                     ['MethodLength:',
                      '  Enabled: false',
                      '  CountComments: true',
-                     '  Max: 79'])
+                     '  Max: 80'])
 
         create_file('special.yml',
                     ['MethodLength:',
@@ -299,7 +299,7 @@ describe Rubocop::ConfigLoader do
       it 'is disabled' do
         create_file('.rubocop.yml', [
           'LineLength:',
-          '  Max: 79'
+          '  Max: 80'
         ])
         expect(config.cop_enabled?('SymbolArray')).to be_false
       end

data/spec/rubocop/config_spec.rb

@@ -107,7 +107,10 @@ describe Rubocop::Config do
     let(:hash) do
       {
         'AllCops' => {
-          'Exclude' => ['/home/foo/project/log/*']
+          'Exclude' => [
+            "#{Dir.pwd}/log/**/*",
+            '**/bar.rb'
+          ]
         }
       }
     end
@@ -116,15 +119,23 @@ describe Rubocop::Config do
 
     context 'when the passed path matches any of patterns to exclude' do
       it 'returns true' do
-        file_path = '/home/foo/project/log/foo.rb'
+        file_path = "#{Dir.pwd}/log/foo.rb"
         expect(configuration.file_to_exclude?(file_path)).to be_true
+
+        expect(configuration.file_to_exclude?('log/foo.rb')).to be_true
+
+        expect(configuration.file_to_exclude?('bar.rb')).to be_true
       end
     end
 
     context 'when the passed path does not match any of patterns to exclude' do
       it 'returns false' do
-        file_path = '/home/foo/project/log_file.rb'
+        file_path = "#{Dir.pwd}/log_file.rb"
         expect(configuration.file_to_exclude?(file_path)).to be_false
+
+        expect(configuration.file_to_exclude?('app/controller.rb')).to be_false
+
+        expect(configuration.file_to_exclude?('baz.rb')).to be_false
       end
     end
   end

data/spec/rubocop/cop/force_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Rubocop::Cop::Force do
-  subject(:force) { Rubocop::Cop::Force.new(cops) }
+  subject(:force) { described_class.new(cops) }
   let(:cops) { [double('cop1'), double('cop2')] }
 
   describe '.force_name' do

data/spec/rubocop/cop/lint/unused_block_argument_spec.rb

@@ -5,143 +5,208 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::UnusedBlockArgument do
   subject(:cop) { described_class.new }
 
-  before do
-    inspect_source(cop, source)
-  end
+  context 'inspection' do
+    before do
+      inspect_source(cop, source)
+    end
 
-  context 'when a block takes multiple arguments' do
-    context 'and an argument is unused' do
-      let(:source) { <<-END }
-        hash = { foo: 'FOO', bar: 'BAR' }
-        hash.each do |key, value|
-          puts key
+    context 'when a block takes multiple arguments' do
+      context 'and an argument is unused' do
+        let(:source) { <<-END }
+          hash = { foo: 'FOO', bar: 'BAR' }
+          hash.each do |key, value|
+            puts key
+          end
+        END
+
+        it 'registers an offense' do
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.offenses.first.message).to eq(
+            'Unused block argument - `value`. ' \
+            "If it's necessary, use `_` or `_value` as an argument name " \
+            "to indicate that it won't be used."
+          )
+          expect(cop.offenses.first.severity.name).to eq(:warning)
+          expect(cop.offenses.first.line).to eq(2)
+          expect(cop.highlights).to eq(['value'])
         end
-      END
+      end
 
-      it 'registers an offense' do
-        expect(cop.offenses.size).to eq(1)
-        expect(cop.offenses.first.message).to eq(
-          'Unused block argument - `value`. ' \
-          "If it's necessary, use `_` or `_value` as an argument name " \
-          "to indicate that it won't be used."
-        )
-        expect(cop.offenses.first.severity.name).to eq(:warning)
-        expect(cop.offenses.first.line).to eq(2)
-        expect(cop.highlights).to eq(['value'])
+      context 'and all the arguments are unused' do
+        let(:source) { <<-END }
+          hash = { foo: 'FOO', bar: 'BAR' }
+          hash.each do |key, value|
+            puts :something
+          end
+        END
+
+        it 'registers offenses and suggests omitting them' do
+          expect(cop.offenses.size).to eq(2)
+          expect(cop.offenses.first.message).to eq(
+            'Unused block argument - `key`. ' \
+            "You can omit all the arguments if you don't care about them."
+          )
+          expect(cop.offenses.first.line).to eq(2)
+          expect(cop.highlights).to eq(%w(key value))
+        end
       end
     end
 
-    context 'and all the arguments are unused' do
-      let(:source) { <<-END }
-        hash = { foo: 'FOO', bar: 'BAR' }
-        hash.each do |key, value|
-          puts :something
+    context 'when a block takes single argument' do
+      context 'and the argument is unused' do
+        let(:source) { <<-END }
+          1.times do |index|
+            puts :something
+          end
+        END
+
+        it 'registers an offense and suggests omitting that' do
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.offenses.first.message).to eq(
+            'Unused block argument - `index`. ' \
+            "You can omit the argument if you don't care about it."
+          )
+          expect(cop.offenses.first.line).to eq(1)
+          expect(cop.highlights).to eq(['index'])
         end
-      END
+      end
+    end
 
-      it 'registers offenses and suggests omitting them' do
-        expect(cop.offenses.size).to eq(2)
-        expect(cop.offenses.first.message).to eq(
-          'Unused block argument - `key`. ' \
-          "You can omit all the arguments if you don't care about them."
-        )
-        expect(cop.offenses.first.line).to eq(2)
-        expect(cop.highlights).to eq(%w(key value))
+    context 'when a lambda block takes arguments' do
+      context 'and all the arguments are unused' do
+        let(:source) { <<-END }
+          -> (foo, bar) { do_something }
+        END
+
+        it 'registers offenses and suggests using a proc' do
+          expect(cop.offenses.size).to eq(2)
+          expect(cop.offenses.first.message).to eq(
+            'Unused block argument - `foo`. ' \
+            "If it's necessary, use `_` or `_foo` as an argument name " \
+            "to indicate that it won't be used. " \
+            'Also consider using a proc without arguments instead of a ' \
+            "lambda if you want it to accept any arguments but don't care " \
+            'about them.'
+
+          )
+          expect(cop.offenses.first.line).to eq(1)
+          expect(cop.highlights).to eq(%w(foo bar))
+        end
+      end
+
+      context 'and an arguments is unused' do
+        let(:source) { <<-END }
+          -> (foo, bar) { puts bar }
+        END
+
+        it 'registers an offense' do
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.offenses.first.message).to eq(
+            'Unused block argument - `foo`. ' \
+            "If it's necessary, use `_` or `_foo` as an argument name " \
+            "to indicate that it won't be used."
+          )
+          expect(cop.offenses.first.line).to eq(1)
+          expect(cop.highlights).to eq(['foo'])
+        end
       end
     end
-  end
 
-  context 'when a block takes single argument' do
-    context 'and the argument is unused' do
+    context 'when an underscore-prefixed block argument is not used' do
       let(:source) { <<-END }
-        1.times do |index|
-          puts :something
+        1.times do |_index|
+          puts 'foo'
         end
       END
 
-      it 'registers an offense and suggests omitting that' do
-        expect(cop.offenses.size).to eq(1)
-        expect(cop.offenses.first.message).to eq(
-          'Unused block argument - `index`. ' \
-          "You can omit the argument if you don't care about it."
-        )
-        expect(cop.offenses.first.line).to eq(1)
-        expect(cop.highlights).to eq(['index'])
+      it 'accepts' do
+        expect(cop.offenses).to be_empty
       end
     end
-  end
 
-  context 'when a lambda block takes arguments' do
-    context 'and all the arguments are unused' do
+    context 'when a method argument is not used' do
       let(:source) { <<-END }
-        -> (foo, bar) { do_something }
+        def some_method(foo)
+        end
       END
 
-      it 'registers offenses and suggests using a proc' do
-        expect(cop.offenses.size).to eq(2)
-        expect(cop.offenses.first.message).to eq(
-          'Unused block argument - `foo`. ' \
-          "If it's necessary, use `_` or `_foo` as an argument name " \
-          "to indicate that it won't be used. " \
-          'Also consider using a proc without arguments instead of a lambda ' \
-          "if you want it to accept any arguments but don't care about them."
-
-        )
-        expect(cop.offenses.first.line).to eq(1)
-        expect(cop.highlights).to eq(%w(foo bar))
+      it 'does not care' do
+        expect(cop.offenses).to be_empty
       end
     end
 
-    context 'and an arguments is unused' do
+    context 'when a variable is not used' do
       let(:source) { <<-END }
-        -> (foo, bar) { puts bar }
+        1.times do
+          foo = 1
+        end
       END
 
-      it 'registers an offense' do
-        expect(cop.offenses.size).to eq(1)
-        expect(cop.offenses.first.message).to eq(
-          'Unused block argument - `foo`. ' \
-          "If it's necessary, use `_` or `_foo` as an argument name " \
-          "to indicate that it won't be used."
-        )
-        expect(cop.offenses.first.line).to eq(1)
-        expect(cop.highlights).to eq(['foo'])
+      it 'does not care' do
+        expect(cop.offenses).to be_empty
       end
     end
   end
 
-  context 'when an underscore-prefixed block argument is not used' do
-    let(:source) { <<-END }
-      1.times do |_index|
-        puts 'foo'
-      end
-    END
+  context 'auto-correct' do
+    it 'fixes single' do
+      expect(autocorrect_source(cop, <<-SOURCE
+      arr.map { |foo| stuff }
+      SOURCE
+      )).to eq(<<-CORRECTED_SOURCE
+      arr.map { |_foo| stuff }
+      CORRECTED_SOURCE
+      )
+    end
 
-    it 'accepts' do
-      expect(cop.offenses).to be_empty
+    it 'fixes multiple' do
+      expect(autocorrect_source(cop, <<-SOURCE
+      hash.map { |key, val| stuff }
+      SOURCE
+      )).to eq(<<-CORRECTED_SOURCE
+      hash.map { |_key, _val| stuff }
+      CORRECTED_SOURCE
+      )
     end
-  end
 
-  context 'when a method argument is not used' do
-    let(:source) { <<-END }
-      def some_method(foo)
-      end
-    END
+    it 'preserves whitespace' do
+      expect(autocorrect_source(cop, <<-SOURCE
+      hash.map { |key,
+                  val| stuff }
+      SOURCE
+      )).to eq(<<-CORRECTED_SOURCE
+      hash.map { |_key,
+                  _val| stuff }
+      CORRECTED_SOURCE
+      )
+    end
 
-    it 'does not care' do
-      expect(cop.offenses).to be_empty
+    it 'preserves splat' do
+      expect(autocorrect_source(cop, <<-SOURCE
+      obj.method { |foo, *bars, baz| stuff(foo, baz) }
+      SOURCE
+      )).to eq(<<-CORRECTED_SOURCE
+      obj.method { |foo, *_bars, baz| stuff(foo, baz) }
+      CORRECTED_SOURCE
+      )
     end
-  end
 
-  context 'when a variable is not used' do
-    let(:source) { <<-END }
-      1.times do
-        foo = 1
-      end
-    END
+    it 'preserves default' do
+      expect(autocorrect_source(cop, <<-SOURCE
+      obj.method { |foo, bar = baz| stuff(foo) }
+      SOURCE
+      )).to eq(<<-CORRECTED_SOURCE
+      obj.method { |foo, _bar = baz| stuff(foo) }
+      CORRECTED_SOURCE
+      )
+    end
+
+    it 'ignores used' do
+      original_source = <<-SOURCE
+      obj.method { |foo, baz| stuff(foo, baz) }
+      SOURCE
 
-    it 'does not care' do
-      expect(cop.offenses).to be_empty
+      expect(autocorrect_source(cop, original_source)).to eq(original_source)
     end
   end
 end