rubocop 0.17.0 → 0.18.0

data/spec/rubocop/cop/lint/useless_setter_call_spec.rb

@@ -55,7 +55,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     expect(cop.offences).to be_empty
   end
 
-  context 'when a lvar has an object passed as argument ' +
+  context 'when a lvar has an object passed as argument ' \
           'at the end of the method' do
     it 'accepts the lvar attr assignment' do
       inspect_source(cop,
@@ -71,7 +71,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar has an object passed as argument ' +
+  context 'when a lvar has an object passed as argument ' \
           'by multiple-assignment at the end of the method' do
     it 'accepts the lvar attr assignment' do
       inspect_source(cop,
@@ -84,7 +84,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar does not have any object passed as argument ' +
+  context 'when a lvar does not have any object passed as argument ' \
           'with multiple-assignment at the end of the method' do
     it 'registers an offence' do
       inspect_source(cop,
@@ -97,7 +97,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar possibly has an object passed as argument ' +
+  context 'when a lvar possibly has an object passed as argument ' \
           'by logical-operator-assignment at the end of the method' do
     it 'accepts the lvar attr assignment' do
       inspect_source(cop,
@@ -111,7 +111,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar does not have any object passed as argument ' +
+  context 'when a lvar does not have any object passed as argument ' \
           'by binary-operator-assignment at the end of the method' do
     it 'registers an offence' do
       inspect_source(cop,
@@ -125,7 +125,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
     end
   end
 
-  context 'when a lvar declared as an argument ' +
+  context 'when a lvar declared as an argument ' \
           'is no longer the passed object at the end of the method' do
     it 'registers an offence for the lvar attr assignment' do
       inspect_source(cop,

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
   subject(:cop) { described_class.new(config) }
 
-  context 'when IndentDepth is set to method' do
+  context 'when EnforcedStyle is set to indent' do
     let(:cop_config) { { 'EnforcedStyle' => 'indent' } }
 
     it 'registers an offence for misaligned private' do
@@ -81,7 +81,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
         .to eq(['Indent access modifiers like private.'])
     end
 
-    it 'registers an offence for misaligned private in class ' +
+    it 'registers an offence for misaligned private in class ' \
        'defined with Class.new' do
       inspect_source(cop,
                      ['Test = Class.new do',
@@ -95,7 +95,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
         .to eq(['Indent access modifiers like private.'])
     end
 
-    it 'registers an offence for misaligned private in module ' +
+    it 'registers an offence for misaligned private in module ' \
        'defined with Module.new' do
       inspect_source(cop,
                      ['Test = Module.new do',
@@ -163,12 +163,30 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
     end
+
+    it 'auto-corrects incorrectly indented access modifiers' do
+      corrected = autocorrect_source(cop, ['class Test',
+                                           '',
+                                           'public',
+                                           ' private',
+                                           '   protected',
+                                           '',
+                                           '  def test; end',
+                                           'end'])
+      expect(corrected).to eq(['class Test',
+                               '',
+                               '  public',
+                               '  private',
+                               '  protected',
+                               '',
+                               '  def test; end',
+                               'end'].join("\n"))
+    end
   end
 
-  context 'when IndentDepth is set to class' do
+  context 'when EnforcedStyle is set to outdent' do
     let(:cop_config) { { 'EnforcedStyle' => 'outdent' } }
     let(:indent_msg) { 'Outdent access modifiers like private.' }
-    let(:blank_msg) { 'Keep a blank line before and after private.' }
 
     it 'registers offence for private indented to method depth in a class' do
       inspect_source(cop,
@@ -195,7 +213,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in singleton' +
+    it 'registers offence for private indented to method depth in singleton' \
        'class' do
       inspect_source(cop,
                      ['class << self',
@@ -208,7 +226,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in class ' +
+    it 'registers offence for private indented to method depth in class ' \
        'defined with Class.new' do
       inspect_source(cop,
                      ['Test = Class.new do',
@@ -221,7 +239,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in module ' +
+    it 'registers offence for private indented to method depth in module ' \
        'defined with Module.new' do
       inspect_source(cop,
                      ['Test = Module.new do',
@@ -274,5 +292,28 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.offences.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
+
+    it 'auto-corrects incorrectly indented access modifiers' do
+      corrected = autocorrect_source(cop, ['module M',
+                                           '  class Test',
+                                           '',
+                                           'public',
+                                           ' private',
+                                           '     protected',
+                                           '',
+                                           '    def test; end',
+                                           '  end',
+                                           'end'])
+      expect(corrected).to eq(['module M',
+                               '  class Test',
+                               '',
+                               '  public',
+                               '  private',
+                               '  protected',
+                               '',
+                               '    def test; end',
+                               '  end',
+                               'end'].join("\n"))
+    end
   end
 end

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::AlignArray do
                          '  c,',
                          '   d',
                          ']'])
-    expect(cop.messages).to eq(['Align the elements of an array ' +
+    expect(cop.messages).to eq(['Align the elements of an array ' \
                                 'literal if they span more than ' +
                                 'one line.'] * 2)
     expect(cop.highlights).to eq(%w(b d))

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

@@ -34,7 +34,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
                            "  'ccc' => 2,",
                            " 'dddd'  =>  2",
                            '}'])
-      expect(cop.messages).to eq(['Align the elements of a hash ' +
+      expect(cop.messages).to eq(['Align the elements of a hash ' \
                                   'literal if they span more than ' +
                                   'one line.'] * 2)
       expect(cop.highlights).to eq(['bb: 1',

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

@@ -53,7 +53,7 @@ describe Rubocop::Cop::Style::AlignParameters do
                          'func3(*a)'
                         ])
     expect(cop.offences.map(&:to_s))
-      .to eq(['C:  5:  6: Align the parameters of a method call if ' +
+      .to eq(['C:  5:  6: Align the parameters of a method call if ' \
               'they span more than one line.'])
     expect(cop.highlights).to eq(['*b'])
   end
@@ -62,7 +62,7 @@ describe Rubocop::Cop::Style::AlignParameters do
     inspect_source(cop, ['func1(a,',
                          '     b,)'])
     expect(cop.offences.map(&:to_s))
-      .to eq(['C:  2:  6: Align the parameters of a method call if ' +
+      .to eq(['C:  2:  6: Align the parameters of a method call if ' \
               'they span more than one line.'])
     expect(cop.highlights).to eq(['b'])
   end

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

@@ -51,7 +51,7 @@ describe Rubocop::Cop::Style::Blocks do
       expect(cop.offences).to be_empty
     end
 
-    it 'registers an offence for braces if do-end would not change ' +
+    it 'registers an offence for braces if do-end would not change ' \
       'the meaning' do
       src = ['scope :foo, (lambda { |f|',
              '  where(condition: "value")',

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

@@ -190,7 +190,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
         expect(cop.offences).to be_empty
       end
 
-      it "registers an offence for  a when clause that's equally indented " +
+      it "registers an offence for  a when clause that's equally indented " \
         'with case' do
         source = ['y = case a',
                   '    when 0 then break',

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

@@ -54,7 +54,7 @@ describe Rubocop::Cop::Style::DotPosition, :config do
       inspect_source(cop, ['something',
                            '  .method_name'])
       expect(cop.messages)
-        .to eq(['Place the . on the previous line, together with the method ' +
+        .to eq(['Place the . on the previous line, together with the method ' \
                 'call receiver.'])
       expect(cop.highlights).to eq(['.'])
       expect(cop.config_to_allow_offences).to eq('Style' => 'leading')

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

@@ -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 (or control flow or) 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 (or control flow or) over if for negative ' \
        'conditions.'] * 2)
     expect(cop.offences.map(&:line)).to eq([1, 4])
   end

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

@@ -23,7 +23,7 @@ describe Rubocop::Cop::Style::IfUnlessModifier do
                     "    #{body}",
                     '  end'])
     expect(cop.messages).to eq(
-      ['Favor modifier if usage when you have a single-line' +
+      ['Favor modifier if usage when you have a single-line' \
        ' body. Another good alternative is the usage of control flow' +
        ' &&/||.'])
   end
@@ -59,7 +59,7 @@ describe Rubocop::Cop::Style::IfUnlessModifier do
                          '  b',
                          'end'])
     expect(cop.messages).to eq(
-      ['Favor modifier unless usage when you have a single-line' +
+      ['Favor modifier unless usage when you have a single-line' \
        ' body. Another good alternative is the usage of control flow' +
        ' &&/||.'])
   end
@@ -73,7 +73,7 @@ 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 ' +
+                   ['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/indentation_consistency_spec.rb

@@ -120,7 +120,7 @@ describe Rubocop::Cop::Style::IndentationConsistency do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment with end aligned with variable ' +
+    it 'accepts an if/else in assignment with end aligned with variable ' \
       'and chaining after the end' do
       inspect_source(cop,
                      ['var = if a',
@@ -131,7 +131,7 @@ describe Rubocop::Cop::Style::IndentationConsistency do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment with end aligned with variable ' +
+    it 'accepts an if/else in assignment with end aligned with variable ' \
       'and chaining with a block after the end' do
       inspect_source(cop,
                      ['var = if a',
@@ -160,7 +160,7 @@ describe Rubocop::Cop::Style::IndentationConsistency do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment on next line with end aligned ' +
+    it 'accepts an if/else in assignment on next line with end aligned ' \
       'with if' do
       inspect_source(cop,
                      ['var =',
@@ -408,7 +408,7 @@ describe Rubocop::Cop::Style::IndentationConsistency do
       expect(cop.offences).to be_empty
     end
 
-    it 'registers an offence for bad indentation in def but not for ' +
+    it 'registers an offence for bad indentation in def but not for ' \
       'outdented public, protected, and private' do
       inspect_source(cop,
                      ['class Test',

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

@@ -139,7 +139,7 @@ describe Rubocop::Cop::Style::IndentationWidth do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment with end aligned with variable ' +
+    it 'accepts an if/else in assignment with end aligned with variable ' \
       'and chaining after the end' do
       inspect_source(cop,
                      ['var = if a',
@@ -150,7 +150,7 @@ describe Rubocop::Cop::Style::IndentationWidth do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment with end aligned with variable ' +
+    it 'accepts an if/else in assignment with end aligned with variable ' \
       'and chaining with a block after the end' do
       inspect_source(cop,
                      ['var = if a',
@@ -179,7 +179,7 @@ describe Rubocop::Cop::Style::IndentationWidth do
       expect(cop.offences).to be_empty
     end
 
-    it 'accepts an if/else in assignment on next line with end aligned ' +
+    it 'accepts an if/else in assignment on next line with end aligned ' \
       'with if' do
       inspect_source(cop,
                      ['var =',

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::LineEndConcatenation do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence for string concat at line end' do
+    inspect_source(cop,
+                   ['top = "test" +',
+                    '"top"'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts string concat on the same line' do
+    inspect_source(cop,
+                   ['top = "test" + "top"'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'autocorrects by replacing + with \\' do
+    corrected = autocorrect_source(cop,
+                                   ['top = "test" +',
+                                    '"top"'])
+    expect(corrected).to eq ['top = "test" \\', '"top"'].join("\n")
+  end
+end

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

@@ -38,7 +38,7 @@ describe Rubocop::Cop::Style::MultilineBlockChain do
       expect(cop.highlights).to eq(['end.c', 'end.e'])
     end
 
-    it 'registers an offence for a chain where the second block is ' +
+    it 'registers an offence for a chain where the second block is ' \
       'single-line' do
       inspect_source(cop, ['Thread.list.find_all { |t|',
                            '  t.alive?',

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

@@ -19,4 +19,9 @@ describe Rubocop::Cop::Style::Proc do
     inspect_source(cop, ['p = Proc.new'])
     expect(cop.offences).to be_empty
   end
+
+  it 'auto-corrects Proc.new to proc' do
+    corrected = autocorrect_source(cop, ['Proc.new { test }'])
+    expect(corrected).to eq 'proc { test }'
+  end
 end

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         inspect_source(cop, ['x =~ /home\/\//',
                              'y =~ /etc\/top\//'])
         expect(cop.messages)
-          .to eq(['Use %r for regular expressions matching more ' +
+          .to eq(['Use %r for regular expressions matching more ' \
                   "than 1 '/' character."] * 2)
         expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
       end
@@ -32,7 +32,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
       it 'registers an offence for one slash in regexp' do
         inspect_source(cop, ['x =~ /home\//'])
         expect(cop.messages)
-          .to eq(['Use %r for regular expressions matching more ' +
+          .to eq(['Use %r for regular expressions matching more ' \
                   "than 0 '/' characters."])
         expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
       end
@@ -45,7 +45,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
       it 'registers an offence for zero slashes in regexp' do
         inspect_source(cop, ['y =~ %r(etc)'])
         expect(cop.messages)
-          .to eq(['Use %r only for regular expressions matching more ' +
+          .to eq(['Use %r only for regular expressions matching more ' \
                   "than 0 '/' characters."])
         expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
       end
@@ -68,7 +68,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         inspect_source(cop, ['x =~ %r(/home)',
                              'y =~ %r(etc)'])
         expect(cop.messages)
-          .to eq(['Use %r only for regular expressions matching more ' +
+          .to eq(['Use %r only for regular expressions matching more ' \
                   "than 1 '/' character."] * 2)
         expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
       end

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

@@ -8,7 +8,7 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
   context 'configured with single quotes preferred' do
     let(:cop_config) { { 'EnforcedStyle' => 'single_quotes' } }
 
-    it 'registers offence for double quotes when single quotes ' +
+    it 'registers offence for double quotes when single quotes ' \
       'suffice' do
       inspect_source(cop, ['s = "abc"',
                            'x = "a\\\\b"',
@@ -19,7 +19,7 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
                                     '"\\\\b"',
                                     '"a\\\\"'])
       expect(cop.messages)
-        .to eq(["Prefer single-quoted strings when you don't need " +
+        .to eq(["Prefer single-quoted strings when you don't need " \
                 'string interpolation or special symbols.'] * 4)
       expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
                                                  'double_quotes')
@@ -29,7 +29,7 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       inspect_source(cop, ['s = "abc"',
                            "x = 'abc'"])
       expect(cop.messages)
-        .to eq(["Prefer single-quoted strings when you don't need " +
+        .to eq(["Prefer single-quoted strings when you don't need " \
                 'string interpolation or special symbols.'])
       expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
@@ -60,7 +60,7 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
 
     it 'accepts double quotes when they are needed' do
       src = ['a = "\n"',
-             'b = "#{encode_severity}:' +
+             'b = "#{encode_severity}:' \
              '#{sprintf("%3d", line_number)}: #{m}"',
              'c = "\'"',
              'd = "#@test"',
@@ -124,12 +124,12 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
   context 'configured with double quotes preferred' do
     let(:cop_config) { { 'EnforcedStyle' => 'double_quotes' } }
 
-    it 'registers offence for single quotes when double quotes would ' +
+    it 'registers offence for single quotes when double quotes would ' \
       'be equivalent' do
       inspect_source(cop, ["s = 'abc'"])
       expect(cop.highlights).to eq(["'abc'"])
       expect(cop.messages)
-        .to eq(['Prefer double-quoted strings unless you need ' +
+        .to eq(['Prefer double-quoted strings unless you need ' \
                 'single quotes to avoid extra backslashes for ' +
                 'escaping.'])
       expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
@@ -140,7 +140,7 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       inspect_source(cop, ['s = "abc"',
                            "x = 'abc'"])
       expect(cop.messages)
-        .to eq(['Prefer double-quoted strings unless you need ' +
+        .to eq(['Prefer double-quoted strings unless you need ' \
                 'single quotes to avoid extra backslashes for ' +
                 'escaping.'])
       expect(cop.config_to_allow_offences).to eq('Enabled' => false)