rubocop 0.16.0 → 0.17.0

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::UselessElseWithoutRescue do
+  subject(:cop) { described_class.new }
+
+  before do
+    inspect_source(cop, source)
+  end
+
+  context 'with `else` without `rescue`' do
+    let(:source) do
+      [
+        'begin',
+        '  do_something',
+        'else',
+        '  handle_unknown_errors',
+        'end'
+      ]
+    end
+
+    it 'registers an offence' do
+      expect(cop.offences.size).to eq(1)
+      expect(cop.offences.first.message)
+        .to eq('Else without rescue is useless')
+      expect(cop.highlights).to eq(['else'])
+    end
+  end
+
+  context 'with `else` with `rescue`' do
+    let(:source) do
+      [
+        'begin',
+        '  do_something',
+        'rescue ArgumentError',
+        '  handle_argument_error',
+        'else',
+        '  handle_unknown_errors',
+        'end'
+      ]
+    end
+
+    it 'accepts' do
+      expect(cop.offences).to be_empty
+    end
+  end
+end

data/spec/rubocop/cop/offence_spec.rb

@@ -119,7 +119,7 @@ describe Rubocop::Cop::Offence do
 
       [{                  cop: 'B' }, {                  cop: 'A' }, 1],
       [{ line: 6,         cop: 'A' }, { line: 5,         cop: 'B' }, 1],
-      [{          col: 6, cop: 'A' }, {          col: 5, cop: 'B' }, 1],
+      [{          col: 6, cop: 'A' }, {          col: 5, cop: 'B' }, 1]
     ].each do |one, other, expectation|
       context "when receiver has #{one} and other has #{other}" do
         it "returns #{expectation}" do

data/spec/rubocop/cop/rails/default_scope_spec.rb

@@ -23,6 +23,12 @@ describe Rubocop::Cop::Rails::DefaultScope do
     expect(cop.offences.size).to eq(1)
   end
 
+  it 'registers an offence for non blocks' do
+    inspect_source(cop,
+                   ['default_scope order: "position"'])
+    expect(cop.offences.size).to eq(1)
+  end
+
   it 'accepts a block arg' do
     inspect_source(cop,
                    ['default_scope { something }'])

data/spec/rubocop/cop/rails/output_spec.rb

@@ -33,7 +33,8 @@ describe Rubocop::Cop::Rails::Output, :config do
   it 'should ignore certain files' do
     source = ['print 1']
     processed_source = parse_source(source)
-    processed_source.buffer.stub(:name).and_return('/var/lib/test.rake')
+    allow(processed_source.buffer)
+      .to receive(:name).and_return('/var/lib/test.rake')
     _investigate(cop, processed_source)
     expect(cop.offences).to be_empty
   end

data/spec/rubocop/cop/style/align_hash_spec.rb

@@ -58,7 +58,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            "    'a' => 0,",
                            "  'bbb' => 1",
                            '}'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(["'bbb' => 1"])
     end
 
@@ -66,13 +66,13 @@ describe Rubocop::Cop::Style::AlignHash, :config do
       it 'registers an offence for misaligned hash keys' do
         inspect_source(cop, ['func(a: 0,',
                              '  b: 1)'])
-        expect(cop.offences).to have(1).item
+        expect(cop.offences.size).to eq(1)
       end
 
       it 'registers an offence for right alignment of keys' do
         inspect_source(cop, ['func(a: 0,',
                              '   bbb: 1)'])
-        expect(cop.offences).to have(1).item
+        expect(cop.offences.size).to eq(1)
       end
 
       it 'accepts aligned hash keys' do
@@ -93,7 +93,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                                             '           ccc: 2 }',
                                             'hash2 = { :a   => 0,',
                                             '     :bb  => 1,',
-                                            '          :ccc  =>2 }',
+                                            '          :ccc  =>2 }'
                                            ])
       expect(new_source).to eq(['hash1 = { a: 0,',
                                 '          bb: 1,',
@@ -126,7 +126,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            'hash2 = {',
                            '  a:   0,',
                            '  bbb: 1',
-                           '}',
+                           '}'
                           ])
       expect(cop.offences).to be_empty
     end
@@ -144,7 +144,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            'hash2 = {',
                            '  a:   0,',
                            '  bbb:1',
-                           '}',
+                           '}'
                           ])
       expect(cop.highlights).to eq(["'a'   =>  0",
                                     'bbb:1'])
@@ -155,7 +155,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            "  'a'   => 0,",
                            "  'bbb'  => 1",
                            '}'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
     end
 
     it 'auto-corrects alignment' do
@@ -234,7 +234,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            "    'a' =>  0,",
                            "  'bbb' => 1",
                            '}'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
     end
 
     it 'registers an offence for misaligned hash rockets' do
@@ -242,7 +242,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            "    'a'  => 0,",
                            "  'bbb' =>  1",
                            '}'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
     end
 
     include_examples 'not on separate lines'

data/spec/rubocop/cop/style/align_parameters_spec.rb

@@ -50,7 +50,7 @@ describe Rubocop::Cop::Style::AlignParameters do
                          'func2(a,',
                          '     *b,',
                          '      c)',
-                         'func3(*a)',
+                         'func3(*a)'
                         ])
     expect(cop.offences.map(&:to_s))
       .to eq(['C:  5:  6: Align the parameters of a method call if ' +

data/spec/rubocop/cop/style/braces_around_hash_parameters_spec.rb

@@ -159,6 +159,11 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
         corrected = autocorrect_source(cop, ['where({ x: 1, foo: "bar" })'])
         expect(corrected).to eq 'where( x: 1, foo: "bar" )'
       end
+
+      it 'one hash parameter with braces and a trailing comma' do
+        corrected = autocorrect_source(cop, ['where({ x: 1, y: 2, })'])
+        expect(corrected).to eq 'where( x: 1, y: 2 )'
+      end
     end
   end
 

data/spec/rubocop/cop/style/case_indentation_spec.rb

@@ -2,8 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::CaseIndentation, :config do
+describe Rubocop::Cop::Style::CaseIndentation do
   subject(:cop) { described_class.new(config) }
+  let(:config) do
+    merged = Rubocop::ConfigLoader
+      .default_configuration['CaseIndentation'].merge(cop_config)
+    Rubocop::Config.new('CaseIndentation' => merged)
+  end
 
   context 'with IndentWhenRelativeTo: case' do
     context 'with IndentOneStep: false' do
@@ -23,6 +28,19 @@ describe Rubocop::Cop::Style::CaseIndentation, :config do
           expect(cop.offences).to be_empty
         end
 
+        it 'registers on offence for an assignment indented as end' do
+          source = ['output = case variable',
+                    "when 'value1'",
+                    "  'output1'",
+                    'else',
+                    "  'output2'",
+                    'end']
+          inspect_source(cop, source)
+          expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.config_to_allow_offences).to eq('IndentWhenRelativeTo' =>
+                                                     'end')
+        end
+
         it 'registers on offence for an assignment indented some other way' do
           source = ['output = case variable',
                     "  when 'value1'",
@@ -32,6 +50,25 @@ describe Rubocop::Cop::Style::CaseIndentation, :config do
                     'end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+        end
+
+        it 'registers on offence for correct + opposite' do
+          source = ['output = case variable',
+                    "         when 'value1'",
+                    "           'output1'",
+                    '         else',
+                    "           'output2'",
+                    '         end',
+                    'output = case variable',
+                    "when 'value1'",
+                    "  'output1'",
+                    'else',
+                    "  'output2'",
+                    'end']
+          inspect_source(cop, source)
+          expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
         end
       end
 
@@ -222,7 +259,7 @@ describe Rubocop::Cop::Style::CaseIndentation, :config do
           expect(cop.offences).to be_empty
         end
 
-        it 'registers on offence for an assignment indented some other way' do
+        it 'registers on offence for an assignment indented as case' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -231,6 +268,20 @@ describe Rubocop::Cop::Style::CaseIndentation, :config do
                     '         end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when one step more than end.'])
+          expect(cop.config_to_allow_offences).to eq('IndentWhenRelativeTo' =>
+                                                     'case')
+        end
+
+        it 'registers on offence for an assignment indented some other way' do
+          source = ['output = case variable',
+                    "       when 'value1'",
+                    "         'output1'",
+                    '       else',
+                    "         'output2'",
+                    '       end']
+          inspect_source(cop, source)
+          expect(cop.messages).to eq(['Indent when one step more than end.'])
+          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
         end
       end
     end

data/spec/rubocop/cop/style/class_and_module_camel_case_spec.rb

@@ -11,7 +11,7 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'end',
                     '',
                     'module My_Module',
-                    'end',
+                    'end'
                    ])
     expect(cop.offences.size).to eq(2)
   end
@@ -22,7 +22,7 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'end',
                     '',
                     'module My_Module::Ala',
-                    'end',
+                    'end'
                    ])
     expect(cop.offences.size).to eq(2)
   end
@@ -33,7 +33,7 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'end',
                     '',
                     'module Mine',
-                    'end',
+                    'end'
                    ])
     expect(cop.offences).to be_empty
   end

data/spec/rubocop/cop/style/documentation_spec.rb

@@ -82,7 +82,6 @@ describe Rubocop::Cop::Style::Documentation do
   end
 
   it 'does not raise an error for an implicit match conditional' do
-    pending
     expect do
       inspect_source(cop,
                      ['class Test',

data/spec/rubocop/cop/style/dot_position_spec.rb

@@ -6,12 +6,23 @@ describe Rubocop::Cop::Style::DotPosition, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'Leading dots style' do
-    let(:cop_config) { { 'Style' => 'Leading' } }
+    let(:cop_config) { { 'Style' => 'leading' } }
 
     it 'registers an offence for trailing dot in multi-line call' do
       inspect_source(cop, ['something.',
                            '  method_name'])
       expect(cop.offences.size).to eq(1)
+      expect(cop.highlights).to eq(['.'])
+      expect(cop.config_to_allow_offences).to eq('Style' => 'trailing')
+    end
+
+    it 'registers an offence for correct + opposite' do
+      inspect_source(cop, ['something',
+                           '  .method_name',
+                           'something.',
+                           '  method_name'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts leading do in multi-line method call' do
@@ -37,12 +48,16 @@ describe Rubocop::Cop::Style::DotPosition, :config do
   end
 
   context 'Trailing dots style' do
-    let(:cop_config) { { 'Style' => 'Trailing' } }
+    let(:cop_config) { { 'Style' => 'trailing' } }
 
     it 'registers an offence for leading dot in multi-line call' do
       inspect_source(cop, ['something',
                            '  .method_name'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Place the . on the previous line, together with the method ' +
+                'call receiver.'])
+      expect(cop.highlights).to eq(['.'])
+      expect(cop.config_to_allow_offences).to eq('Style' => 'leading')
     end
 
     it 'accepts trailing dot in multi-line method call' do

data/spec/rubocop/cop/style/empty_line_between_defs_spec.rb

@@ -65,7 +65,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '  # calculates size',
               '  def n',
               '  end',
-              'end',
+              'end'
              ]
     inspect_source(cop, source)
     expect(cop.offences).to be_empty
@@ -77,7 +77,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '  #',
               '  def html_escape(s)',
               '  end',
-              'end',
+              'end'
              ]
     inspect_source(cop, source)
     expect(cop.messages).to be_empty
@@ -89,7 +89,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '    def initialize(attrs)',
               '    end',
               '  end',
-              'end',
+              'end'
              ]
     inspect_source(cop, source)
     expect(cop.messages).to be_empty
@@ -99,7 +99,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
     source = ['def a; end',
               'def b; end']
     inspect_source(cop, source)
-    expect(cop.offences).to have(1).item
+    expect(cop.offences.size).to eq(1)
   end
 
   context 'when AllowAdjacentOneLineDefs is enabled' do

data/spec/rubocop/cop/style/empty_lines_around_body_spec.rb

@@ -14,6 +14,19 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
     expect(cop.offences.size).to eq(1)
   end
 
+  # The cop only registers an offence if the extra line is completely emtpy. If
+  # there is trailing whitespace, then that must be dealt with first. Having
+  # two cops registering offence for the line with only spaces would cause
+  # havoc in auto-correction.
+  it 'accepts method body starting with a line with spaces' do
+    inspect_source(cop,
+                   ['def some_method',
+                    '  ',
+                    '  do_something',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
+
   it 'autocorrects method body starting with a blank' do
     corrected = autocorrect_source(cop,
                                    ['def some_method',

data/spec/rubocop/cop/style/favor_unless_over_negated_if_spec.rb

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::FavorUnlessOverNegatedIf do
                    ['if !a_condition',
                     '  some_method',
                     'end',
-                    'some_method if !a_condition',
+                    'some_method if !a_condition'
                    ])
     expect(cop.messages).to eq(
       ['Favor unless (or control flow or) over if for negative ' +

data/spec/rubocop/cop/style/favor_until_over_negated_while_spec.rb

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::FavorUntilOverNegatedWhile do
                    ['while !a_condition',
                     '  some_method',
                     'end',
-                    'some_method while !a_condition',
+                    'some_method while !a_condition'
                    ])
     expect(cop.messages).to eq(
       ['Favor until over while for negative conditions.'] * 2)

data/spec/rubocop/cop/style/hash_syntax_spec.rb

@@ -17,11 +17,14 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
     it 'registers offence for hash rocket syntax when new is possible' do
       inspect_source(cop, ['x = { :a => 0 }'])
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+      expect(cop.config_to_allow_offences)
+        .to eq('EnforcedStyle' => 'hash_rockets')
     end
 
     it 'registers an offence for mixed syntax when new is possible' do
       inspect_source(cop, ['x = { :a => 0, b: 1 }'])
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'registers an offence for hash rockets in method calls' do
@@ -96,11 +99,13 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
     it 'registers offence for Ruby 1.9 style' do
       inspect_source(cop, ['x = { a: 0 }'])
       expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'ruby19')
     end
 
     it 'registers an offence for mixed syntax' do
       inspect_source(cop, ['x = { :a => 0, b: 1 }'])
       expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'registers an offence for 1.9 style in method calls' do