rubocop 0.23.0 → 0.24.0

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

@@ -363,16 +363,7 @@ describe RuboCop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offense for the declaration' do
-      inspect_source(cop, source)
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.offenses.first.message)
-        .to eq('Useless assignment to variable - `foo`.')
-      expect(cop.offenses.first.line).to eq(1)
-      expect(cop.highlights).to eq(['foo'])
-    end
-
-    include_examples 'mimics MRI 2.1'
+    include_examples 'accepts'
   end
 
   context 'when a block local variable is assigned and unreferenced' do
@@ -498,14 +489,13 @@ describe RuboCop::Cop::Lint::UselessAssignment do
 
     it 'registers an offense' do
       pending 'Requires an advanced logic that checks whether the return ' \
-              'value of an operator assignment is used or not.' do
-        inspect_source(cop, source)
-        expect(cop.offenses.size).to eq(1)
-        expect(cop.offenses.first.message)
-          .to eq('Useless assignment to variable - `foo`.')
-        expect(cop.offenses.first.line).to eq(7)
-        expect(cop.highlights).to eq(['foo'])
-      end
+              'value of an operator assignment is used or not.'
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless assignment to variable - `foo`.')
+      expect(cop.offenses.first.line).to eq(7)
+      expect(cop.highlights).to eq(['foo'])
     end
   end
 

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

@@ -5,61 +5,85 @@ require 'spec_helper'
 describe RuboCop::Cop::Lint::UselessSetterCall do
   subject(:cop) { described_class.new }
 
-  it 'registers an offense for def ending with lvar attr assignment' do
-    inspect_source(cop,
-                   ['def test',
-                    '  top = Top.new',
-                    '  top.attr = 5',
-                    'end'
-                   ])
-    expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Useless setter call to local variable `top`.'])
+  context 'with method ending with setter call on local object' do
+    it 'registers an offense' do
+      inspect_source(cop,
+                     ['def test',
+                      '  top = Top.new',
+                      '  top.attr = 5',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Useless setter call to local variable `top`.'])
+    end
   end
 
-  it 'registers an offense for defs ending with lvar attr assignment' do
-    inspect_source(cop,
-                   ['def Top.test',
-                    '  top = Top.new',
-                    '  top.attr = 5',
-                    'end'
-                   ])
-    expect(cop.offenses.size).to eq(1)
+  context 'with singleton method ending with setter call on local object' do
+    it 'registers an offense' do
+      inspect_source(cop,
+                     ['def Top.test',
+                      '  top = Top.new',
+                      '  top.attr = 5',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
   end
 
-  it 'accepts def ending with ivar assignment' do
-    inspect_source(cop,
-                   ['def test',
-                    '  something',
-                    '  @top = 5',
-                    'end'
-                   ])
-    expect(cop.offenses).to be_empty
+  context 'with method ending with square bracket setter on local object' do
+    it 'registers an offense' do
+      inspect_source(cop,
+                     ['def test',
+                      '  top = Top.new',
+                      '  top[:attr] = 5',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Useless setter call to local variable `top`.'])
+    end
   end
 
-  it 'accepts def ending ivar attr assignment' do
-    inspect_source(cop,
-                   ['def test',
-                    '  something',
-                    '  @top.attr = 5',
-                    'end'
-                   ])
-    expect(cop.offenses).to be_empty
+  context 'with method ending with ivar assignment' do
+    it 'accepts' do
+      inspect_source(cop,
+                     ['def test',
+                      '  something',
+                      '  @top = 5',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  it 'accepts def ending with argument attr assignment' do
-    inspect_source(cop,
-                   ['def test(some_arg)',
-                    '  unrelated_local_variable = Top.new',
-                    '  some_arg.attr = 5',
-                    'end'
-                   ])
-    expect(cop.offenses).to be_empty
+  context 'with method ending with setter call on ivar' do
+    it 'accepts' do
+      inspect_source(cop,
+                     ['def test',
+                      '  something',
+                      '  @top.attr = 5',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'with method ending with setter call on argument' do
+    it 'accepts' do
+      inspect_source(cop,
+                     ['def test(some_arg)',
+                      '  unrelated_local_variable = Top.new',
+                      '  some_arg.attr = 5',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  context 'when a lvar has an object passed as argument ' \
+  context 'when a lvar contains an object passed as argument ' \
           'at the end of the method' do
-    it 'accepts the lvar attr assignment' do
+    it 'accepts the setter call on the lvar' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  @some_ivar = some_arg',
@@ -73,9 +97,9 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar has an object passed as argument ' \
+  context 'when a lvar contains an object passed as argument ' \
           'by multiple-assignment at the end of the method' do
-    it 'accepts the lvar attr assignment' do
+    it 'accepts the setter call on the lvar' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  _first, some_lvar, _third  = 1, some_arg, 3',
@@ -86,7 +110,7 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar does not have any object passed as argument ' \
+  context 'when a lvar does not contain any object passed as argument ' \
           'with multiple-assignment at the end of the method' do
     it 'registers an offense' do
       inspect_source(cop,
@@ -99,9 +123,9 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar possibly has an object passed as argument ' \
+  context 'when a lvar possibly contains an object passed as argument ' \
           'by logical-operator-assignment at the end of the method' do
-    it 'accepts the lvar attr assignment' do
+    it 'accepts the setter call on the lvar' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  some_lvar = nil',
@@ -113,7 +137,7 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar does not have any object passed as argument ' \
+  context 'when a lvar does not contain any object passed as argument ' \
           'by binary-operator-assignment at the end of the method' do
     it 'registers an offense' do
       inspect_source(cop,
@@ -129,7 +153,7 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
 
   context 'when a lvar declared as an argument ' \
           'is no longer the passed object at the end of the method' do
-    it 'registers an offense for the lvar attr assignment' do
+    it 'registers an offense for the setter call on the lvar' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  some_arg = Top.new',
@@ -140,6 +164,30 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
     end
   end
 
+  context 'when a lvar contains a local object instanciated with literal' do
+    it 'registers an offense for the setter call on the lvar' do
+      inspect_source(cop,
+                     ['def test',
+                      '  some_arg = {}',
+                      '  some_arg[:attr] = 1',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+  end
+
+  context 'when a lvar contains a non-local object returned by a method' do
+    it 'accepts' do
+      inspect_source(cop,
+                     ['def test',
+                      '  some_lvar = Foo.shared_object',
+                      '  some_lvar[:attr] = 1',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
   it 'is not confused by operators ending with =' do
     inspect_source(cop,
                    ['def test',

data/spec/rubocop/cop/offense_spec.rb

@@ -17,7 +17,7 @@ describe RuboCop::Cop::Offense do
     expect(offense.line).to eq(1)
     expect(offense.message).to eq('message')
     expect(offense.cop_name).to eq('CopName')
-    expect(offense.corrected?).to be_true
+    expect(offense.corrected?).to be_truthy
   end
 
   it 'overrides #to_s' do
@@ -35,14 +35,14 @@ describe RuboCop::Cop::Offense do
     o1 = described_class.new(:convention, location, 'message', 'CopName')
     o2 = described_class.new(:convention, location, 'message', 'CopName')
 
-    expect(o1 == o2).to be_true
+    expect(o1 == o2).to be_truthy
   end
 
   it 'is frozen' do
     expect(offense).to be_frozen
   end
 
-  [:severity, :location, :line, :column, :message, :cop_name].each do |a|
+  [:severity, :location, :message, :cop_name].each do |a|
     describe "##{a}" do
       it 'is frozen' do
         expect(offense.send(a)).to be_frozen

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

@@ -113,7 +113,7 @@ describe RuboCop::Cop::Rails::Delegate do
                     '  end',
                     '  ',
                     '  protected',
-                    '  ' ,
+                    '  ',
                     '  def fox',
                     '    bar.fox',
                     '  end'])

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

@@ -95,6 +95,18 @@ describe RuboCop::Cop::Style::AccessModifierIndentation, :config do
         .to eq(['Indent access modifiers like `private`.'])
     end
 
+    it 'accepts misaligned private in blocks that are not recognized as ' \
+       'class/module definitions' do
+      inspect_source(cop,
+                     ['Test = func do',
+                      '',
+                      'private',
+                      '',
+                      '  def test; end',
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'registers an offense for misaligned private in module ' \
        'defined with Module.new' do
       inspect_source(cop,

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

@@ -25,13 +25,13 @@ describe RuboCop::Cop::Style::AlignHash, :config do
       }
     end
 
-    it 'registers offence for misaligned keys in implicit hash' do
+    it 'registers offense for misaligned keys in implicit hash' do
       inspect_source(cop, ['func(a: 0,',
                            '  b: 1)'])
       expect(cop.offenses.size).to eq(1)
     end
 
-    it 'registers offence for misaligned keys in explicit hash' do
+    it 'registers offense for misaligned keys in explicit hash' do
       inspect_source(cop, ['func({a: 0,',
                            '  b: 1})'])
       expect(cop.offenses.size).to eq(1)
@@ -71,7 +71,7 @@ describe RuboCop::Cop::Style::AlignHash, :config do
       expect(cop.offenses).to be_empty
     end
 
-    it 'registers offence for misaligned keys in explicit hash' do
+    it 'registers offense for misaligned keys in explicit hash' do
       inspect_source(cop, ['func({a: 0,',
                            '  b: 1})'])
       expect(cop.offenses.size).to eq(1)
@@ -85,7 +85,7 @@ describe RuboCop::Cop::Style::AlignHash, :config do
       }
     end
 
-    it 'registers offence for misaligned keys in implicit hash' do
+    it 'registers offense for misaligned keys in implicit hash' do
       inspect_source(cop, ['func(a: 0,',
                            '  b: 1)'])
       expect(cop.offenses.size).to eq(1)

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

@@ -322,7 +322,7 @@ describe RuboCop::Cop::Style::AlignParameters, :config do
         expect(cop.offenses).to be_empty
       end
 
-      it 'registers offences for double indentation from relevant method' do
+      it 'registers offenses for double indentation from relevant method' do
         inspect_source(cop, [' something',
                              '   .method_name(',
                              '       a,',

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

@@ -12,8 +12,18 @@ describe RuboCop::Cop::Style::Attr do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'accepts attr when it does not take arguments' do
+    inspect_source(cop, 'func(attr)')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts attr when it has a receiver' do
+    inspect_source(cop, 'x.attr arg')
+    expect(cop.offenses).to be_empty
+  end
+
   it 'auto-corrects attr to attr_reader' do
-    new_source = autocorrect_source(cop, 'attr')
-    expect(new_source).to eq('attr_reader')
+    new_source = autocorrect_source(cop, 'attr :name')
+    expect(new_source).to eq('attr_reader :name')
   end
 end

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

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::ClassCheck, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when enforced style is is_a?' do
+    let(:cop_config) { { 'EnforcedStyle' => 'is_a?' } }
+
+    it 'registers an offense for kind_of?' do
+      inspect_source(cop, 'x.kind_of? y')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.highlights).to eq(['kind_of?'])
+      expect(cop.messages)
+        .to eq(['Prefer `Object#is_a?` over `Object#kind_of?`.'])
+    end
+
+    it 'auto-corrects kind_of? to is_a?' do
+      corrected = autocorrect_source(cop, ['x.kind_of? y'])
+      expect(corrected).to eq 'x.is_a? y'
+    end
+  end
+
+  context 'when enforced style is kind_of?' do
+    let(:cop_config) { { 'EnforcedStyle' => 'kind_of?' } }
+
+    it 'registers an offense for is_a?' do
+      inspect_source(cop, 'x.is_a? y')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.highlights).to eq(['is_a?'])
+      expect(cop.messages)
+        .to eq(['Prefer `Object#kind_of?` over `Object#is_a?`.'])
+    end
+
+    it 'auto-corrects is_a? to kind_of?' do
+      corrected = autocorrect_source(cop, ['x.is_a? y'])
+      expect(corrected).to eq 'x.kind_of? y'
+    end
+  end
+end

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

@@ -65,4 +65,9 @@ describe RuboCop::Cop::Style::EachWithObject do
     inspect_source(cop, ['[].inject(:+)', '[].reduce(:+)'])
     expect(cop.offenses).to be_empty
   end
+
+  it 'does not blow up for reduce with no arguments' do
+    inspect_source(cop, ['[1, 2, 3].inject { |a, e| a + e }'])
+    expect(cop.offenses).to be_empty
+  end
 end

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

@@ -11,6 +11,11 @@ describe RuboCop::Cop::Style::IfWithSemicolon do
       ['Never use if x; Use the ternary operator instead.'])
   end
 
+  it 'accepts one line if/then/end' do
+    inspect_source(cop, ['if cond then run else dont end'])
+    expect(cop.messages).to be_empty
+  end
+
   it 'can handle modifier conditionals' do
     inspect_source(cop, ['class Hash',
                          'end if RUBY_VERSION < "1.8.7"'])

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

@@ -149,6 +149,47 @@ describe RuboCop::Cop::Style::IndentationWidth do
                                  '  end',
                                  'end'].join("\n")
       end
+
+      it 'indents parenthesized expressions' do
+        src = ['var1 = nil',
+               'array_list = []',
+               'if var1.attr1 != 0 || array_list.select{ |w|',
+               '                        (w.attr2 == var1.attr2)',
+               '                 }.blank?',
+               '  array_list << var1',
+               'end']
+        corrected = autocorrect_source(cop, src)
+        expect(corrected)
+          .to eq ['var1 = nil',
+                  'array_list = []',
+                  'if var1.attr1 != 0 || array_list.select{ |w|',
+                  '                   (w.attr2 == var1.attr2)',
+                  '                 }.blank?',
+                  '  array_list << var1',
+                  'end'].join("\n")
+      end
+
+      it 'leaves rescue ; end unchanged' do
+        src = ['if variable',
+               '  begin',
+               '    do_something',
+               '  rescue ; end # consume any exception',
+               'end']
+        corrected = autocorrect_source(cop, src)
+        expect(corrected).to eq src.join("\n")
+      end
+
+      it 'leaves block unchanged if block end is not on its own line' do
+        src = ['a_function {',
+               '  # a comment',
+               '  result = AObject.find_by_attr(attr) if attr',
+               '  result || AObject.make(',
+               '      :attr => attr,',
+               '      :attr2 => Other.get_value(),',
+               '      :attr3 => Another.get_value()) }']
+        corrected = autocorrect_source(cop, src)
+        expect(corrected).to eq src.join("\n")
+      end
     end
 
     it 'accepts a one line if statement' do
@@ -505,6 +546,20 @@ describe RuboCop::Cop::Style::IndentationWidth do
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts aligned values in when clause' do
+      inspect_source(cop,
+                     ['case superclass',
+                      'when /\A(#{NAMESPACEMATCH})(?:\s|\Z)/,',
+                      '     /\A(Struct|OStruct)\.new/,',
+                      '     /\ADelegateClass\((.+?)\)\s*\Z/,',
+                      '     /\A(#{NAMESPACEMATCH})\(/',
+                      '  $1',
+                      'when "self"',
+                      '  namespace.path',
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'accepts case/when/else laid out as a table' do
       inspect_source(cop,
                      ['case sexp.loc.keyword.source',
@@ -703,6 +758,46 @@ describe RuboCop::Cop::Style::IndentationWidth do
     end
   end
 
+  context 'with begin/rescue/else/ensure/end' do
+    it 'registers an offense for bad indentation of bodies' do
+      inspect_source(cop,
+                     ['def my_func',
+                      "  puts 'do something outside block'",
+                      '  begin',
+                      "  puts 'do something error prone'",
+                      '  rescue SomeException, SomeOther => e',
+                      "   puts 'wrongly intended error handling'",
+                      '  rescue',
+                      "   puts 'wrongly intended error handling'",
+                      '  else',
+                      "     puts 'wrongly intended normal case handling'",
+                      '  ensure',
+                      "      puts 'wrongly intended common handling'",
+                      '  end',
+                      'end'])
+      expect(cop.messages).to eq(['Use 2 (not 0) spaces for indentation.',
+                                  'Use 2 (not 1) spaces for indentation.',
+                                  'Use 2 (not 1) spaces for indentation.',
+                                  'Use 2 (not 3) spaces for indentation.',
+                                  'Use 2 (not 4) spaces for indentation.'])
+    end
+  end
+
+  context 'with def/rescue/end' do
+    it 'registers an offense for bad indentation of bodies' do
+      inspect_source(cop,
+                     ['def my_func',
+                      "  puts 'do something error prone'",
+                      'rescue SomeException',
+                      " puts 'wrongly intended error handling'",
+                      'rescue',
+                      " puts 'wrongly intended error handling'",
+                      'end'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.',
+                                  'Use 2 (not 1) spaces for indentation.'])
+    end
+  end
+
   context 'with block' do
     it 'registers an offense for bad indentation of a do/end body' do
       inspect_source(cop,