rubocop 0.25.0 → 0.26.0

data/spec/rubocop/cop/rails/validation_spec.rb

@@ -5,15 +5,22 @@ require 'spec_helper'
 describe RuboCop::Cop::Rails::Validation do
   subject(:cop) { described_class.new }
 
-  described_class::BLACKLIST.each do |validation|
+  described_class::BLACKLIST.each_with_index do |validation, number|
     it "registers an offense for #{validation}" do
       inspect_source(cop,
                      ["#{validation} :name"])
       expect(cop.offenses.size).to eq(1)
     end
+
+    it "outputs the correct message for #{validation}" do
+      inspect_source(cop,
+                     ["#{validation} :name"])
+      expect(cop.offenses.first.message)
+        .to include(described_class::WHITELIST[number])
+    end
   end
 
-  it 'accepts sexy validations' do
+  it 'accepts new style validations' do
     inspect_source(cop,
                    ['validates :name'])
     expect(cop.offenses).to be_empty

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

@@ -36,6 +36,21 @@ describe RuboCop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
+    it 'registers an offense for misaligned module_function in module' do
+      inspect_source(cop,
+                     ['module Test',
+                      '',
+                      ' module_function',
+                      '',
+                      '  def test; end',
+                      'end'])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Indent access modifiers like `module_function`.'])
+      # Not aligned according to `indent` or `outdent` style:
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
     it 'registers an offense for correct + opposite alignment' do
       inspect_source(cop,
                      ['module Test',
@@ -232,6 +247,17 @@ describe RuboCop::Cop::Style::AccessModifierIndentation, :config do
       expect(cop.messages).to eq([indent_msg])
     end
 
+    it 'registers offense for module fn indented to method depth in a module' do
+      inspect_source(cop,
+                     ['module Test',
+                      '',
+                      '  module_function',
+                      '',
+                      '  def test; end',
+                      'end'])
+      expect(cop.offenses.size).to eq(1)
+    end
+
     it 'registers offense for private indented to method depth in singleton' \
        'class' do
       inspect_source(cop,

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

@@ -11,65 +11,57 @@ describe RuboCop::Cop::Style::AndOr, :config do
     subject(:cop) { described_class.new(config) }
     let(:cop_config) { cop_config }
 
-    it 'does not warn on short-circuit (and)' do
-      inspect_source(cop,
-                     ['x = a + b and return x'])
-      expect(cop.offenses.size).to eq(0)
-    end
-
-    it 'does not warn on short-circuit (or)' do
-      inspect_source(cop,
-                     ['x = a + b or return x'])
-      expect(cop.offenses.size).to eq(0)
-    end
-
-    it 'does warn on non short-circuit (and)' do
-      inspect_source(cop,
-                     ['x = a + b if a and b'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Use `&&` instead of `and`.'])
+    %w(and or).each do |operator|
+      it "accepts \"#{operator}\" outside of conditional" do
+        inspect_source(cop,
+                       ["x = a + b #{operator} return x"])
+        expect(cop.offenses).to be_empty
+      end
+
+      {
+        'if'                     => 'if %{conditional}; %{body}; end',
+        'while'                  => 'while %{conditional}; %{body}; end',
+        'until'                  => 'until %{conditional}; %{body}; end',
+        'post-conditional while' => 'begin; %{body}; end while %{conditional}',
+        'post-conditional until' => 'begin; %{body}; end until %{conditional}'
+      }.each do |type, snippet_format|
+        it "registers an offense for \"#{operator}\" in #{type} conditional" do
+          elements = {
+            conditional: "a #{operator} b",
+            body:        'do_something'
+          }
+          source = format(snippet_format, elements)
+
+          inspect_source(cop, source)
+          expect(cop.offenses.size).to eq(1)
+        end
+
+        it "accepts \"#{operator}\" in #{type} body" do
+          elements = {
+            conditional: 'some_condition',
+            body:        "do_something #{operator} return"
+          }
+          source = format(snippet_format, elements)
+
+          inspect_source(cop, source)
+          expect(cop.offenses).to be_empty
+        end
+      end
+    end
+
+    %w(&& ||).each do |operator|
+      it "accepts #{operator} inside of conditional" do
+        inspect_source(cop,
+                       ["test if a #{operator} b"])
+        expect(cop.offenses).to be_empty
+      end
+
+      it "accepts #{operator} outside of conditional" do
+        inspect_source(cop,
+                       ["x = a #{operator} b"])
+        expect(cop.offenses).to be_empty
+      end
     end
-
-    it 'does warn on non short-circuit (or)' do
-      inspect_source(cop,
-                     ['x = a + b if a or b'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Use `||` instead of `or`.'])
-    end
-
-    it 'does warn on non short-circuit (and) (unless)' do
-      inspect_source(cop,
-                     ['x = a + b unless a and b'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Use `&&` instead of `and`.'])
-    end
-
-    it 'does warn on non short-circuit (or) (unless)' do
-      inspect_source(cop,
-                     ['x = a + b unless a or b'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Use `||` instead of `or`.'])
-    end
-
-    it 'should handle boolean returning methods correctly' do
-      inspect_source(cop,
-                     ['1 if (not true) or false'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Use `||` instead of `or`.'])
-    end
-
-    it 'should handle recursion' do
-      inspect_source(cop,
-                     ['1 if (true and false) || (false or true)'])
-      expect(cop.offenses.size).to eq(2)
-    end
-
-    it 'should handle recursion' do
-      inspect_source(cop,
-                     ['1 if (true or false) && (false and true)'])
-      expect(cop.offenses.size).to eq(2)
-    end
-
   end
 
   context 'when style is always' do
@@ -80,14 +72,14 @@ describe RuboCop::Cop::Style::AndOr, :config do
     subject(:cop) { described_class.new(config) }
     let(:cop_config) { cop_config }
 
-    it 'registers an offense for OR' do
+    it 'registers an offense for "or"' do
       inspect_source(cop,
                      ['test if a or b'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(['Use `||` instead of `or`.'])
     end
 
-    it 'registers an offense for AND' do
+    it 'registers an offense for "and"' do
       inspect_source(cop,
                      ['test if a and b'])
       expect(cop.offenses.size).to eq(1)
@@ -254,6 +246,5 @@ describe RuboCop::Cop::Style::AndOr, :config do
       new_source = autocorrect_source(cop, 'b and method a,b')
       expect(new_source).to eq('b && method(a,b)')
     end
-
   end
 end

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

@@ -137,32 +137,49 @@ describe RuboCop::Cop::Style::BracesAroundHashParameters, :config do
     describe 'auto-corrects' do
       it 'one non-hash parameter followed by a hash parameter with braces' do
         corrected = autocorrect_source(cop, ['where(1, { y: 2 })'])
-        expect(corrected).to eq 'where(1,  y: 2 )'
+        expect(corrected).to eq 'where(1, y: 2)'
       end
 
       it 'one object method hash parameter with braces' do
         corrected = autocorrect_source(cop, ['x.func({ y: "z" })'])
-        expect(corrected).to eq 'x.func( y: "z" )'
+        expect(corrected).to eq 'x.func(y: "z")'
       end
 
       it 'one hash parameter with braces' do
         corrected = autocorrect_source(cop, ['where({ x: 1 })'])
-        expect(corrected).to eq 'where( x: 1 )'
+        expect(corrected).to eq 'where(x: 1)'
       end
 
       it 'one hash parameter with braces and separators' do
-        corrected = autocorrect_source(cop, ["where(  \n { x: 1 }   )"])
-        expect(corrected).to eq "where(  \n  x: 1    )"
+        corrected = autocorrect_source(cop, ['where(  ',
+                                             ' { x: 1 }   )'])
+        expect(corrected).to eq(['where(  ',
+                                 ' x: 1   )'].join("\n"))
       end
 
       it 'one hash parameter with braces and multiple keys' do
         corrected = autocorrect_source(cop, ['where({ x: 1, foo: "bar" })'])
-        expect(corrected).to eq 'where( x: 1, foo: "bar" )'
+        expect(corrected).to eq 'where(x: 1, foo: "bar")'
+      end
+
+      it 'one hash parameter with braces and extra leading whitespace' do
+        corrected = autocorrect_source(cop, ['where({   x: 1, y: 2 })'])
+        expect(corrected).to eq 'where(x: 1, y: 2)'
+      end
+
+      it 'one hash parameter with braces and extra trailing whitespace' do
+        corrected = autocorrect_source(cop, ['where({ x: 1, y: 2   })'])
+        expect(corrected).to eq 'where(x: 1, y: 2)'
       end
 
       it 'one hash parameter with braces and a trailing comma' do
         corrected = autocorrect_source(cop, ['where({ x: 1, y: 2, })'])
-        expect(corrected).to eq 'where( x: 1, y: 2 )'
+        expect(corrected).to eq 'where(x: 1, y: 2)'
+      end
+
+      it 'one hash parameter with braces and trailing comma and whitespace' do
+        corrected = autocorrect_source(cop, ['where({ x: 1, y: 2,   })'])
+        expect(corrected).to eq 'where(x: 1, y: 2)'
       end
     end
   end
@@ -212,7 +229,8 @@ describe RuboCop::Cop::Style::BracesAroundHashParameters, :config do
       end
 
       it 'one hash parameter with braces and separators around it' do
-        inspect_source(cop, ["where( \t    {  x: 1 \n  }   )"])
+        inspect_source(cop, ["where( \t    {  x: 1 ",
+                             '  }   )'])
         expect(cop.messages).to be_empty
         expect(cop.highlights).to be_empty
       end

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

@@ -28,7 +28,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
           expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offense for an assignment indented as end' do
+        it 'registers an offense for an assignment indented as end' do
           source = ['output = case variable',
                     "when 'value1'",
                     "  'output1'",
@@ -41,7 +41,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
                                                      'end')
         end
 
-        it 'registers on offense for an assignment indented some other way' do
+        it 'registers an offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "  when 'value1'",
                     "    'output1'",
@@ -53,7 +53,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
           expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
 
-        it 'registers on offense for correct + opposite' do
+        it 'registers an offense for correct + opposite' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -166,7 +166,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
           expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offense for an assignment indented some other way' do
+        it 'registers an offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -191,7 +191,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
         expect(cop.offenses).to be_empty
       end
 
-      it "registers an offense for  a when clause that's equally indented " \
+      it "registers an offense for a when clause that's equally indented " \
          'with case' do
         source = ['y = case a',
                   '    when 0 then break',
@@ -230,7 +230,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
           expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offense for an assignment indented some other way' do
+        it 'registers an offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "  when 'value1'",
                     "    'output1'",
@@ -260,7 +260,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
           expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offense for an assignment indented as case' do
+        it 'registers an offense for an assignment indented as case' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -274,7 +274,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
                                                      'case')
         end
 
-        it 'registers on offense for an assignment indented some other way' do
+        it 'registers an offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "       when 'value1'",
                     "         'output1'",

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

@@ -33,7 +33,11 @@ describe RuboCop::Cop::Style::DefWithParentheses do
   end
 
   it 'auto-removes unneeded parens' do
-    new_source = autocorrect_source(cop, "def test();\nsomething\nend")
-    expect(new_source).to eq("def test;\nsomething\nend")
+    new_source = autocorrect_source(cop, ['def test();',
+                                          'something',
+                                          'end'])
+    expect(new_source).to eq(['def test;',
+                              'something',
+                              'end'].join("\n"))
   end
 end

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

@@ -45,6 +45,31 @@ describe RuboCop::Cop::Style::DotPosition, :config do
       inspect_source(cop, ['something.method_name'])
       expect(cop.offenses).to be_empty
     end
+
+    it 'auto-corrects trailing dot in multi-line call' do
+      new_source = autocorrect_source(cop, ['something.',
+                                            '  method_name'])
+      expect(new_source).to eq(['something',
+                                '  .method_name'].join("\n"))
+    end
+
+    it 'auto-corrects trailing dot in multi-line call without selector' do
+      new_source = autocorrect_source(cop, ['something.',
+                                            '  (1)'])
+      expect(new_source).to eq(['something',
+                                '  .(1)'].join("\n"))
+    end
+
+    it 'auto-corrects correct + opposite style' do
+      new_source = autocorrect_source(cop, ['something',
+                                            '  .method_name',
+                                            'something.',
+                                            '  method_name'])
+      expect(new_source).to eq(['something',
+                                '  .method_name',
+                                'something',
+                                '  .method_name'].join("\n"))
+    end
   end
 
   context 'Trailing dots style' do
@@ -87,5 +112,19 @@ describe RuboCop::Cop::Style::DotPosition, :config do
                            'compact.join("\n")'])
       expect(cop.offenses).to be_empty
     end
+
+    it 'auto-corrects leading dot in multi-line call' do
+      new_source = autocorrect_source(cop, ['something',
+                                            '  .method_name'])
+      expect(new_source).to eq(['something.',
+                                '  method_name'].join("\n"))
+    end
+
+    it 'auto-corrects leading dot in multi-line call without selector' do
+      new_source = autocorrect_source(cop, ['something',
+                                            '  .(1)'])
+      expect(new_source).to eq(['something.',
+                                '  (1)'].join("\n"))
+    end
   end
 end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
   subject(:cop) { described_class.new }
 
-  %w(private protected public).each do |access_modifier|
+  %w(private protected public module_function).each do |access_modifier|
     it "requires blank line before #{access_modifier}" do
       inspect_source(cop,
                      ['class Test',
@@ -19,7 +19,7 @@ describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
         .to eq(["Keep a blank line before and after `#{access_modifier}`."])
     end
 
-    it 'requires blank line after #{access_modifier}' do
+    it "requires blank line after #{access_modifier}" do
       inspect_source(cop,
                      ['class Test',
                       '  something',
@@ -76,6 +76,16 @@ describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts missing blank line when at the end of block' do
+      inspect_source(cop,
+                     ['class Test',
+                      '  def test; end',
+                      '',
+                      "  #{access_modifier}",
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'recognizes blank lines with DOS style line endings' do
       inspect_source(cop,
                      ["class Test\r",

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

@@ -11,14 +11,14 @@ describe RuboCop::Cop::Style::Encoding, :config do
     end
 
     it 'registers no offense when no encoding present but only ASCII ' \
-       'characters', ruby: 1.9 do
+       'characters' do
       inspect_source(cop, ['def foo() end'])
 
       expect(cop.offenses).to be_empty
     end
 
     it 'registers an offense when there is no encoding present but non ' \
-       'ASCII characters', ruby: 1.9 do
+       'ASCII characters' do
       inspect_source(cop, ['def foo() \'ä\' end'])
 
       expect(cop.offenses.size).to eq(1)
@@ -27,7 +27,7 @@ describe RuboCop::Cop::Style::Encoding, :config do
     end
 
     it 'registers an offense when encoding present but only ASCII ' \
-       'characters', ruby: 1.9 do
+       'characters' do
       inspect_source(cop, ['# encoding: utf-8',
                            'def foo() end'])
 
@@ -36,20 +36,20 @@ describe RuboCop::Cop::Style::Encoding, :config do
         ['Unnecessary utf-8 encoding comment.'])
     end
 
-    it 'accepts an empty file', ruby: 1.9 do
+    it 'accepts an empty file' do
       inspect_source(cop, '')
 
       expect(cop.offenses).to be_empty
     end
 
-    it 'accepts encoding on first line', ruby: 1.9 do
+    it 'accepts encoding on first line' do
       inspect_source(cop, ['# encoding: utf-8',
                            'def foo() \'ä\' end'])
 
       expect(cop.offenses).to be_empty
     end
 
-    it 'accepts encoding on second line when shebang present', ruby: 1.9 do
+    it 'accepts encoding on second line when shebang present' do
       inspect_source(cop, ['#!/usr/bin/env ruby',
                            '# encoding: utf-8',
                            'def foo() \'ä\' end'])
@@ -57,7 +57,7 @@ describe RuboCop::Cop::Style::Encoding, :config do
       expect(cop.messages).to be_empty
     end
 
-    it 'books an offense when encoding is in the wrong place', ruby: 1.9 do
+    it 'books an offense when encoding is in the wrong place' do
       inspect_source(cop, ['def foo() \'ä\' end',
                            '# encoding: utf-8'])
 
@@ -66,20 +66,14 @@ describe RuboCop::Cop::Style::Encoding, :config do
         ['Missing utf-8 encoding comment.'])
     end
 
-    it 'does not register an offense on Ruby 2.0', ruby: 2.0 do
-      inspect_source(cop, ['def foo() \'ä\' end'])
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'accepts encoding inserted by magic_encoding gem', ruby: 1.9 do
+    it 'accepts encoding inserted by magic_encoding gem' do
       inspect_source(cop, ['# -*- encoding : utf-8 -*-',
                            'def foo() \'ä\' end'])
 
       expect(cop.messages).to be_empty
     end
 
-    it 'accepts vim-style encoding comments', ruby: 1.9 do
+    it 'accepts vim-style encoding comments' do
       inspect_source(cop, ['# vim:fileencoding=utf-8',
                            'def foo() \'ä\' end'])
       expect(cop.messages).to be_empty
@@ -91,7 +85,7 @@ describe RuboCop::Cop::Style::Encoding, :config do
       { 'EnforcedStyle' => 'always' }
     end
 
-    it 'registers an offense when no encoding present', ruby: 1.9 do
+    it 'registers an offense when no encoding present' do
       inspect_source(cop, ['def foo() end'])
 
       expect(cop.offenses.size).to eq(1)
@@ -99,20 +93,20 @@ describe RuboCop::Cop::Style::Encoding, :config do
         ['Missing utf-8 encoding comment.'])
     end
 
-    it 'accepts an empty file', ruby: 1.9 do
+    it 'accepts an empty file' do
       inspect_source(cop, '')
 
       expect(cop.offenses).to be_empty
     end
 
-    it 'accepts encoding on first line', ruby: 1.9 do
+    it 'accepts encoding on first line' do
       inspect_source(cop, ['# encoding: utf-8',
                            'def foo() end'])
 
       expect(cop.offenses).to be_empty
     end
 
-    it 'accepts encoding on second line when shebang present', ruby: 1.9 do
+    it 'accepts encoding on second line when shebang present' do
       inspect_source(cop, ['#!/usr/bin/env ruby',
                            '# encoding: utf-8',
                            'def foo() end'])
@@ -120,7 +114,7 @@ describe RuboCop::Cop::Style::Encoding, :config do
       expect(cop.messages).to be_empty
     end
 
-    it 'books an offense when encoding is in the wrong place', ruby: 1.9 do
+    it 'books an offense when encoding is in the wrong place' do
       inspect_source(cop, ['def foo() end',
                            '# encoding: utf-8'])
 
@@ -129,20 +123,14 @@ describe RuboCop::Cop::Style::Encoding, :config do
         ['Missing utf-8 encoding comment.'])
     end
 
-    it 'does not register an offense on Ruby 2.0', ruby: 2.0 do
-      inspect_source(cop, ['def foo() end'])
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'accepts encoding inserted by magic_encoding gem', ruby: 1.9 do
+    it 'accepts encoding inserted by magic_encoding gem' do
       inspect_source(cop, ['# -*- encoding : utf-8 -*-',
                            'def foo() end'])
 
       expect(cop.messages).to be_empty
     end
 
-    it 'accepts vim-style encoding comments', ruby: 1.9 do
+    it 'accepts vim-style encoding comments' do
       inspect_source(cop, ['# vim:fileencoding=utf-8',
                            'def foo() end'])
       expect(cop.messages).to be_empty