rubocop 0.15.0 → 0.16.0

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

@@ -10,6 +10,7 @@ describe Rubocop::Cop::Style::LineLength, :config do
     inspect_source(cop, ['#' * 80])
     expect(cop.offences.size).to eq(1)
     expect(cop.offences.first.message).to eq('Line is too long. [80/79]')
+    expect(cop.config_to_allow_offences).to eq('Max' => 80)
   end
 
   it "accepts a line that's 79 characters wide" do

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

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::MethodDefParentheses, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'require_parentheses' do
+    let(:cop_config) { { 'EnforcedStyle' => 'require_parentheses' } }
+
+    it 'reports an offence for def with parameters but no parens' do
+      src = ['def func a, b',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for class def with parameters but no parens' do
+      src = ['def Test.func a, b',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'accepts def with no args and no parens' do
+      src = ['def func',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
+    it 'auto-adds required parens' do
+      new_source = autocorrect_source(cop, 'def test param; end')
+      expect(new_source).to eq('def test(param); end')
+    end
+
+    it 'auto-adds required parens to argument lists on multiple lines' do
+      new_source = autocorrect_source(cop, ['def test one,', 'two', 'end'])
+      expect(new_source).to eq("def test(one,\ntwo)\nend")
+    end
+  end
+
+  context 'require_no_parentheses' do
+    let(:cop_config) { { 'EnforcedStyle' => 'require_no_parentheses' } }
+
+    it 'reports an offence for def with parameters with parens' do
+      src = ['def func(a, b)',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for class def with parameters with parens' do
+      src = ['def Test.func(a, b)',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for def with no args and parens' do
+      src = ['def func()',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'auto-removes the parens' do
+      new_source = autocorrect_source(cop, 'def test(param); end')
+      expect(new_source).to eq('def test param; end')
+    end
+  end
+end

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

@@ -58,6 +58,14 @@ describe Rubocop::Cop::Style::MultilineIfThen do
     expect(cop.offences).to be_empty
   end
 
+  it 'does not raise an error for an implicit match if' do
+    expect do
+      inspect_source(cop,
+                     ['if //',
+                      'end'])
+    end.not_to raise_error
+  end
+
   # unless
 
   it 'registers an offence for then in multiline unless' do
@@ -88,4 +96,12 @@ describe Rubocop::Cop::Style::MultilineIfThen do
                    ])
     expect(cop.offences).to be_empty
   end
+
+  it 'does not raise an error for an implicit match unless' do
+    expect do
+      inspect_source(cop,
+                     ['unless //',
+                      'end'])
+    end.not_to raise_error
+  end
 end

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

@@ -24,6 +24,37 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
     expect(cop.offences.size).to eq(9)
   end
 
+  it 'auto-corrects parentheses around condition' do
+    corrected = autocorrect_source(cop, ['if (x > 10)',
+                                         'elsif (x < 3)',
+                                         'end',
+                                         'unless (x > 10)',
+                                         'end',
+                                         'while (x > 10)',
+                                         'end',
+                                         'until (x > 10)',
+                                         'end',
+                                         'x += 1 if (x < 10)',
+                                         'x += 1 unless (x < 10)',
+                                         'x += 1 while (x < 10)',
+                                         'x += 1 until (x < 10)',
+                                        ])
+    expect(corrected).to eq ['if x > 10',
+                             'elsif x < 3',
+                             'end',
+                             'unless x > 10',
+                             'end',
+                             'while x > 10',
+                             'end',
+                             'until x > 10',
+                             'end',
+                             'x += 1 if x < 10',
+                             'x += 1 unless x < 10',
+                             'x += 1 while x < 10',
+                             'x += 1 until x < 10',
+                            ].join("\n")
+  end
+
   it 'accepts condition without parentheses' do
     inspect_source(cop, ['if x > 10',
                          'end',
@@ -41,7 +72,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
     expect(cop.offences).to be_empty
   end
 
-  it 'is not confused by leading brace in subexpression' do
+  it 'is not confused by leading parenthesis in subexpression' do
     inspect_source(cop, ['(a > b) && other ? one : two'])
     expect(cop.offences).to be_empty
   end
@@ -53,7 +84,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
   end
 
   context 'safe assignment is allowed' do
-    it 'accepts = in condition surrounded with braces' do
+    it 'accepts = in condition surrounded with parentheses' do
       inspect_source(cop,
                      ['if (test = 10)',
                       'end'
@@ -66,7 +97,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
   context 'safe assignment is not allowed' do
     let(:cop_config) { { 'AllowSafeAssignment' => false } }
 
-    it 'does not accepts = in condition surrounded with braces' do
+    it 'does not accept = in condition surrounded with parentheses' do
       inspect_source(cop,
                      ['if (test = 10)',
                       'end'

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::PredicateName, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) { { 'NamePrefixBlacklist' => %w(has_ is_) } }
+
+  %w(has_ is_).each do |prefix|
+    it 'registers an offence for blacklisted method_name' do
+      inspect_source(cop, ["def #{prefix}_attr",
+                           '  # ...',
+                           'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.highlights).to eq(["#{prefix}_attr"])
+    end
+  end
+
+  it 'accepts non-blacklisted method name' do
+    inspect_source(cop, ['def have_attr',
+                         '  # ...',
+                         'end'])
+    expect(cop.offences).to be_empty
+  end
+end

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

@@ -107,6 +107,15 @@ describe Rubocop::Cop::Style::RedundantSelf do
     expect(cop.offences).to be_empty
   end
 
+  it 'accepts a self receiver used to distinguish from argument' do
+    src = ['def requested_specs(final = true)',
+           '  something if self.final != final',
+           'end',
+          ]
+    inspect_source(cop, src)
+    expect(cop.offences).to be_empty
+  end
+
   it 'accepts a self receiver used to distinguish from local variable' do
     src = ['def requested_specs',
            '  @requested_specs ||= begin',
@@ -120,6 +129,12 @@ describe Rubocop::Cop::Style::RedundantSelf do
     expect(cop.offences).to be_empty
   end
 
+  it 'accepts a self receiver used to distinguish from constant' do
+    src = ['self.Foo']
+    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')

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

@@ -52,6 +52,11 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         expect(cop.offences).to be_empty
       end
     end
+
+    it 'ignores slashes do not belong regexp' do
+      inspect_source(cop, ['x =~ /\s{#{x[/\s+/].length}}/'])
+      expect(cop.offences).to be_empty
+    end
   end
 
   context 'when a regexp uses %r delimiters' do

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

@@ -1,4 +1,4 @@
- # encoding: utf-8
+# encoding: utf-8
 
 require 'spec_helper'
 
@@ -82,19 +82,19 @@ describe Rubocop::Cop::Style::Semicolon, :config do
     expect(cop.offences).to be_empty
   end
 
-   context 'when AllowAsExpressionSeparator is true' do
-     let(:cop_config) { { 'AllowAsExpressionSeparator' => true } }
-
-     it 'accepts several expressions' do
-       inspect_source(cop,
-                      ['puts "this is a test"; puts "So is this"'])
-       expect(cop.offences).to be_empty
-     end
-
-     it 'accepts one line method with two statements' do
-       inspect_source(cop,
-                      ['def foo(a) x(1); y(2); z(3); end'])
-       expect(cop.offences).to be_empty
-     end
-   end
+  context 'when AllowAsExpressionSeparator is true' do
+    let(:cop_config) { { 'AllowAsExpressionSeparator' => true } }
+
+    it 'accepts several expressions' do
+      inspect_source(cop,
+                     ['puts "this is a test"; puts "So is this"'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts one line method with two statements' do
+      inspect_source(cop,
+                     ['def foo(a) x(1); y(2); z(3); end'])
+      expect(cop.offences).to be_empty
+    end
+  end
 end

data/spec/rubocop/cop/style/{reduce_arguments_spec.rb → single_line_block_params_spec.rb}

@@ -2,8 +2,14 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::ReduceArguments do
-  subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) do
+    { 'Methods' =>
+      [{ 'reduce' => %w(a e) },
+       { 'test' => %w(x y) }]
+    }
+  end
 
   it 'find wrong argument names in calls with different syntax' do
     inspect_source(cop,
@@ -14,9 +20,10 @@ describe Rubocop::Cop::Style::ReduceArguments do
                     '  [0, 1].reduce(5){ |c, d| c + d }',
                     '  [0, 1].reduce (5) { |c, d| c + d }',
                     '  [0, 1].reduce(5) { |c, d| c + d }',
+                    '  ala.test { |x, z| bala }',
                     'end'])
-    expect(cop.offences.size).to eq(6)
-    expect(cop.offences.map(&:line).sort).to eq((2..7).to_a)
+    expect(cop.offences.size).to eq(7)
+    expect(cop.offences.map(&:line).sort).to eq((2..8).to_a)
   end
 
   it 'allows calls with proper argument names' do
@@ -28,6 +35,7 @@ describe Rubocop::Cop::Style::ReduceArguments do
                     '  [0, 1].reduce(5){ |a, e| a + e }',
                     '  [0, 1].reduce (5) { |a, e| a + e }',
                     '  [0, 1].reduce(5) { |a, e| a + e }',
+                    '  ala.test { |x, y| bala }',
                     'end'])
     expect(cop.offences).to be_empty
   end

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

@@ -2,11 +2,18 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
+describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
+  SUPPORTED_STYLES = %w(space_inside_braces no_space_inside_braces)
+
   subject(:cop) { described_class.new(config) }
+  let(:config) do
+    Rubocop::Config.new('Blocks' => { 'Enabled' => false },
+                        'SpaceAroundBlockBraces' => cop_config)
+  end
   let(:cop_config) do
     {
       'EnforcedStyle' => 'space_inside_braces',
+      'SupportedStyles' => SUPPORTED_STYLES,
       'SpaceBeforeBlockParameters' => true
     }
   end
@@ -19,15 +26,32 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
       expect(cop.messages).to be_empty
     end
 
+    it 'accepts empty braces with line break inside' do
+      inspect_source(cop, ['  each {',
+                           '  }'])
+      expect(cop.messages).to be_empty
+    end
+
     it 'registers an offence for empty braces with space inside' do
       inspect_source(cop, ['each { }'])
       expect(cop.messages).to eq(['Space inside empty braces detected.'])
+      expect(cop.highlights).to eq([' '])
     end
 
     it 'auto-corrects unwanted space' do
       new_source = autocorrect_source(cop, 'each { }')
       expect(new_source).to eq('each {}')
     end
+
+    it 'does not auto-correct when braces are not empty' do
+      old_source = <<-END
+        a {
+          b
+        }
+      END
+      new_source = autocorrect_source(cop, old_source)
+      expect(new_source).to eq(old_source)
+    end
   end
 
   context 'with space inside empty braces allowed' do
@@ -41,6 +65,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
     it 'registers an offence for empty braces with no space inside' do
       inspect_source(cop, ['each {}'])
       expect(cop.messages).to eq(['Space missing inside empty braces.'])
+      expect(cop.highlights).to eq(['{}'])
     end
 
     it 'auto-corrects missing space' do
@@ -64,7 +89,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
   it 'registers an offence for left brace without inner space' do
     inspect_source(cop, ['each {puts }'])
     expect(cop.messages).to eq(['Space missing inside {.'])
-    expect(cop.highlights).to eq(['{'])
+    expect(cop.highlights).to eq(['p'])
   end
 
   it 'registers an offence for right brace without inner space' do
@@ -74,7 +99,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
   end
 
   it 'auto-corrects missing space' do
-    new_source = autocorrect_source(cop, 'each { puts}')
+    new_source = autocorrect_source(cop, 'each {puts}')
     expect(new_source).to eq('each { puts }')
   end
 
@@ -88,7 +113,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
     it 'registers an offence for left brace without inner space' do
       inspect_source(cop, ['each {|x| puts }'])
       expect(cop.messages).to eq(['Space between { and | missing.'])
-      expect(cop.highlights).to eq(['{'])
+      expect(cop.highlights).to eq(['{|'])
     end
 
     it 'auto-corrects missing space' do
@@ -96,10 +121,33 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
       expect(new_source).to eq('each { |x| puts }')
     end
 
+    context 'and Blocks cop enabled' do
+      let(:config) do
+        Rubocop::Config.new('Blocks'                 => { 'Enabled' => true },
+                            'SpaceAroundBlockBraces' => cop_config)
+      end
+
+      it 'does auto-correction for single-line blocks' do
+        new_source = autocorrect_source(cop, 'each{|x| puts}')
+        expect(new_source).to eq('each { |x| puts }')
+      end
+
+      it 'does not do auto-correction for multi-line blocks' do
+        # {} will be changed to do..end by the Blocks cop, and then this cop is
+        # not relevant anymore.
+        old_source = ['each{|x|',
+                      '  puts',
+                      '}']
+        new_source = autocorrect_source(cop, old_source)
+        expect(new_source).to eq(old_source.join("\n"))
+      end
+    end
+
     context 'and space before block parameters not allowed' do
       let(:cop_config) do
         {
-          'EnforcedStyle' => 'space_inside_braces',
+          'EnforcedStyle'              => 'space_inside_braces',
+          'SupportedStyles'            => SUPPORTED_STYLES,
           'SpaceBeforeBlockParameters' => false
         }
       end
@@ -126,7 +174,8 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
   context 'configured with no_space_inside_braces' do
     let(:cop_config) do
       {
-        'EnforcedStyle' => 'no_space_inside_braces',
+        'EnforcedStyle'              => 'no_space_inside_braces',
+        'SupportedStyles'            => SUPPORTED_STYLES,
         'SpaceBeforeBlockParameters' => true
       }
     end
@@ -171,7 +220,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
         it 'registers an offence for left brace without inner space' do
           inspect_source(cop, ['each {|x| puts}'])
           expect(cop.messages).to eq(['Space between { and | missing.'])
-          expect(cop.highlights).to eq(['{'])
+          expect(cop.highlights).to eq(['{|'])
         end
 
         it 'auto-corrects missing space' do
@@ -183,7 +232,8 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
       context 'and space before block parameters not allowed' do
         let(:cop_config) do
           {
-            'EnforcedStyle' => 'no_space_inside_braces',
+            'EnforcedStyle'              => 'no_space_inside_braces',
+            'SupportedStyles'            => SUPPORTED_STYLES,
             'SpaceBeforeBlockParameters' => false
           }
         end