rubocop 0.19.1 → 0.20.0

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

@@ -9,7 +9,7 @@ describe Rubocop::Cop::Style::Lambda do
     inspect_source(cop, ['f = lambda { |x| x }'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Use the new lambda literal syntax ->(params) {...}.'])
+      .to eq(['Use the new lambda literal syntax `->(params) {...}`.'])
   end
 
   it 'accepts the new lambda literal with single-line body' do
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Style::Lambda do
                          'end'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Use the lambda method for multi-line lambdas.'])
+      .to eq(['Use the `lambda` method for multi-line lambdas.'])
   end
 
   it 'accepts the old lambda syntax with multi-line body' do

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

@@ -12,6 +12,13 @@ describe Rubocop::Cop::Style::LineEndConcatenation do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'registers an offense for string concat with << at line end' do
+    inspect_source(cop,
+                   ['top = "test" <<',
+                    '"top"'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'registers an offense for dynamic string concat at line end' do
     inspect_source(cop,
                    ['top = "test#{x}" +',
@@ -19,6 +26,13 @@ describe Rubocop::Cop::Style::LineEndConcatenation do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'registers an offense for dynamic string concat with << at line end' do
+    inspect_source(cop,
+                   ['top = "test#{x}" <<',
+                    '"top"'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'accepts string concat on the same line' do
     inspect_source(cop,
                    ['top = "test" + "top"'])
@@ -32,6 +46,13 @@ describe Rubocop::Cop::Style::LineEndConcatenation do
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts string concat at line end when % literals are involved' do
+    inspect_source(cop,
+                   ['top = %(test) +',
+                    '"top"'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'autocorrects by replacing + with \\' do
     corrected = autocorrect_source(cop,
                                    ['top = "test" +',

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

@@ -72,7 +72,7 @@ describe Rubocop::Cop::Style::MultilineIfThen do
     inspect_source(cop, ['unless cond then',
                          'end'])
     expect(cop.messages).to eq(
-      ['Never use then for multi-line unless.'])
+      ['Never use `then` for multi-line `unless`.'])
   end
 
   it 'accepts multiline unless without then' do

data/spec/rubocop/cop/style/{favor_unless_over_negated_if_spec.rb → negated_if_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::FavorUnlessOverNegatedIf do
+describe Rubocop::Cop::Style::NegatedIf do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for if with exclamation point condition' do
@@ -13,7 +13,7 @@ describe Rubocop::Cop::Style::FavorUnlessOverNegatedIf do
                     'some_method if !a_condition'
                    ])
     expect(cop.messages).to eq(
-      ['Favor unless (or control flow or) over if for negative ' \
+      ['Favor `unless` over `if` for negative ' \
        'conditions.'] * 2)
   end
 
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Style::FavorUnlessOverNegatedIf do
                     'end',
                     'some_method if not a_condition'])
     expect(cop.messages).to eq(
-      ['Favor unless (or control flow or) over if for negative ' \
+      ['Favor `unless` over `if` for negative ' \
        'conditions.'] * 2)
     expect(cop.offenses.map(&:line)).to eq([1, 4])
   end
@@ -73,4 +73,9 @@ describe Rubocop::Cop::Style::FavorUnlessOverNegatedIf do
     inspect_source(cop, 'a ? b : c')
     expect(cop.offenses).to be_empty
   end
+
+  it 'autocorrects by replacing if not with unless' do
+    corrected = autocorrect_source(cop, 'something if !x.even?')
+    expect(corrected).to eq 'something unless x.even?'
+  end
 end

data/spec/rubocop/cop/style/{favor_until_over_negated_while_spec.rb → negated_while_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::FavorUntilOverNegatedWhile do
+describe Rubocop::Cop::Style::NegatedWhile do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for while with exclamation point condition' do
@@ -13,7 +13,7 @@ describe Rubocop::Cop::Style::FavorUntilOverNegatedWhile do
                     'some_method while !a_condition'
                    ])
     expect(cop.messages).to eq(
-      ['Favor until over while for negative conditions.'] * 2)
+      ['Favor `until` over `while` for negative conditions.'] * 2)
   end
 
   it 'registers an offense for while with "not" condition' do
@@ -23,7 +23,7 @@ describe Rubocop::Cop::Style::FavorUntilOverNegatedWhile do
                     'end',
                     'some_method while not a_condition'])
     expect(cop.messages).to eq(
-      ['Favor until over while for negative conditions.'] * 2)
+      ['Favor `until` over `while` for negative conditions.'] * 2)
     expect(cop.offenses.map(&:line)).to eq([1, 4])
   end
 
@@ -38,4 +38,9 @@ describe Rubocop::Cop::Style::FavorUntilOverNegatedWhile do
                     'some_method while not a_condition or other_cond'])
     expect(cop.messages).to be_empty
   end
+
+  it 'autocorrects by replacing while not with until' do
+    corrected = autocorrect_source(cop, 'something while !x.even?')
+    expect(corrected).to eq 'something until x.even?'
+  end
 end

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

@@ -6,25 +6,19 @@ describe Rubocop::Cop::Style::NilComparison do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for == nil' do
-    inspect_source(cop,
-                   ['x == nil'])
+    inspect_source(cop, 'x == nil')
     expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['=='])
   end
 
   it 'registers an offense for === nil' do
-    inspect_source(cop,
-                   ['x === nil'])
+    inspect_source(cop, 'x === nil')
     expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['==='])
   end
 
-  it 'registers an offense for === nil' do
-    inspect_source(cop,
-                   ['x != nil'])
-    expect(cop.offenses.size).to eq(1)
-  end
-
-  it 'works with lambda.()' do
-    inspect_source(cop, ['a.(x) == nil'])
-    expect(cop.offenses.size).to eq(1)
+  it 'autocorrects by replacing == nil with .nil?' do
+    corrected = autocorrect_source(cop, 'x == nil')
+    expect(corrected).to eq 'x.nil?'
   end
 end

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

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::NonNilCheck do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for != nil' do
+    inspect_source(cop, 'x != nil')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['!='])
+  end
+
+  it 'registers an offense for !x.nil?' do
+    inspect_source(cop, '!x.nil?')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['!x.nil?'])
+  end
+
+  it 'registers an offense for not x.nil?' do
+    inspect_source(cop, 'not x.nil?')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['not x.nil?'])
+  end
+
+  it 'autocorrects by removing != nil' do
+    corrected = autocorrect_source(cop, 'x != nil')
+    expect(corrected).to eq 'x'
+  end
+
+  it 'autocorrects by removing non-nil (!x.nil?) check' do
+    corrected = autocorrect_source(cop, '!x.nil?')
+    expect(corrected).to eq 'x'
+  end
+end

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

@@ -14,4 +14,15 @@ describe Rubocop::Cop::Style::Not do
     inspect_source(cop, '!test')
     expect(cop.offenses).to be_empty
   end
+
+  it 'auto-corrects "not" with !' do
+    new_source = autocorrect_source(cop, 'x = 10 if not y')
+    expect(new_source).to eq('x = 10 if !y')
+  end
+
+  it 'leaves "not" as is if auto-correction changes the meaning' do
+    src = 'not x < y'
+    new_source = autocorrect_source(cop, src)
+    expect(new_source).to eq(src)
+  end
 end

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

@@ -13,8 +13,6 @@ describe Rubocop::Cop::Style::NumericLiterals, :config do
   end
 
   it 'registers an offense for a float with a long undelimited integer part' do
-    pending 'Though the offense message implies that floats are checked, ' \
-            'currently the cop only detects integers.'
     inspect_source(cop, ['a = 123456.789'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.config_to_allow_offenses).to eq('MinDigits' => 7)

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::OpMethod do
                     'end'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['When defining the + operator, name its argument *other*.'])
+      .to eq(['When defining the `+` operator, name its argument `other`.'])
   end
 
   it 'works properly even if the argument not surrounded with braces' do
@@ -22,7 +22,7 @@ describe Rubocop::Cop::Style::OpMethod do
                     'end'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['When defining the + operator, name its argument *other*.'])
+      .to eq(['When defining the `+` operator, name its argument `other`.'])
   end
 
   it 'does not register an offense for arg named other' do
@@ -33,6 +33,14 @@ describe Rubocop::Cop::Style::OpMethod do
     expect(cop.offenses).to be_empty
   end
 
+  it 'does not register an offense for arg named _other' do
+    inspect_source(cop,
+                   ['def <=>(_other)',
+                    '  0',
+                    'end'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'does not register an offense for []' do
     inspect_source(cop,
                    ['def [](index)',

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

@@ -23,9 +23,9 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                         ])
     expect(cop.offenses.size).to eq(9)
     expect(cop.messages.first)
-      .to eq("Don't use parentheses around the condition of an if.")
+      .to eq("Don't use parentheses around the condition of an `if`.")
     expect(cop.messages.last)
-      .to eq("Don't use parentheses around the condition of a while.")
+      .to eq("Don't use parentheses around the condition of a `while`.")
   end
 
   it 'accepts parentheses if there is no space between the keyword and (.' do

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

@@ -6,12 +6,13 @@ 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|
+  %w(has is).each do |prefix|
     it 'registers an offense for blacklisted method_name' do
       inspect_source(cop, ["def #{prefix}_attr",
                            '  # ...',
                            'end'])
       expect(cop.offenses.size).to eq(1)
+      expect(cop.messages).to eq(["Rename `#{prefix}_attr` to `attr?`."])
       expect(cop.highlights).to eq(["#{prefix}_attr"])
     end
   end

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

@@ -21,6 +21,8 @@ describe Rubocop::Cop::Style::RaiseArgs, :config do
                            '  raise Ex.new(msg)',
                            'end'])
       expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Provide an exception object as an argument to `raise`.'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
@@ -46,6 +48,9 @@ describe Rubocop::Cop::Style::RaiseArgs, :config do
     it 'reports an offense for a raise with exception object' do
       inspect_source(cop, ['raise Ex.new(msg)'])
       expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Provide an exception class and message ' \
+                'as arguments to `raise`.'])
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'compact')
     end
 

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

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::RescueModifier do
                    ['method rescue handle'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Avoid using rescue in its modifier form.'])
+      .to eq(['Avoid using `rescue` in its modifier form.'])
   end
 
   it 'handles more complex expression with modifier rescue' do
@@ -18,7 +18,7 @@ describe Rubocop::Cop::Style::RescueModifier do
                    ['method1 or method2 rescue handle'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Avoid using rescue in its modifier form.'])
+      .to eq(['Avoid using `rescue` in its modifier form.'])
   end
 
   it 'handles modifier rescue in normal rescue' do

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

@@ -11,7 +11,7 @@ describe Rubocop::Cop::Style::SelfAssignment do
                      ["#{var} = #{var} #{op} y"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use self-assignment shorthand #{op}=."])
+        .to eq(["Use self-assignment shorthand `#{op}=`."])
     end
 
     it "accepts shorthand assignment for #{op} and #{var}" do
@@ -19,7 +19,7 @@ describe Rubocop::Cop::Style::SelfAssignment do
                      ["#{var} = #{var} #{op} y"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use self-assignment shorthand #{op}=."])
+        .to eq(["Use self-assignment shorthand `#{op}=`."])
     end
   end
 
@@ -29,7 +29,7 @@ describe Rubocop::Cop::Style::SelfAssignment do
                      ["#{var} = #{var} #{op} y"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use self-assignment shorthand #{op}=."])
+        .to eq(["Use self-assignment shorthand `#{op}=`."])
     end
 
     it "accepts shorthand assignment for #{op} and #{var}" do
@@ -37,7 +37,7 @@ describe Rubocop::Cop::Style::SelfAssignment do
                      ["#{var} = #{var} #{op} y"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use self-assignment shorthand #{op}=."])
+        .to eq(["Use self-assignment shorthand `#{op}=`."])
     end
   end
 end

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

@@ -54,6 +54,18 @@ describe Rubocop::Cop::Style::SignalException, :config do
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts raise in def with multiple rescues' do
+      inspect_source(cop,
+                     ['def test',
+                      '  fail',
+                      'rescue StandardError',
+                      '  # handle error',
+                      'rescue Exception',
+                      '  raise',
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'registers an offense for fail in def rescue section' do
       inspect_source(cop,
                      ['def test',
@@ -66,6 +78,18 @@ describe Rubocop::Cop::Style::SignalException, :config do
         .to eq(['Use `raise` instead of `fail` to rethrow exceptions.'])
     end
 
+    it 'registers an offense for fail in second rescue' do
+      inspect_source(cop,
+                     ['def test',
+                      '  fail',
+                      'rescue StandardError',
+                      '  # handle error',
+                      'rescue Exception',
+                      '  fail',
+                      'end'])
+      expect(cop.offenses.size).to eq(1)
+    end
+
     it 'registers only offense for one raise that should be fail' do
       # This is a special case that has caused double reporting.
       inspect_source(cop,

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

@@ -24,6 +24,8 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                     'end'])
     expect(cop.offenses.size).to eq(7)
     expect(cop.offenses.map(&:line).sort).to eq((2..8).to_a)
+    expect(cop.messages.first)
+      .to eq('Name `reduce` block params `|a, e|`.')
   end
 
   it 'allows calls with proper argument names' do

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

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::SingleSpaceBeforeFirstArg do
+  subject(:cop) { described_class.new }
+
+  context 'for method calls without parentheses' do
+    it 'registers an offense for method call with two spaces before the ' \
+       'first arg' do
+      inspect_source(cop, ['something  x',
+                           'a.something  y, z'])
+      expect(cop.messages)
+        .to eq(['Put one space between the method name and the first ' \
+                'argument.'] * 2)
+      expect(cop.highlights).to eq(['  ', '  '])
+    end
+
+    it 'auto-corrects extra space' do
+      new_source = autocorrect_source(cop, ['something  x',
+                                            'a.something   y, z'])
+      expect(new_source).to eq(['something x',
+                                'a.something y, z'].join("\n"))
+    end
+
+    it 'accepts a method call with one space before the first arg' do
+      inspect_source(cop, ['something x',
+                           'a.something y, z'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts + operator' do
+      inspect_source(cop, ['something +',
+                           '  x'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts setter call' do
+      inspect_source(cop, ['something.x =',
+                           '  y'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts multiple space containing line break' do
+      inspect_source(cop, ['something \\',
+                           '  x'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'for method calls with parentheses' do
+    it 'accepts a method call without space' do
+      inspect_source(cop, ['something(x)',
+                           'a.something(y, z)'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a method call with space after the left parenthesis' do
+      inspect_source(cop, ['something(  x  )'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+end