rubocop 0.28.0 → 0.29.0

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

@@ -11,7 +11,7 @@ describe RuboCop::Cop::Style::RegexpLiteral, :config do
     let(:cop_config) { { 'MaxSlashes' => -1 } }
 
     it 'fails' do
-      expect { inspect_source(cop, ['x =~ /home/']) }
+      expect { inspect_source(cop, 'x =~ /home/') }
         .to raise_error(RuntimeError)
     end
   end
@@ -20,26 +20,26 @@ describe RuboCop::Cop::Style::RegexpLiteral, :config do
     let(:cop_config) { { 'MaxSlashes' => 0 } }
 
     it 'registers an offense for one slash in // regexp' do
-      inspect_source(cop, ['x =~ /home\//'])
+      inspect_source(cop, 'x =~ /home\//')
       expect(cop.messages)
         .to eq(['Use %r for regular expressions matching more ' \
                 "than 0 '/' characters."])
     end
 
     it 'accepts zero slashes in // regexp' do
-      inspect_source(cop, ['z =~ /a/'])
+      inspect_source(cop, 'z =~ /a/')
       expect(cop.offenses).to be_empty
     end
 
     it 'registers an offense for zero slashes in %r regexp' do
-      inspect_source(cop, ['y =~ %r(etc)'])
+      inspect_source(cop, 'y =~ %r(etc)')
       expect(cop.messages)
         .to eq(['Use %r only for regular expressions matching more ' \
                 "than 0 '/' characters."])
     end
 
     it 'accepts %r regexp with one slash' do
-      inspect_source(cop, ['x =~ %r(/home)'])
+      inspect_source(cop, 'x =~ %r(/home)')
       expect(cop.offenses).to be_empty
     end
 
@@ -47,17 +47,17 @@ describe RuboCop::Cop::Style::RegexpLiteral, :config do
       subject(:cop) { described_class.new(config, auto_gen_config: true) }
 
       it 'sets MaxSlashes: 1 for one slash in // regexp' do
-        inspect_source(cop, ['x =~ /home\//'])
+        inspect_source(cop, 'x =~ /home\//')
         expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => 1)
       end
 
       it 'disables the cop for zero slashes in %r regexp' do
-        inspect_source(cop, ['y =~ %r(etc)'])
+        inspect_source(cop, 'y =~ %r(etc)')
         expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
       end
 
       it 'generates nothing if there are no offenses' do
-        inspect_source(cop, ['x =~ %r(/home)'])
+        inspect_source(cop, 'x =~ %r(/home)')
         expect(cop.config_to_allow_offenses).to eq(nil)
       end
     end
@@ -100,7 +100,7 @@ describe RuboCop::Cop::Style::RegexpLiteral, :config do
     end
 
     it 'ignores slashes do not belong // regexp' do
-      inspect_source(cop, ['x =~ /\s{#{x[/\s+/].length}}/'])
+      inspect_source(cop, 'x =~ /\s{#{x[/\s+/].length}}/')
       expect(cop.offenses).to be_empty
     end
 

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

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Style::RescueModifier do
 
   it 'registers an offense for modifier rescue' do
     inspect_source(cop,
-                   ['method rescue handle'])
+                   'method rescue handle')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid using `rescue` in its modifier form.'])
@@ -15,7 +15,7 @@ describe RuboCop::Cop::Style::RescueModifier do
 
   it 'handles more complex expression with modifier rescue' do
     inspect_source(cop,
-                   ['method1 or method2 rescue handle'])
+                   'method1 or method2 rescue handle')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid using `rescue` in its modifier form.'])

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

@@ -8,7 +8,7 @@ describe RuboCop::Cop::Style::SelfAssignment do
   [:+, :-, :*, :**, :/, :|, :&].product(['x', '@x', '@@x']).each do |op, var|
     it "registers an offense for non-shorthand assignment #{op} and #{var}" do
       inspect_source(cop,
-                     ["#{var} = #{var} #{op} y"])
+                     "#{var} = #{var} #{op} y")
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use self-assignment shorthand `#{op}=`."])
@@ -16,17 +16,20 @@ describe RuboCop::Cop::Style::SelfAssignment do
 
     it "accepts shorthand assignment for #{op} and #{var}" do
       inspect_source(cop,
-                     ["#{var} = #{var} #{op} y"])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages)
-        .to eq(["Use self-assignment shorthand `#{op}=`."])
+                     "#{var} #{op}= y")
+      expect(cop.offenses).to be_empty
+    end
+
+    it "auto-corrects a non-shorthand assignment #{op} and #{var}" do
+      new_source = autocorrect_source(cop, "#{var} = #{var} #{op} y")
+      expect(new_source).to eq("#{var} #{op}= y")
     end
   end
 
   ['||', '&&'].product(['x', '@x', '@@x']).each do |op, var|
     it "registers an offense for non-shorthand assignment #{op} and #{var}" do
       inspect_source(cop,
-                     ["#{var} = #{var} #{op} y"])
+                     "#{var} = #{var} #{op} y")
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use self-assignment shorthand `#{op}=`."])
@@ -34,10 +37,13 @@ describe RuboCop::Cop::Style::SelfAssignment do
 
     it "accepts shorthand assignment for #{op} and #{var}" do
       inspect_source(cop,
-                     ["#{var} = #{var} #{op} y"])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages)
-        .to eq(["Use self-assignment shorthand `#{op}=`."])
+                     "#{var} #{op}= y")
+      expect(cop.offenses).to be_empty
+    end
+
+    it "auto-corrects a non-shorthand assignment #{op} and #{var}" do
+      new_source = autocorrect_source(cop, "#{var} = #{var} #{op} y")
+      expect(new_source).to eq("#{var} #{op}= y")
     end
   end
 end

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

@@ -8,31 +8,31 @@ describe RuboCop::Cop::Style::Semicolon, :config do
 
   it 'registers an offense for a single expression' do
     inspect_source(cop,
-                   ['puts "this is a test";'])
+                   'puts "this is a test";')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for several expressions' do
     inspect_source(cop,
-                   ['puts "this is a test"; puts "So is this"'])
+                   'puts "this is a test"; puts "So is this"')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for one line method with two statements' do
     inspect_source(cop,
-                   ['def foo(a) x(1); y(2); z(3); end'])
+                   'def foo(a) x(1); y(2); z(3); end')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts semicolon before end if so configured' do
     inspect_source(cop,
-                   ['def foo(a) z(3); end'])
+                   'def foo(a) z(3); end')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts semicolon after params if so configured' do
     inspect_source(cop,
-                   ['def foo(a); z(3) end'])
+                   'def foo(a); z(3) end')
     expect(cop.offenses).to be_empty
   end
 
@@ -65,13 +65,13 @@ describe RuboCop::Cop::Style::Semicolon, :config do
 
   it 'accepts one line empty module definitions' do
     inspect_source(cop,
-                   ['module Foo; end'])
+                   'module Foo; end')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers an offense for semicolon at the end no matter what' do
     inspect_source(cop,
-                   ['module Foo; end;'])
+                   'module Foo; end;')
     expect(cop.offenses.size).to eq(1)
   end
 
@@ -101,13 +101,13 @@ describe RuboCop::Cop::Style::Semicolon, :config do
 
     it 'accepts several expressions' do
       inspect_source(cop,
-                     ['puts "this is a test"; puts "So is this"'])
+                     'puts "this is a test"; puts "So is this"')
       expect(cop.offenses).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'])
+                     'def foo(a) x(1); y(2); z(3); end')
       expect(cop.offenses).to be_empty
     end
   end

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

@@ -44,13 +44,13 @@ describe RuboCop::Cop::Style::SingleLineBlockParams, :config do
 
   it 'allows an unused parameter to have a leading underscore' do
     inspect_source(cop,
-                   ['File.foreach(filename).reduce(0) { |a, _e| a + 1 }'])
+                   'File.foreach(filename).reduce(0) { |a, _e| a + 1 }')
     expect(cop.offenses).to be_empty
   end
 
   it 'finds incorrectly named parameters with leading underscores' do
     inspect_source(cop,
-                   ['File.foreach(filename).reduce(0) { |_x, _y| }'])
+                   'File.foreach(filename).reduce(0) { |_x, _y| }')
     expect(cop.messages).to eq(['Name `reduce` block params `|a, e|`.'])
   end
 

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

@@ -56,7 +56,7 @@ describe RuboCop::Cop::Style::SingleSpaceBeforeFirstArg 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
   end

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

@@ -8,23 +8,23 @@ describe RuboCop::Cop::Style::SpaceAfterColon do
   it 'registers an offense for colon without space after it' do
     # TODO: There is double reporting of the last colon (also from
     # SpaceAroundOperators).
-    inspect_source(cop, ['x = w ? {a:3}:4'])
+    inspect_source(cop, 'x = w ? {a:3}:4')
     expect(cop.messages).to eq(['Space missing after colon.'] * 2)
     expect(cop.highlights).to eq([':'] * 2)
   end
 
   it 'accepts colons in symbols' do
-    inspect_source(cop, ['x = :a'])
+    inspect_source(cop, 'x = :a')
     expect(cop.messages).to be_empty
   end
 
   it 'accepts colon in ternary followed by space' do
-    inspect_source(cop, ['x = w ? a : b'])
+    inspect_source(cop, 'x = w ? a : b')
     expect(cop.messages).to be_empty
   end
 
   it 'accepts hash rockets' do
-    inspect_source(cop, ['x = {"a"=>1}'])
+    inspect_source(cop, 'x = {"a"=>1}')
     expect(cop.messages).to be_empty
   end
 
@@ -44,7 +44,7 @@ describe RuboCop::Cop::Style::SpaceAfterColon do
   end
 
   it 'accepts colons in strings' do
-    inspect_source(cop, ["str << ':'"])
+    inspect_source(cop, "str << ':'")
     expect(cop.messages).to be_empty
   end
 

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

@@ -6,19 +6,19 @@ describe RuboCop::Cop::Style::SpaceAfterComma do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for block argument commas without space' do
-    inspect_source(cop, ['each { |s,t| }'])
+    inspect_source(cop, 'each { |s,t| }')
     expect(cop.messages).to eq(
       ['Space missing after comma.'])
   end
 
   it 'registers an offense for array index commas without space' do
-    inspect_source(cop, ['formats[0,1]'])
+    inspect_source(cop, 'formats[0,1]')
     expect(cop.messages).to eq(
       ['Space missing after comma.'])
   end
 
   it 'registers an offense for method call arg commas without space' do
-    inspect_source(cop, ['a(1,2)'])
+    inspect_source(cop, 'a(1,2)')
     expect(cop.messages).to eq(
       ['Space missing after comma.'])
   end

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

@@ -7,23 +7,23 @@ describe RuboCop::Cop::Style::SpaceAfterControlKeyword do
 
   it 'registers an offense for normal if' do
     inspect_source(cop,
-                   ['if(test) then result end'])
+                   'if(test) then result end')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for modifier unless' do
-    inspect_source(cop, ['action unless(test)'])
+    inspect_source(cop, 'action unless(test)')
 
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not get confused by keywords' do
-    inspect_source(cop, ['[:if, :unless].action'])
+    inspect_source(cop, '[:if, :unless].action')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not get confused by the ternary operator' do
-    inspect_source(cop, ['a ? b : c'])
+    inspect_source(cop, 'a ? b : c')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -6,12 +6,12 @@ describe RuboCop::Cop::Style::SpaceAfterNot do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for space after !' do
-    inspect_source(cop, ['! something'])
+    inspect_source(cop, '! something')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts no space after !' do
-    inspect_source(cop, ['!something'])
+    inspect_source(cop, '!something')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -6,13 +6,13 @@ describe RuboCop::Cop::Style::SpaceAfterSemicolon do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for semicolon without space after it' do
-    inspect_source(cop, ['x = 1;y = 2'])
+    inspect_source(cop, 'x = 1;y = 2')
     expect(cop.messages).to eq(
       ['Space missing after semicolon.'])
   end
 
   it 'does not crash if semicolon is the last character of the file' do
-    inspect_source(cop, ['x = 1;'])
+    inspect_source(cop, 'x = 1;')
     expect(cop.messages).to be_empty
   end
 

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

@@ -0,0 +1,150 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::SpaceAroundBlockParameters, :config do
+  subject(:cop) { described_class.new(config) }
+
+  shared_examples 'common behavior' do
+    it 'accepts an empty block' do
+      inspect_source(cop, '{}.each {}')
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'when EnforcedStyleInsidePipes is no_space' do
+    let(:cop_config) { { 'EnforcedStyleInsidePipes' => 'no_space' } }
+
+    include_examples 'common behavior'
+
+    it 'accepts a block with spaces in the right places' do
+      inspect_source(cop, '{}.each { |x, y| puts x }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a block with parameters but no body' do
+      inspect_source(cop, '{}.each { |x, y| }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a block parameter without preceding space' do
+      # This is checked by Style/SpaceAfterComma.
+      inspect_source(cop, '{}.each { |x,y| puts x }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for space before first parameter' do
+      inspect_source(cop, '{}.each { | x| puts x }')
+      expect(cop.messages)
+        .to eq(['Space before first block parameter detected.'])
+      expect(cop.highlights).to eq([' '])
+    end
+
+    it 'registers an offense for space after last parameter' do
+      inspect_source(cop, '{}.each { |x, y  | puts x }')
+      expect(cop.messages).to eq(['Space after last block parameter detected.'])
+      expect(cop.highlights).to eq(['  '])
+    end
+
+    it 'registers an offense for no space after closing pipe' do
+      inspect_source(cop, '{}.each { |x, y|puts x }')
+      expect(cop.messages).to eq(['Space after closing `|` missing.'])
+      expect(cop.highlights).to eq(['|'])
+    end
+
+    it 'accepts line break after closing pipe' do
+      inspect_source(cop, ['{}.each do |x, y|',
+                           '  puts x',
+                           'end'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for multiple spaces before parameter' do
+      inspect_source(cop, '{}.each { |x,   y| puts x }')
+      expect(cop.messages)
+        .to eq(['Extra space before block parameter detected.'])
+      expect(cop.highlights).to eq(['  '])
+    end
+
+    it 'auto-corrects offenses' do
+      new_source = autocorrect_source(cop,
+                                      '{}.each { |  x=5,  (y,*z) |puts x }')
+      expect(new_source).to eq('{}.each { |x=5, (y,*z)| puts x }')
+    end
+  end
+
+  context 'when EnforcedStyleInsidePipes is space' do
+    let(:cop_config) { { 'EnforcedStyleInsidePipes' => 'space' } }
+
+    include_examples 'common behavior'
+
+    it 'accepts a block with spaces in the right places' do
+      inspect_source(cop, '{}.each { | x, y | puts x }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a block with parameters but no body' do
+      inspect_source(cop, '{}.each { | x, y | }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a block parameter without preceding space' do
+      # This is checked by Style/SpaceAfterComma.
+      inspect_source(cop, '{}.each { | x,y | puts x }')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for no space before first parameter' do
+      inspect_source(cop, '{}.each { |x | puts x }')
+      expect(cop.messages)
+        .to eq(['Space before first block parameter missing.'])
+      expect(cop.highlights).to eq(['x'])
+    end
+
+    it 'registers an offense for no space after last parameter' do
+      inspect_source(cop, '{}.each { | x, y| puts x }')
+      expect(cop.messages).to eq(['Space after last block parameter missing.'])
+      expect(cop.highlights).to eq(['y'])
+    end
+
+    it 'registers an offense for extra space before first parameter' do
+      inspect_source(cop, '{}.each { |  x | puts x }')
+      expect(cop.messages)
+        .to eq(['Extra space before first block parameter detected.'])
+      expect(cop.highlights).to eq([' '])
+    end
+
+    it 'registers an offense for no space after last parameter' do
+      inspect_source(cop, '{}.each { | x, y   | puts x }')
+      expect(cop.messages)
+        .to eq(['Extra space after last block parameter detected.'])
+      expect(cop.highlights).to eq(['  '])
+    end
+
+    it 'registers an offense for no space after closing pipe' do
+      inspect_source(cop, '{}.each { | x, y |puts x }')
+      expect(cop.messages).to eq(['Space after closing `|` missing.'])
+      expect(cop.highlights).to eq(['|'])
+    end
+
+    it 'accepts line break after closing pipe' do
+      inspect_source(cop, ['{}.each do | x, y |',
+                           '  puts x',
+                           'end'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for multiple spaces before parameter' do
+      inspect_source(cop, '{}.each { | x,   y | puts x }')
+      expect(cop.messages)
+        .to eq(['Extra space before block parameter detected.'])
+      expect(cop.highlights).to eq(['  '])
+    end
+
+    it 'auto-corrects offenses' do
+      new_source = autocorrect_source(cop,
+                                      '{}.each { |  x=5,  (y,*z)|puts x }')
+      expect(new_source).to eq('{}.each { | x=5, (y,*z) | puts x }')
+    end
+  end
+end