rubocop 0.12.0 → 0.13.0

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe MultilineIfThen do
-        let(:mit) { MultilineIfThen.new }
+        subject(:mit) { MultilineIfThen.new }
 
         # if
 
@@ -66,7 +66,7 @@ module Rubocop
         it 'registers an offence for then in multiline unless' do
           inspect_source(mit, ['unless cond then',
                                'end'])
-          expect(mit.offences.map(&:message)).to eq(
+          expect(mit.messages).to eq(
             ['Never use then for multi-line if/unless.'])
         end
 

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe NilComparison do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for == nil' do
           inspect_source(cop,

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Not do
-        let(:a) { Not.new }
+        subject(:a) { Not.new }
 
         it 'registers an offence for not' do
           inspect_source(a, ['not test'])

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

@@ -5,45 +5,35 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe NumericLiterals do
-        let(:num) { NumericLiterals.new }
+      describe NumericLiterals, :config do
+        subject(:cop) { described_class.new(config) }
+        let(:cop_config) { { 'MinDigits' => 5 } }
 
         it 'registers an offence for a long integer without underscores' do
-          inspect_source(num, ['a = 123456'])
-          expect(num.offences.map(&:message)).to eq(
-            ['Add underscores to large numeric literals to improve their ' +
-             'readability.'])
+          inspect_source(cop, ['a = 123456'])
+          expect(cop.offences.size).to eq(1)
         end
 
-        it 'registers an offence for an integer with not enough underscores' do
-          inspect_source(num, ['a = 123456_789000'])
-          expect(num.offences.map(&:message)).to eq(
-            ['Add underscores to large numeric literals to improve their ' +
-             'readability.'])
+        it 'registers an offence for an integer with misplaced' do
+          inspect_source(cop, ['a = 123_456_78_90_00'])
+          expect(cop.offences.size).to eq(1)
         end
 
-        # it 'registers an offence for a long float without underscores' do
-        #   inspect_source(num, ['a = 1.234567'])
-        #   expect(num.offences.map(&:message)).to eq(
-        #     ['Add underscores to large numeric literals to improve their ' +
-        #      'readability.'])
-        # end
-
         it 'accepts long numbers with underscore' do
-          inspect_source(num, ['a = 123_456',
-                               'b = 1.234_56'])
-          expect(num.offences.map(&:message)).to be_empty
+          inspect_source(cop, ['a = 123_456',
+                               'b = 123_456.55'])
+          expect(cop.messages).to be_empty
         end
 
         it 'accepts a short integer without underscore' do
-          inspect_source(num, ['a = 123'])
-          expect(num.offences.map(&:message)).to be_empty
+          inspect_source(cop, ['a = 123'])
+          expect(cop.messages).to be_empty
         end
 
         it 'accepts short numbers without underscore' do
-          inspect_source(num, ['a = 123',
+          inspect_source(cop, ['a = 123',
                                'b = 123.456'])
-          expect(num.offences.map(&:message)).to be_empty
+          expect(cop.messages).to be_empty
         end
       end
     end

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

@@ -6,11 +6,11 @@ module Rubocop
   module Cop
     module Style
       describe OneLineConditional do
-        let(:olc) { OneLineConditional.new }
+        subject(:olc) { OneLineConditional.new }
 
         it 'registers an offence for one line if/then/end' do
           inspect_source(olc, ['if cond then run else dont end'])
-          expect(olc.offences.map(&:message)).to eq([olc.error_message])
+          expect(olc.messages).to eq([olc.error_message])
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe OpMethod do
-        let(:om) { OpMethod.new }
+        subject(:om) { OpMethod.new }
 
         it 'registers an offence for arg not named other' do
           inspect_source(om,
@@ -14,7 +14,7 @@ module Rubocop
                           '  another',
                           'end'])
           expect(om.offences.size).to eq(1)
-          expect(om.offences.map(&:message))
+          expect(om.messages)
             .to eq([sprintf(OpMethod::MSG, '+')])
         end
 
@@ -24,7 +24,7 @@ module Rubocop
                           '  another',
                           'end'])
           expect(om.offences.size).to eq(1)
-          expect(om.offences.map(&:message))
+          expect(om.messages)
             .to eq([sprintf(OpMethod::MSG, '+')])
         end
 

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

@@ -5,10 +5,10 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe ParameterLists do
-        let(:list) { ParameterLists.new }
-        before do
-          ParameterLists.config = {
+      describe ParameterLists, :config do
+        subject(:list) { ParameterLists.new(config) }
+        let(:cop_config) do
+          {
             'Max' => 4,
             'CountKeywordArgs' => true
           }
@@ -35,7 +35,7 @@ module Rubocop
         end
 
         context 'When CountKeywordArgs is false' do
-          before { ParameterLists.config['CountKeywordArgs'] = false }
+          before { cop_config['CountKeywordArgs'] = false }
 
           it 'it does not count keyword arguments', ruby: 2.0 do
             inspect_source(list, ['def meth(a, b, c, d: 1, e: 2)',

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

@@ -5,11 +5,9 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe ParenthesesAroundCondition do
-        let(:cop) { ParenthesesAroundCondition.new }
-        before do
-          ParenthesesAroundCondition.config = { 'AllowSafeAssignment' => true }
-        end
+      describe ParenthesesAroundCondition, :config do
+        subject(:cop) { ParenthesesAroundCondition.new(config) }
+        let(:cop_config) { { 'AllowSafeAssignment' => true } }
 
         it 'registers an offence for parentheses around condition' do
           inspect_source(cop, ['if (x > 10)',
@@ -69,9 +67,7 @@ module Rubocop
         end
 
         context 'safe assignment is not allowed' do
-          before do
-            ParenthesesAroundCondition.config['AllowSafeAssignment'] = false
-          end
+          let(:cop_config) { { 'AllowSafeAssignment' => false } }
 
           it 'does not accepts = in condition surrounded with braces' do
             inspect_source(cop,

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

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Style
+      describe PerlBackrefs do
+        subject(:cop) { described_class.new }
+
+        it 'registers an offence for $1' do
+          inspect_source(cop, ['puts $1'])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'auto-corrects $1 to Regexp.last_match[1]' do
+          new_source = autocorrect_source(cop, '$1')
+          expect(new_source).to eq('Regexp.last_match[1]')
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Proc do
-        let(:proc) { Proc.new }
+        subject(:proc) { Proc.new }
 
         it 'registers an offence for a Proc.new call' do
           inspect_source(proc, ['f = Proc.new { |x| puts x }'])

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

@@ -6,10 +6,10 @@ module Rubocop
   module Cop
     module Style
       describe ReduceArguments do
-        let(:reduce_arguments) { ReduceArguments.new }
+        subject(:cop) { described_class.new }
 
         it 'find wrong argument names in calls with different syntax' do
-          inspect_source(reduce_arguments,
+          inspect_source(cop,
                          ['def m',
                           '  [0, 1].reduce { |c, d| c + d }',
                           '  [0, 1].reduce{ |c, d| c + d }',
@@ -18,13 +18,12 @@ module Rubocop
                           '  [0, 1].reduce (5) { |c, d| c + d }',
                           '  [0, 1].reduce(5) { |c, d| c + d }',
                           'end'])
-          expect(reduce_arguments.offences.size).to eq(6)
-          expect(reduce_arguments.offences
-                                 .map(&:line).sort).to eq((2..7).to_a)
+          expect(cop.offences.size).to eq(6)
+          expect(cop.offences.map(&:line).sort).to eq((2..7).to_a)
         end
 
         it 'allows calls with proper argument names' do
-          inspect_source(reduce_arguments,
+          inspect_source(cop,
                          ['def m',
                           '  [0, 1].reduce { |a, e| a + e }',
                           '  [0, 1].reduce{ |a, e| a + e }',
@@ -33,25 +32,33 @@ module Rubocop
                           '  [0, 1].reduce (5) { |a, e| a + e }',
                           '  [0, 1].reduce(5) { |a, e| a + e }',
                           'end'])
-          expect(reduce_arguments.offences).to be_empty
+          expect(cop.offences).to be_empty
         end
 
         it 'ignores do..end blocks' do
-          inspect_source(reduce_arguments,
+          inspect_source(cop,
                          ['def m',
                           '  [0, 1].reduce do |c, d|',
                           '    c + d',
                           '  end',
                           'end'])
-          expect(reduce_arguments.offences).to be_empty
+          expect(cop.offences).to be_empty
         end
 
         it 'ignores :reduce symbols' do
-          inspect_source(reduce_arguments,
+          inspect_source(cop,
                          ['def m',
                           '  call_method(:reduce) { |a, b| a + b}',
                           'end'])
-          expect(reduce_arguments.offences).to be_empty
+          expect(cop.offences).to be_empty
+        end
+
+        it 'does not report when destructuring is used' do
+          inspect_source(cop,
+                         ['def m',
+                          '  test.reduce { |a, (id, _)| a + id}',
+                          'end'])
+          expect(cop.offences).to be_empty
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe RedundantBegin do
-        let(:cop) { RedundantBegin.new }
+        subject(:cop) { RedundantBegin.new }
 
         it 'reports an offence for def with redundant begin block' do
           src = ['def func',

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe RedundantReturn do
-        let(:cop) { RedundantReturn.new }
+        subject(:cop) { described_class.new }
 
         it 'reports an offence for def with only a return' do
           src = ['def func',
@@ -58,6 +58,21 @@ module Rubocop
           inspect_source(cop, src)
           expect(cop.offences).to be_empty
         end
+
+        it 'auto-corrects by removing redundant returns' do
+          src = ['def func',
+                 '  one',
+                 '  two',
+                 '  return something',
+                 'end'].join("\n")
+          result_src = ['def func',
+                        '  one',
+                        '  two',
+                        '  something',
+                        'end'].join("\n")
+          new_source = autocorrect_source(cop, src)
+          expect(new_source).to eq(result_src)
+        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe RedundantSelf do
-        let(:cop) { RedundantSelf.new }
+        subject(:cop) { RedundantSelf.new }
 
         it 'reports an offence a self receiver on an rvalue' do
           src = ['a = self.b']
@@ -104,6 +104,11 @@ module Rubocop
           inspect_source(cop, src)
           expect(cop.offences).to be_empty
         end
+
+        it 'auto-corrects by removing redundant self' do
+          new_source = autocorrect_source(cop, ['self.x'])
+          expect(new_source).to eq('x')
+        end
       end
     end
   end

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

@@ -5,16 +5,16 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe RegexpLiteral do
-        let(:rl) { RegexpLiteral.new }
-        before { RegexpLiteral.config = { 'MaxSlashes' => 1 } }
+      describe RegexpLiteral, :config do
+        subject(:rl) { RegexpLiteral.new(config) }
+        let(:cop_config) { { 'MaxSlashes' => 1 } }
 
         context 'when a regexp uses // delimiters' do
           context 'when MaxSlashes is 1' do
             it 'registers an offence for two slashes in regexp' do
               inspect_source(rl, ['x =~ /home\/\//',
                                   'y =~ /etc\/top\//'])
-              expect(rl.offences.map(&:message))
+              expect(rl.messages)
                 .to eq(['Use %r for regular expressions matching more ' +
                         "than 1 '/' character."] * 2)
             end
@@ -29,11 +29,11 @@ module Rubocop
           end
 
           context 'when MaxSlashes is 0' do
-            before { RegexpLiteral.config = { 'MaxSlashes' => 0 } }
+            let(:cop_config) { { 'MaxSlashes' => 0 } }
 
             it 'registers an offence for one slash in regexp' do
               inspect_source(rl, ['x =~ /home\//'])
-              expect(rl.offences.map(&:message))
+              expect(rl.messages)
                 .to eq(['Use %r for regular expressions matching more ' +
                         "than 0 '/' characters."])
             end
@@ -42,6 +42,18 @@ module Rubocop
               inspect_source(rl, ['z =~ /a/'])
               expect(rl.offences).to be_empty
             end
+
+            it 'registers an offence for zero slashes in regexp' do
+              inspect_source(rl, ['y =~ %r(etc)'])
+              expect(rl.messages)
+                .to eq(['Use %r only for regular expressions matching more ' +
+                        "than 0 '/' characters."])
+            end
+
+            it 'accepts regexp with one slash' do
+              inspect_source(rl, ['x =~ %r(/home)'])
+              expect(rl.offences).to be_empty
+            end
           end
         end
 
@@ -50,7 +62,7 @@ module Rubocop
             it 'registers an offence for zero or one slash in regexp' do
               inspect_source(rl, ['x =~ %r(/home)',
                                   'y =~ %r(etc)'])
-              expect(rl.offences.map(&:message))
+              expect(rl.messages)
                 .to eq(['Use %r only for regular expressions matching more ' +
                         "than 1 '/' character."] * 2)
             end
@@ -61,22 +73,6 @@ module Rubocop
               expect(rl.offences).to be_empty
             end
           end
-
-          context 'when MaxSlashes is 0' do
-            before { RegexpLiteral.config = { 'MaxSlashes' => 0 } }
-
-            it 'registers an offence for zero slashes in regexp' do
-              inspect_source(rl, ['y =~ %r(etc)'])
-              expect(rl.offences.map(&:message))
-                .to eq(['Use %r only for regular expressions matching more ' +
-                        "than 0 '/' characters."])
-            end
-
-            it 'accepts regexp with one slash' do
-              inspect_source(rl, ['x =~ %r(/home)'])
-              expect(rl.offences).to be_empty
-            end
-          end
         end
       end
     end

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

@@ -6,13 +6,13 @@ module Rubocop
   module Cop
     module Style
       describe RescueModifier do
-        let(:rm) { RescueModifier.new }
+        subject(:rm) { RescueModifier.new }
 
         it 'registers an offence for modifier rescue' do
           inspect_source(rm,
                          ['method rescue handle'])
           expect(rm.offences.size).to eq(1)
-          expect(rm.offences.map(&:message))
+          expect(rm.messages)
             .to eq([RescueModifier::MSG])
         end
 
@@ -20,7 +20,7 @@ module Rubocop
           inspect_source(rm,
                          ['method1 or method2 rescue handle'])
           expect(rm.offences.size).to eq(1)
-          expect(rm.offences.map(&:message))
+          expect(rm.messages)
             .to eq([RescueModifier::MSG])
         end