rubocop 0.22.0 → 0.23.0

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IfWithSemicolon do
+describe RuboCop::Cop::Style::IfWithSemicolon do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for one line if/;/end' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IndentArray do
+describe RuboCop::Cop::Style::IndentArray do
   subject(:cop) { described_class.new }
 
   it 'accepts multi-assignments' do
@@ -26,6 +26,38 @@ describe Rubocop::Cop::Style::IndentArray do
     expect(cop.highlights).to eq(['1'])
   end
 
+  it 'registers an offense for incorrectly indented closing bracket in an ' \
+     'empty array' do
+    inspect_source(cop,
+                   ['a << [',
+                    ' ]'])
+    expect(cop.messages)
+      .to eq(['Indent the right bracket the same as the start of the line ' \
+              'where the left bracket is.'])
+    expect(cop.highlights).to eq([']'])
+  end
+
+  context 'when the first element is not on its own line' do
+    it 'registers an offense for an incorrectly indented closing bracket' do
+      inspect_source(cop,
+                     ['a = [1,',
+                      '     2,',
+                      ']'])
+      expect(cop.highlights).to eq([']'])
+      expect(cop.messages)
+        .to eq(['Indent the right bracket the same as the left bracket.'])
+    end
+
+    it 'accepts closing bracket indented the same as opening bracket' do
+      inspect_source(cop,
+                     ['a = [1,',
+                      '     2,',
+                      '    ]'])
+      expect(cop.highlights).to eq([])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
   it 'auto-corrects incorrectly indented only element' do
     corrected = autocorrect_source(cop, ['a << [',
                                          ' 1',
@@ -97,7 +129,10 @@ describe Rubocop::Cop::Style::IndentArray do
                         '     ])'])
         expect(cop.messages)
           .to eq(['Use 2 spaces for indentation in an array, relative to ' \
-                  'the start of the line where the left bracket is.'])
+                  'the start of the line where the left bracket is.',
+
+                  'Indent the right bracket the same as the start of the ' \
+                  'line where the left bracket is.'])
       end
 
       it 'accepts normal indentation for second argument' do

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

@@ -2,14 +2,15 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IndentHash do
+describe RuboCop::Cop::Style::IndentHash do
   subject(:cop) { described_class.new(config) }
   let(:config) do
     supported_styles = {
       'SupportedStyles' => %w(special_inside_parentheses consistent)
     }
-    Rubocop::Config.new('AlignHash' => align_hash_config,
-                        'IndentHash' => cop_config.merge(supported_styles))
+    RuboCop::Config.new('Style/AlignHash' => align_hash_config,
+                        'Style/IndentHash' =>
+                        cop_config.merge(supported_styles))
   end
   let(:align_hash_config) do
     {
@@ -20,6 +21,19 @@ describe Rubocop::Cop::Style::IndentHash do
   end
   let(:cop_config) { { 'EnforcedStyle' => 'special_inside_parentheses' } }
 
+  shared_examples 'right brace' do
+    it 'registers an offense for incorrectly indented }' do
+      inspect_source(cop,
+                     ['a << {',
+                      '  }'])
+      expect(cop.highlights).to eq(['}'])
+      expect(cop.messages)
+        .to eq(['Indent the right brace the same as the start of the line ' \
+                'where the left brace is.'])
+      expect(cop.config_to_allow_offenses).to eq(nil)
+    end
+  end
+
   context 'when the AlignHash style is separator for :' do
     let(:align_hash_config) do
       {
@@ -47,6 +61,8 @@ describe Rubocop::Cop::Style::IndentHash do
       expect(cop.highlights).to eq(['a: 1'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
+
+    include_examples 'right brace'
   end
 
   context 'when the AlignHash style is separator for =>' do
@@ -76,6 +92,8 @@ describe Rubocop::Cop::Style::IndentHash do
       expect(cop.highlights).to eq(["'a' => 1"])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
+
+    include_examples 'right brace'
   end
 
   context 'when hash is operand' do
@@ -104,6 +122,8 @@ describe Rubocop::Cop::Style::IndentHash do
                                '  a: 1',
                                '}'].join("\n")
     end
+
+    include_examples 'right brace'
   end
 
   context 'when hash is argument to setter' do
@@ -197,8 +217,23 @@ describe Rubocop::Cop::Style::IndentHash do
       context 'and EnforcedStyle is special_inside_parentheses' do
         it 'accepts special indentation for first argument' do
           inspect_source(cop,
-                         ['func({',
+                         # Only the function calls are affected by
+                         # EnforcedStyle setting. Other indentation shall be
+                         # the same regardless of EnforcedStyle.
+                         ['h = {',
+                          '  a: 1',
+                          '}',
+                          'func({',
                           '       a: 1',
+                          '     })',
+                          'func(x, {',
+                          '       a: 1',
+                          '     })',
+                          'h = { a: 1',
+                          '}',
+                          'func({ a: 1',
+                          '     })',
+                          'func(x, { a: 1',
                           '     })'])
           expect(cop.offenses).to be_empty
         end
@@ -210,7 +245,10 @@ describe Rubocop::Cop::Style::IndentHash do
                           '})'])
           expect(cop.messages)
             .to eq(['Use 2 spaces for indentation in a hash, relative to the' \
-                    ' first position after the preceding left parenthesis.'])
+                    ' first position after the preceding left parenthesis.',
+
+                    'Indent the right brace the same as the first position ' \
+                    'after the preceding left parenthesis.'])
           expect(cop.config_to_allow_offenses)
             .to eq('EnforcedStyle' => 'consistent')
         end
@@ -221,7 +259,7 @@ describe Rubocop::Cop::Style::IndentHash do
                                                '})'])
           expect(corrected).to eq ['func({',
                                    '       a: 1',
-                                   '})'].join("\n")
+                                   '     })'].join("\n")
         end
 
         it 'accepts special indentation for second argument' do
@@ -247,8 +285,23 @@ describe Rubocop::Cop::Style::IndentHash do
 
         it 'accepts normal indentation for first argument' do
           inspect_source(cop,
-                         ['func({',
+                         # Only the function calls are affected by
+                         # EnforcedStyle setting. Other indentation shall be
+                         # the same regardless of EnforcedStyle.
+                         ['h = {',
+                          '  a: 1',
+                          '}',
+                          'func({',
                           '  a: 1',
+                          '})',
+                          'func(x, {',
+                          '  a: 1',
+                          '})',
+                          'h = { a: 1',
+                          '}',
+                          'func({ a: 1',
+                          '})',
+                          'func(x, { a: 1',
                           '})'])
           expect(cop.offenses).to be_empty
         end
@@ -260,7 +313,10 @@ describe Rubocop::Cop::Style::IndentHash do
                           '     })'])
           expect(cop.messages)
             .to eq(['Use 2 spaces for indentation in a hash, relative to the' \
-                    ' start of the line where the left curly brace is.'])
+                    ' start of the line where the left curly brace is.',
+
+                    'Indent the right brace the same as the start of the ' \
+                    'line where the left brace is.'])
           expect(cop.config_to_allow_offenses)
             .to eq('EnforcedStyle' => 'special_inside_parentheses')
         end

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IndentationConsistency do
+describe RuboCop::Cop::Style::IndentationConsistency do
   subject(:cop) { described_class.new }
 
   context 'with if statement' do

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

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IndentationWidth do
+describe RuboCop::Cop::Style::IndentationWidth do
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    Rubocop::Config.new('EndAlignment' => end_alignment_config)
+    RuboCop::Config.new('Lint/EndAlignment' => end_alignment_config)
   end
   let(:end_alignment_config) do
     { 'Enabled' => true, 'AlignWith' => 'variable' }
@@ -67,25 +67,88 @@ describe Rubocop::Cop::Style::IndentationWidth do
         .to eq(['Use 2 (not 3) spaces for indentation.'])
     end
 
-    it 'autocorrects bad indentation' do
-      corrected = autocorrect_source(cop,
-                                     ['if a1',
-                                      '   b1',
-                                      '   b1',
-                                      'elsif a2',
-                                      ' b2',
-                                      'else',
-                                      '    c',
-                                      'end'])
-      expect(corrected)
-        .to eq ['if a1',
-                '  b1',
-                '   b1', # Will be corrected by IndentationConsistency.
-                'elsif a2',
-                '  b2',
-                'else',
-                '  c',
-                'end'].join("\n")
+    describe '#autocorrect' do
+      it 'corrects bad indentation' do
+        corrected = autocorrect_source(cop,
+                                       ['if a1',
+                                        '   b1',
+                                        '   b1',
+                                        'elsif a2',
+                                        ' b2',
+                                        'else',
+                                        '    c',
+                                        'end'])
+        expect(corrected)
+          .to eq ['if a1',
+                  '  b1',
+                  '   b1', # Will be corrected by IndentationConsistency.
+                  'elsif a2',
+                  '  b2',
+                  'else',
+                  '  c',
+                  'end'].join("\n")
+      end
+
+      it 'does not correct in scopes that contain block comments' do
+        corrected = autocorrect_source(cop,
+                                       ['module Foo',
+                                        'class Bar',
+                                        '=begin',
+                                        'This is a nice long',
+                                        'comment',
+                                        'which spans a few lines',
+                                        '=end',
+                                        'def baz',
+                                        'do_something',
+                                        'end',
+                                        'end',
+                                        'end'])
+        expect(corrected).to eq ['module Foo',
+                                 # The class has a block comment within, so
+                                 # it's not corrected.
+                                 'class Bar',
+                                 '=begin',
+                                 'This is a nice long',
+                                 'comment',
+                                 'which spans a few lines',
+                                 '=end',
+                                 # The method has no block comment inside, so
+                                 # it's corrected.
+                                 '  def baz',
+                                 # Method contents are also corrected.
+                                 '    do_something',
+                                 '  end',
+                                 'end',
+                                 'end'].join("\n")
+      end
+
+      it 'does not indent heredoc strings' do
+        corrected = autocorrect_source(cop,
+                                       ['module Foo',
+                                        'module Bar',
+                                        '  SOMETHING = <<GOO',
+                                        'text',
+                                        'more text',
+                                        'foo',
+                                        'GOO',
+                                        '  def baz',
+                                        '    do_something',
+                                        '  end',
+                                        'end',
+                                        'end'])
+        expect(corrected).to eq ['module Foo',
+                                 '  module Bar',
+                                 '    SOMETHING = <<GOO',
+                                 'text',
+                                 'more text',
+                                 'foo',
+                                 'GOO',
+                                 '    def baz',
+                                 '      do_something',
+                                 '    end',
+                                 '  end',
+                                 'end'].join("\n")
+      end
     end
 
     it 'accepts a one line if statement' do

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

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::InlineComment do
+  it 'registers an offense for a inline comment' do
+    code = 'two = 1 + 1 # An inline comment'
+
+    expect(subject).to find_offenses_in(code)
+      .with_message('Avoid inline comments.')
+      .with_highlight('# An inline comment')
+  end
+end

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::LambdaCall, :config do
+describe RuboCop::Cop::Style::LambdaCall, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when style is set to call' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::Lambda do
+describe RuboCop::Cop::Style::Lambda do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for an old single-line lambda call' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::LeadingCommentSpace do
+describe RuboCop::Cop::Style::LeadingCommentSpace do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for comment without leading space' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::LineEndConcatenation do
+describe RuboCop::Cop::Style::LineEndConcatenation do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for string concat at line end' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::LineLength, :config do
+describe RuboCop::Cop::Style::LineLength, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 80 } }
 

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

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::MethodCallParentheses, :config do
+describe RuboCop::Cop::Style::MethodCallParentheses, :config do
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    Rubocop::Config.new('EmptyLiteral' => { 'Enabled' => true })
+    RuboCop::Config.new('Style/EmptyLiteral' => { 'Enabled' => true })
   end
 
   it 'registers an offense for parens in method call without args' do
@@ -43,7 +43,7 @@ describe Rubocop::Cop::Style::MethodCallParentheses, :config do
 
   context 'when EmptyLiteral is disabled' do
     let(:config) do
-      Rubocop::Config.new('EmptyLiteral' => { 'Enabled' => false })
+      RuboCop::Config.new('Style/EmptyLiteral' => { 'Enabled' => false })
     end
 
     it 'auto-corrects calls that could be empty literals' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
+describe RuboCop::Cop::Style::MethodCalledOnDoEndBlock do
   subject(:cop) { described_class.new }
 
   context 'with a multi-line do..end block' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::MethodDefParentheses, :config do
+describe RuboCop::Cop::Style::MethodDefParentheses, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'require_parentheses' do