rubocop 0.28.0 → 0.29.0

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

@@ -8,13 +8,13 @@ describe RuboCop::Cop::Lint::LiteralInInterpolation do
   %w(1 2.0 [1] {}).each do |lit|
     it "registers an offense for #{lit} in interpolation" do
       inspect_source(cop,
-                     ["\"this is the \#{#{lit}}\""])
+                     "\"this is the \#{#{lit}}\"")
       expect(cop.offenses.size).to eq(1)
     end
 
     it "registers an offense only for final #{lit} in interpolation" do
       inspect_source(cop,
-                     ["\"this is the \#{#{lit};#{lit}}\""])
+                     "\"this is the \#{#{lit};#{lit}}\"")
       expect(cop.offenses.size).to eq(1)
     end
   end

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

@@ -6,22 +6,22 @@ describe RuboCop::Cop::Lint::Loop do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for begin/end/while' do
-    inspect_source(cop, ['begin something; top; end while test'])
+    inspect_source(cop, 'begin something; top; end while test')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for begin/end/until' do
-    inspect_source(cop, ['begin something; top; end until test'])
+    inspect_source(cop, 'begin something; top; end until test')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts normal while' do
-    inspect_source(cop, ['while test; one; two; end'])
+    inspect_source(cop, 'while test; one; two; end')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts normal until' do
-    inspect_source(cop, ['until test; one; two; end'])
+    inspect_source(cop, 'until test; one; two; end')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -7,28 +7,28 @@ describe RuboCop::Cop::Lint::ParenthesesAsGroupedExpression do
 
   it 'registers an offense for method call with space before the ' \
      'parenthesis' do
-    inspect_source(cop, ['a.func (x)'])
+    inspect_source(cop, 'a.func (x)')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for predicate method call with space ' \
      'before the parenthesis' do
-    inspect_source(cop, ['is? (x)'])
+    inspect_source(cop, 'is? (x)')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for math expression' do
-    inspect_source(cop, ['puts (2 + 3) * 4'])
+    inspect_source(cop, 'puts (2 + 3) * 4')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a method call without arguments' do
-    inspect_source(cop, ['func'])
+    inspect_source(cop, 'func')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a method call with arguments but no parentheses' do
-    inspect_source(cop, ['puts x'])
+    inspect_source(cop, 'puts x')
     expect(cop.offenses).to be_empty
   end
 
@@ -40,7 +40,7 @@ describe RuboCop::Cop::Lint::ParenthesesAsGroupedExpression do
   end
 
   it 'accepts method with parens as arg to method without' do
-    inspect_source(cop, ['a b(c)'])
+    inspect_source(cop, 'a b(c)')
     expect(cop.offenses).to be_empty
   end
 
@@ -51,7 +51,7 @@ describe RuboCop::Cop::Lint::ParenthesesAsGroupedExpression do
   end
 
   it 'accepts a space inside opening paren followed by left paren' do
-    inspect_source(cop, ['a( (b) )'])
+    inspect_source(cop, 'a( (b) )')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -23,7 +23,7 @@ describe RuboCop::Cop::Lint::SpaceBeforeFirstArg do
     end
 
     it 'accepts square brackets operator' do
-      inspect_source(cop, ['something[:x]'])
+      inspect_source(cop, 'something[:x]')
       expect(cop.offenses).to be_empty
     end
 
@@ -33,7 +33,8 @@ describe RuboCop::Cop::Lint::SpaceBeforeFirstArg do
     end
 
     it 'accepts an assignment without space before first arg' do
-      inspect_source(cop, ['a.something=c', 'a.something,b=c,d'])
+      inspect_source(cop, ['a.something=c',
+                           'a.something,b=c,d'])
       expect(cop.offenses).to be_empty
     end
 
@@ -53,12 +54,12 @@ describe RuboCop::Cop::Lint::SpaceBeforeFirstArg do
     end
 
     it 'accepts a method call with space after the left parenthesis' do
-      inspect_source(cop, ['something?(  x  )'])
+      inspect_source(cop, 'something?(  x  )')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts setter call' do
-      inspect_source(cop, ['self.class.controller_path=(path)'])
+      inspect_source(cop, 'self.class.controller_path=(path)')
       expect(cop.offenses).to be_empty
     end
   end

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

@@ -225,9 +225,7 @@ describe RuboCop::Cop::Lint::UselessAssignment do
   context 'when a variable is assigned with operator assignment ' \
           'in top level' do
     let(:source) do
-      [
-        'foo ||= 1'
-      ]
+      'foo ||= 1'
     end
 
     it 'registers an offense' do
@@ -1354,9 +1352,7 @@ describe RuboCop::Cop::Lint::UselessAssignment do
 
   context 'when a named capture is unreferenced in top level' do
     let(:source) do
-      [
-        "/(?<foo>\w+)/ =~ 'FOO'"
-      ]
+      "/(?<foo>\w+)/ =~ 'FOO'"
     end
 
     it 'registers an offense' do
@@ -1592,9 +1588,7 @@ describe RuboCop::Cop::Lint::UselessAssignment do
 
   context 'when there is only one AST node and it is unused variable' do
     let(:source) do
-      [
-        'foo = 1'
-      ]
+      'foo = 1'
     end
 
     it 'registers an offense' do

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

@@ -24,7 +24,7 @@ describe RuboCop::Cop::Lint::UselessComparison do
   end
 
   it 'works with lambda.()' do
-    inspect_source(cop, ['a.(x) > a.(x)'])
+    inspect_source(cop, 'a.(x) > a.(x)')
     expect(cop.offenses.size).to eq(1)
   end
 end

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

@@ -28,7 +28,7 @@ describe RuboCop::Cop::Lint::Void do
 
   described_class::OPS.each do |op|
     it "accepts void op #{op} by itself without a begin block" do
-      inspect_source(cop, ["a #{op} b"])
+      inspect_source(cop, "a #{op} b")
       expect(cop.offenses).to be_empty
     end
   end

data/spec/rubocop/cop/metrics/abc_size_spec.rb

@@ -35,6 +35,16 @@ describe RuboCop::Cop::Metrics::AbcSize, :config do
       expect(cop.config_to_allow_offenses).to eq('Max' => 1)
     end
 
+    it 'registers an offense for an assignment of an element' do
+      inspect_source(cop, ['def method_name',
+                           '  x[0] = 1',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Assignment Branch Condition size for method_name is too ' \
+                'high. [2/0]'])
+      expect(cop.config_to_allow_offenses).to eq('Max' => 2)
+    end
+
     it 'registers an offense for complex content including A, B, and C ' \
        'scores' do
       inspect_source(cop,

data/spec/rubocop/cop/metrics/line_length_spec.rb

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Metrics::LineLength, :config do
   let(:cop_config) { { 'Max' => 80 } }
 
   it "registers an offense for a line that's 81 characters wide" do
-    inspect_source(cop, ['#' * 81])
+    inspect_source(cop, '#' * 81)
     expect(cop.offenses.size).to eq(1)
     expect(cop.offenses.first.message).to eq('Line is too long. [81/80]')
     expect(cop.config_to_allow_offenses).to eq('Max' => 81)
@@ -19,7 +19,7 @@ describe RuboCop::Cop::Metrics::LineLength, :config do
   end
 
   it "accepts a line that's 80 characters wide" do
-    inspect_source(cop, ['#' * 80])
+    inspect_source(cop, '#' * 80)
     expect(cop.offenses).to be_empty
   end
 

data/spec/rubocop/cop/metrics/parameter_lists_spec.rb

@@ -25,7 +25,7 @@ describe RuboCop::Cop::Metrics::ParameterLists, :config do
   end
 
   context 'When CountKeywordArgs is true' do
-    it 'counts keyword arguments as well', ruby: 2.0 do
+    it 'counts keyword arguments as well', ruby: 2 do
       inspect_source(cop, ['def meth(a, b, c, d: 1, e: 2)',
                            'end'])
       expect(cop.offenses.size).to eq(1)
@@ -35,7 +35,7 @@ describe RuboCop::Cop::Metrics::ParameterLists, :config do
   context 'When CountKeywordArgs is false' do
     before { cop_config['CountKeywordArgs'] = false }
 
-    it 'it does not count keyword arguments', ruby: 2.0 do
+    it 'it does not count keyword arguments', ruby: 2 do
       inspect_source(cop, ['def meth(a, b, c, d: 1, e: 2)',
                            'end'])
       expect(cop.offenses).to be_empty

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

@@ -11,22 +11,19 @@ describe RuboCop::Cop::Rails::ActionFilter, :config do
 
     described_class::FILTER_METHODS.each do |method|
       it "registers an offense for #{method}" do
-        inspect_source_file(cop,
-                            ["#{method} :name"])
+        inspect_source_file(cop, "#{method} :name")
         expect(cop.offenses.size).to eq(1)
       end
 
       it "registers an offense for #{method} with block" do
-        inspect_source_file(cop,
-                            ["#{method} { |controller| something }"])
+        inspect_source_file(cop, "#{method} { |controller| something }")
         expect(cop.offenses.size).to eq(1)
       end
     end
 
     described_class::ACTION_METHODS.each do |method|
       it "accepts #{method}" do
-        inspect_source_file(cop,
-                            ["#{method} :something"])
+        inspect_source_file(cop, "#{method} :something")
         expect(cop.offenses).to be_empty
       end
     end
@@ -42,22 +39,19 @@ describe RuboCop::Cop::Rails::ActionFilter, :config do
 
     described_class::ACTION_METHODS.each do |method|
       it "registers an offense for #{method}" do
-        inspect_source_file(cop,
-                            ["#{method} :name"])
+        inspect_source_file(cop, "#{method} :name")
         expect(cop.offenses.size).to eq(1)
       end
 
       it "registers an offense for #{method} with block" do
-        inspect_source_file(cop,
-                            ["#{method} { |controller| something }"])
+        inspect_source_file(cop, "#{method} { |controller| something }")
         expect(cop.offenses.size).to eq(1)
       end
     end
 
     described_class::FILTER_METHODS.each do |method|
       it "accepts #{method}" do
-        inspect_source_file(cop,
-                            ["#{method} :something"])
+        inspect_source_file(cop, "#{method} :something")
         expect(cop.offenses).to be_empty
       end
     end

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

@@ -7,31 +7,31 @@ describe RuboCop::Cop::Rails::DefaultScope do
 
   it 'registers an offense for default scope with a lambda arg' do
     inspect_source(cop,
-                   ['default_scope -> { something }'])
+                   'default_scope -> { something }')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for default scope with a proc arg' do
     inspect_source(cop,
-                   ['default_scope proc { something }'])
+                   'default_scope proc { something }')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for default scope with a proc(Proc.new) arg' do
     inspect_source(cop,
-                   ['default_scope Proc.new { something }'])
+                   'default_scope Proc.new { something }')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for non blocks' do
     inspect_source(cop,
-                   ['default_scope order: "position"'])
+                   'default_scope order: "position"')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a block arg' do
     inspect_source(cop,
-                   ['default_scope { something }'])
+                   'default_scope { something }')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -44,6 +44,14 @@ describe RuboCop::Cop::Rails::Delegate do
     expect(cop.highlights).to eq(['def'])
   end
 
+  it 'ignores class methods' do
+    inspect_source(cop,
+                   ['def self.fox',
+                    '  new.fox',
+                    'end'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'ignores non trivial delegate' do
     inspect_source(cop,
                    ['def fox',

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

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Rails::HasAndBelongsToMany do
 
   it 'registers an offense for has_and_belongs_to_many' do
     inspect_source(cop,
-                   ['has_and_belongs_to_many :groups'])
+                   'has_and_belongs_to_many :groups')
     expect(cop.offenses.size).to eq(1)
   end
 end

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

@@ -5,15 +5,126 @@ require 'spec_helper'
 describe RuboCop::Cop::Rails::ReadWriteAttribute do
   subject(:cop) { described_class.new }
 
-  it 'registers an offense for read_attribute' do
-    inspect_source(cop, 'res = read_attribute(:test)')
-    expect(cop.offenses.size).to eq(1)
-    expect(cop.highlights).to eq(['read_attribute'])
+  context 'read_attribute' do
+    it 'registers an offense' do
+      inspect_source(cop, 'res = read_attribute(:test)')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.highlights).to eq(['read_attribute'])
+    end
+
+    it 'registers no offense with explicit receiver' do
+      inspect_source(cop, 'res = object.read_attribute(:test)')
+      expect(cop.offenses.size).to eq(0)
+    end
+  end
+
+  context 'write_attribute' do
+    it 'registers an offense' do
+      inspect_source(cop, 'write_attribute(:test, val)')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.highlights).to eq(['write_attribute'])
+    end
+
+    it 'registers no offense with explicit receiver' do
+      inspect_source(cop, 'object.write_attribute(:test, val)')
+      expect(cop.offenses.size).to eq(0)
+    end
   end
 
-  it 'registers an offense for write_attribute' do
-    inspect_source(cop, 'write_attribute(:test, val)')
-    expect(cop.offenses.size).to eq(1)
-    expect(cop.highlights).to eq(['write_attribute'])
+  describe '#autocorrect' do
+    context 'write_attribute' do
+      it 'autocorrects symbol' do
+        source = 'write_attribute(:attr, var)'
+        corrected_source = 'self[:attr] = var'
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects string' do
+        source = "write_attribute('attr', 'test')"
+        corrected_source = "self['attr'] = 'test'"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects without parentheses' do
+        source = "write_attribute 'attr', 'test'"
+        corrected_source = "self['attr'] = 'test'"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects expression' do
+        source = "write_attribute(:attr, 'test_' + postfix)"
+        corrected_source = "self[:attr] = 'test_' + postfix"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects multiline' do
+        source = [
+          'write_attribute(',
+          ':attr, ',
+          '(',
+          "'test_' + postfix",
+          ').to_sym',
+          ')'
+        ]
+        corrected_source = [
+          'self[:attr] = (',
+          "'test_' + postfix",
+          ').to_sym'
+        ].join("\n")
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+    end
+
+    context 'read_attribute' do
+      it 'autocorrects symbol' do
+        source = 'res = read_attribute(:test)'
+        corrected_source = 'res = self[:test]'
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects string' do
+        source = "res = read_attribute('test')"
+        corrected_source = "res = self['test']"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects without parentheses' do
+        source = "res = read_attribute 'test'"
+        corrected_source = "res = self['test']"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects expression' do
+        source = "res = read_attribute('test_' + postfix)"
+        corrected_source = "res = self['test_' + postfix]"
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+
+      it 'autocorrects multiline' do
+        source = [
+          'res = read_attribute(',
+          '(',
+          "'test_' + postfix",
+          ').to_sym',
+          ')'
+        ]
+        corrected_source = [
+          'res = self[(',
+          "'test_' + postfix",
+          ').to_sym]'
+        ].join("\n")
+
+        expect(autocorrect_source(cop, source)).to eq(corrected_source)
+      end
+    end
   end
 end