rubocop 0.28.0 → 0.29.0

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

@@ -11,24 +11,24 @@ describe RuboCop::Cop::Style::GlobalVars, :config do
   let(:cop_config) { cop_config }
 
   it 'registers an offense for $custom' do
-    inspect_source(cop, ['puts $custom'])
+    inspect_source(cop, 'puts $custom')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'allows user whitelisted variables' do
-    inspect_source(cop, ['puts $allowed'])
+    inspect_source(cop, 'puts $allowed')
     expect(cop.offenses).to be_empty
   end
 
   described_class::BUILT_IN_VARS.each do |var|
     it "does not register an offense for built-in variable #{var}" do
-      inspect_source(cop, ["puts #{var}"])
+      inspect_source(cop, "puts #{var}")
       expect(cop.offenses).to be_empty
     end
   end
 
   it 'does not register an offense for backrefs like $1' do
-    inspect_source(cop, ['puts $1'])
+    inspect_source(cop, 'puts $1')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -152,4 +152,21 @@ describe RuboCop::Cop::Style::GuardClause, :config do
       expect(cop.offenses).to be_empty
     end
   end
+
+  context 'Invalid MinBodyLength' do
+    let(:cop_config) do
+      { 'MinBodyLength' => -2 }
+    end
+
+    it 'fails with an error' do
+      source = ['def func',
+                '  if something',
+                '    work',
+                '  end',
+                'end']
+
+      expect { inspect_source(cop, source) }
+        .to raise_error('MinBodyLength needs to be a positive integer!')
+    end
+  end
 end

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

@@ -17,55 +17,55 @@ describe RuboCop::Cop::Style::HashSyntax, :config do
     end
 
     it 'registers offense for hash rocket syntax when new is possible' do
-      inspect_source(cop, ['x = { :a => 0 }'])
+      inspect_source(cop, 'x = { :a => 0 }')
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
       expect(cop.config_to_allow_offenses)
         .to eq('EnforcedStyle' => 'hash_rockets')
     end
 
     it 'registers an offense for mixed syntax when new is possible' do
-      inspect_source(cop, ['x = { :a => 0, b: 1 }'])
+      inspect_source(cop, 'x = { :a => 0, b: 1 }')
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'registers an offense for hash rockets in method calls' do
-      inspect_source(cop, ['func(3, :a => 0)'])
+      inspect_source(cop, 'func(3, :a => 0)')
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
     end
 
     it 'accepts hash rockets when keys have different types' do
-      inspect_source(cop, ['x = { :a => 0, "b" => 1 }'])
+      inspect_source(cop, 'x = { :a => 0, "b" => 1 }')
       expect(cop.messages).to be_empty
     end
 
     it 'accepts hash rockets when keys have whitespaces in them' do
-      inspect_source(cop, ['x = { :"t o" => 0 }'])
+      inspect_source(cop, 'x = { :"t o" => 0 }')
       expect(cop.messages).to be_empty
     end
 
     it 'accepts hash rockets when keys have special symbols in them' do
-      inspect_source(cop, ['x = { :"\tab" => 1 }'])
+      inspect_source(cop, 'x = { :"\tab" => 1 }')
       expect(cop.messages).to be_empty
     end
 
     it 'accepts hash rockets when keys start with a digit' do
-      inspect_source(cop, ['x = { :"1" => 1 }'])
+      inspect_source(cop, 'x = { :"1" => 1 }')
       expect(cop.messages).to be_empty
     end
 
     it 'registers offense when keys start with an uppercase letter' do
-      inspect_source(cop, ['x = { :A => 0 }'])
+      inspect_source(cop, 'x = { :A => 0 }')
       expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
     end
 
     it 'accepts new syntax in a hash literal' do
-      inspect_source(cop, ['x = { a: 0, b: 1 }'])
+      inspect_source(cop, 'x = { a: 0, b: 1 }')
       expect(cop.messages).to be_empty
     end
 
     it 'accepts new syntax in method calls' do
-      inspect_source(cop, ['func(3, a: 0)'])
+      inspect_source(cop, 'func(3, a: 0)')
       expect(cop.messages).to be_empty
     end
 
@@ -103,29 +103,29 @@ describe RuboCop::Cop::Style::HashSyntax, :config do
     let(:cop_config) { { 'EnforcedStyle' => 'hash_rockets' } }
 
     it 'registers offense for Ruby 1.9 style' do
-      inspect_source(cop, ['x = { a: 0 }'])
+      inspect_source(cop, 'x = { a: 0 }')
       expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'ruby19')
     end
 
     it 'registers an offense for mixed syntax' do
-      inspect_source(cop, ['x = { :a => 0, b: 1 }'])
+      inspect_source(cop, 'x = { :a => 0, b: 1 }')
       expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'registers an offense for 1.9 style in method calls' do
-      inspect_source(cop, ['func(3, a: 0)'])
+      inspect_source(cop, 'func(3, a: 0)')
       expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
     end
 
     it 'accepts hash rockets in a hash literal' do
-      inspect_source(cop, ['x = { :a => 0, :b => 1 }'])
+      inspect_source(cop, 'x = { :a => 0, :b => 1 }')
       expect(cop.messages).to be_empty
     end
 
     it 'accepts hash rockets in method calls' do
-      inspect_source(cop, ['func(3, :a => 0)'])
+      inspect_source(cop, 'func(3, :a => 0)')
       expect(cop.messages).to be_empty
     end
 

data/spec/rubocop/cop/{metrics → style}/if_unless_modifier_spec.rb

@@ -73,8 +73,8 @@ describe RuboCop::Cop::Style::IfUnlessModifier do
 
   it 'accepts if-else-end' do
     inspect_source(cop,
-                   ['if args.last.is_a? Hash then args.pop else ' \
-                    'Hash.new end'])
+                   'if args.last.is_a? Hash then args.pop else ' \
+                   'Hash.new end')
     expect(cop.messages).to be_empty
   end
 

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

@@ -6,13 +6,13 @@ describe RuboCop::Cop::Style::IfWithSemicolon do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for one line if/;/end' do
-    inspect_source(cop, ['if cond; run else dont end'])
+    inspect_source(cop, 'if cond; run else dont end')
     expect(cop.messages).to eq(
       ['Do not use if x; Use the ternary operator instead.'])
   end
 
   it 'accepts one line if/then/end' do
-    inspect_source(cop, ['if cond then run else dont end'])
+    inspect_source(cop, 'if cond then run else dont end')
     expect(cop.messages).to be_empty
   end
 

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

@@ -106,14 +106,12 @@ describe RuboCop::Cop::Style::IndentArray do
   end
 
   it 'accepts single line array' do
-    inspect_source(cop,
-                   ['a = [1, 2]'])
+    inspect_source(cop, 'a = [1, 2]')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts an empty array' do
-    inspect_source(cop,
-                   ['a = []'])
+    inspect_source(cop, 'a = []')
     expect(cop.offenses).to be_empty
   end
 
@@ -150,8 +148,7 @@ describe RuboCop::Cop::Style::IndentArray do
 
     context 'and arguments are not surrounded by parentheses' do
       it 'accepts single line array' do
-        inspect_source(cop,
-                       ['func x, [1, 2]'])
+        inspect_source(cop, 'func x, [1, 2]')
         expect(cop.offenses).to be_empty
       end
 

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

@@ -202,13 +202,13 @@ describe RuboCop::Cop::Style::IndentHash do
 
     it 'accepts single line hash' do
       inspect_source(cop,
-                     ['a = { a: 1, b: 2 }'])
+                     'a = { a: 1, b: 2 }')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts an empty hash' do
       inspect_source(cop,
-                     ['a = {}'])
+                     'a = {}')
       expect(cop.offenses).to be_empty
     end
   end
@@ -334,13 +334,13 @@ describe RuboCop::Cop::Style::IndentHash do
     context 'and argument are not surrounded by parentheses' do
       it 'accepts braceless hash' do
         inspect_source(cop,
-                       ['func a: 1, b: 2'])
+                       'func a: 1, b: 2')
         expect(cop.offenses).to be_empty
       end
 
       it 'accepts single line hash with braces' do
         inspect_source(cop,
-                       ['func x, { a: 1, b: 2 }'])
+                       'func x, { a: 1, b: 2 }')
         expect(cop.offenses).to be_empty
       end
 

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

@@ -60,8 +60,7 @@ describe RuboCop::Cop::Style::IndentationConsistency do
     end
 
     it 'accepts a one line if statement' do
-      inspect_source(cop,
-                     ['if cond then func1 else func2 end'])
+      inspect_source(cop, 'if cond then func1 else func2 end')
       expect(cop.offenses).to be_empty
     end
 

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

@@ -235,8 +235,7 @@ describe RuboCop::Cop::Style::IndentationWidth do
       end
 
       it 'accepts a one line if statement' do
-        inspect_source(cop,
-                       ['if cond then func1 else func2 end'])
+        inspect_source(cop, 'if cond then func1 else func2 end')
         expect(cop.offenses).to be_empty
       end
 

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

@@ -29,7 +29,7 @@ describe RuboCop::Cop::Style::InfiniteLoop do
 
   it 'accepts Kernel#loop' do
     inspect_source(cop,
-                   ['loop { break if something }'])
+                   'loop { break if something }')
 
     expect(cop.offenses).to be_empty
   end

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

@@ -10,7 +10,7 @@ describe RuboCop::Cop::Style::LambdaCall, :config do
 
     it 'registers an offense for x.()' do
       inspect_source(cop,
-                     ['x.(a, b)'])
+                     'x.(a, b)')
       expect(cop.offenses.size).to eq(1)
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'braces')
     end
@@ -24,7 +24,7 @@ describe RuboCop::Cop::Style::LambdaCall, :config do
     end
 
     it 'accepts x.call()' do
-      inspect_source(cop, ['x.call(a, b)'])
+      inspect_source(cop, 'x.call(a, b)')
       expect(cop.offenses).to be_empty
     end
 
@@ -39,7 +39,7 @@ describe RuboCop::Cop::Style::LambdaCall, :config do
 
     it 'registers an offense for x.call()' do
       inspect_source(cop,
-                     ['x.call(a, b)'])
+                     'x.call(a, b)')
       expect(cop.offenses.size).to eq(1)
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'call')
     end
@@ -53,7 +53,7 @@ describe RuboCop::Cop::Style::LambdaCall, :config do
     end
 
     it 'accepts x.()' do
-      inspect_source(cop, ['x.(a, b)'])
+      inspect_source(cop, 'x.(a, b)')
       expect(cop.offenses).to be_empty
     end
 

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

@@ -6,12 +6,19 @@ describe RuboCop::Cop::Style::Lambda do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for an old single-line lambda call' do
-    inspect_source(cop, ['f = lambda { |x| x }'])
+    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) {...}`.'])
   end
 
+  it 'registers an offense for an old single-line no-argument lambda call' do
+    inspect_source(cop, 'f = lambda { x }')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use the new lambda literal syntax `-> {...}`.'])
+  end
+
   it 'accepts the new lambda literal with single-line body' do
     inspect_source(cop, ['lambda = ->(x) { x }',
                          'lambda.(1)'])
@@ -35,7 +42,35 @@ describe RuboCop::Cop::Style::Lambda do
   end
 
   it 'accepts the lambda call outside of block' do
-    inspect_source(cop, ['l = lambda.test'])
+    inspect_source(cop, 'l = lambda.test')
     expect(cop.offenses).to be_empty
   end
+
+  it 'auto-corrects an old single-line lambda call' do
+    new_source = autocorrect_source(cop, 'f = lambda { |x| x }')
+    expect(new_source).to eq('f = ->(x) { x }')
+  end
+
+  it 'auto-corrects an old single-line no-argument lambda call' do
+    new_source = autocorrect_source(cop, 'f = lambda { x }')
+    expect(new_source).to eq('f = -> { x }')
+  end
+
+  it 'auto-corrects a new multi-line lambda call' do
+    new_source = autocorrect_source(cop, ['f = ->(x) do',
+                                          '  x',
+                                          'end'])
+    expect(new_source).to eq(['f = lambda do |x|',
+                              '  x',
+                              'end'].join("\n"))
+  end
+
+  it 'auto-corrects a new multi-line no-argument lambda call' do
+    new_source = autocorrect_source(cop, ['f = -> do',
+                                          '  x',
+                                          'end'])
+    expect(new_source).to eq(['f = lambda do',
+                              '  x',
+                              'end'].join("\n"))
+  end
 end

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

@@ -6,32 +6,27 @@ describe RuboCop::Cop::Style::LeadingCommentSpace do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for comment without leading space' do
-    inspect_source(cop,
-                   ['#missing space'])
+    inspect_source(cop, '#missing space')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not register an offense for # followed by no text' do
-    inspect_source(cop,
-                   ['#'])
+    inspect_source(cop, '#')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for more than one space' do
-    inspect_source(cop,
-                   ['#   heavily indented'])
+    inspect_source(cop, '#   heavily indented')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for more than one #' do
-    inspect_source(cop,
-                   ['###### heavily indented'])
+    inspect_source(cop, '###### heavily indented')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for only #s' do
-    inspect_source(cop,
-                   ['######'])
+    inspect_source(cop, '######')
     expect(cop.offenses).to be_empty
   end
 
@@ -43,8 +38,8 @@ describe RuboCop::Cop::Style::LeadingCommentSpace do
   end
 
   it 'registers an offense for #! after the first line' do
-    inspect_source(cop,
-                   ['test', '#!/usr/bin/ruby'])
+    inspect_source(cop, ['test',
+                         '#!/usr/bin/ruby'])
     expect(cop.offenses.size).to eq(1)
   end
 

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

@@ -10,6 +10,7 @@ describe RuboCop::Cop::Style::LineEndConcatenation do
                    ['top = "test" +',
                     '"top"'])
     expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['+'])
   end
 
   it 'registers an offense for string concat with << at line end' do
@@ -17,6 +18,7 @@ describe RuboCop::Cop::Style::LineEndConcatenation do
                    ['top = "test" <<',
                     '"top"'])
     expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['<<'])
   end
 
   it 'registers an offense for string concat with << and \ at line ends' do
@@ -69,7 +71,37 @@ describe RuboCop::Cop::Style::LineEndConcatenation do
 
   it 'accepts string concat on the same line' do
     inspect_source(cop,
-                   ['top = "test" + "top"'])
+                   'top = "test" + "top"')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts string concat with a return value of method on a string' do
+    inspect_source(cop,
+                   [
+                     # What we want here is 'content   ', not '
+                     # content content content '.
+                     'content_and_three_spaces = "content" +',
+                     '  " " * 3',
+                     # Method call with dot on a string literal.
+                     "a_thing = 'a ' +",
+                     "  'gniht'.reverse",
+                     # Formatting operator.
+                     "output = 'value: ' +",
+                     "  '%d' % value",
+                     # Index operator.
+                     "'letter: ' +",
+                     "  'abcdefghij'[ix]"
+                   ])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts string concat with a return value of method on an interpolated ' \
+     'string' do
+    source = <<-END
+      x3a = 'x' +
+        "\#{'a' + "\#{3}"}".reverse
+    END
+    inspect_source(cop, source)
     expect(cop.offenses).to be_empty
   end
 
@@ -80,6 +112,14 @@ describe RuboCop::Cop::Style::LineEndConcatenation do
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts string concat at line end when followed by a comment line' do
+    inspect_source(cop,
+                   ['top = "test" +',
+                    '# something',
+                    '"top"'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'accepts string concat at line end when % literals are involved' do
     inspect_source(cop,
                    ['top = %(test) +',