rubocop 0.10.0 → 0.11.0

data/spec/rubocop/cops/lint/useless_assignment_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Lint
+      describe UselessAssignment do
+        let(:cop) { UselessAssignment.new }
+
+        it 'registers an offence for def ending with lvar assignment' do
+          inspect_source(cop,
+                         ['def test',
+                          '  something',
+                          '  top = 5',
+                          'end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'registers an offence for defs ending with lvar assignment' do
+          inspect_source(cop,
+                         ['def Top.test',
+                          '  something',
+                          '  top = 5',
+                          'end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'registers an offence for def ending with lvar attr assignment' do
+          inspect_source(cop,
+                         ['def test',
+                          '  top = Top.new',
+                          '  top.attr = 5',
+                          'end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'registers an offence for defs ending with lvar attr assignment' do
+          inspect_source(cop,
+                         ['def Top.test',
+                          '  top = Top.new',
+                          '  top.attr = 5',
+                          'end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'is not confused by operators ending with =' do
+          inspect_source(cop,
+                         ['def test',
+                          '  top == 5',
+                          'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

data/spec/rubocop/cops/lint/useless_comparison_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Lint
+      describe UselessComparison do
+        let(:cop) { UselessComparison.new }
+
+        UselessComparison::OPS.each do |op|
+          it "registers an offence for a simple comparison with #{op}" do
+            inspect_source(cop,
+                           ["5 #{op} 5",
+                            "a #{op} a"
+                           ])
+            expect(cop.offences.size).to eq(2)
+          end
+
+          it "registers an offence for a complex comparison with #{op}" do
+            inspect_source(cop,
+                           ["5 + 10 * 30 #{op} 5 + 10 * 30",
+                            "a.top(x) #{op} a.top(x)"
+                           ])
+            expect(cop.offences.size).to eq(2)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -193,6 +193,15 @@ module Rubocop
           inspect_source(align, src)
           expect(align.offences).to be_empty
         end
+
+        it 'auto-corrects alignment' do
+          new_source = autocorrect_source(align, ['func(a,',
+                                                  '       b,',
+                                                  'c)'])
+          expect(new_source.split("\n")).to eq(['func(a,',
+                                                '     b,',
+                                                '     c)'])
+        end
       end
     end
   end

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

@@ -43,6 +43,18 @@ module Rubocop
           new_source = autocorrect_source(cop, 'true or false')
           expect(new_source).to eq('true || false')
         end
+
+        it 'leaves *or* as is if auto-correction changes the meaning' do
+          src = "teststring.include? 'a' or teststring.include? 'b'"
+          new_source = autocorrect_source(cop, src)
+          expect(new_source).to eq(src)
+        end
+
+        it 'leaves *and* as is if auto-correction changes the meaning' do
+          src = 'x = a + b and return x'
+          new_source = autocorrect_source(cop, src)
+          expect(new_source).to eq(src)
+        end
       end
     end
   end

data/spec/rubocop/cops/style/avoid_global_vars_spec.rb

@@ -10,7 +10,7 @@ module Rubocop
 
         it 'registers an offence for $custom' do
           inspect_source(cop, ['puts $custom'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         AvoidGlobalVars::BUILT_IN_VARS.each do |var|

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

@@ -6,28 +6,71 @@ module Rubocop
   module Cop
     module Style
       describe Blocks do
-        let(:blocks) { Blocks.new }
-
-        it 'registers an offence for a multiline block with braces' do
-          inspect_source(blocks, ['each { |x|',
-                                  '}'])
-          expect(blocks.messages).to eq([Blocks::MULTI_LINE_MSG])
-        end
+        let(:cop) { Blocks.new }
 
         it 'accepts a multiline block with do-end' do
-          inspect_source(blocks, ['each do |x|',
-                                  'end'])
-          expect(blocks.offences.map(&:message)).to be_empty
+          inspect_source(cop, ['each do |x|',
+                               'end'])
+          expect(cop.offences).to be_empty
         end
 
         it 'registers an offence for a single line block with do-end' do
-          inspect_source(blocks, ['each do |x| end'])
-          expect(blocks.messages).to eq([Blocks::SINGLE_LINE_MSG])
+          inspect_source(cop, ['each do |x| end'])
+          expect(cop.messages).to eq([Blocks::SINGLE_LINE_MSG])
         end
 
         it 'accepts a single line block with braces' do
-          inspect_source(blocks, ['each { |x| }'])
-          expect(blocks.offences.map(&:message)).to be_empty
+          inspect_source(cop, ['each { |x| }'])
+          expect(cop.offences).to be_empty
+        end
+
+        context 'when there are braces around a multi-line block' do
+          it 'registers an offence in the simple case' do
+            inspect_source(cop, ['each { |x|',
+                                 '}'])
+            expect(cop.messages).to eq([Blocks::MULTI_LINE_MSG])
+          end
+
+          it 'accepts braces if do-end would change the meaning' do
+            src = ['scope :foo, lambda { |f|',
+                   '  where(condition: "value")',
+                   '}',
+                   '',
+                   'expect { something }.to raise_error(ErrorClass) { |error|',
+                   '  # ...',
+                   '}',
+                   '',
+                   'expect { x }.to change {',
+                   '  Counter.count',
+                   '}.from(0).to(1)']
+            inspect_source(cop, src)
+            expect(cop.offences).to be_empty
+          end
+
+          it 'registers an offence for braces if do-end would not change ' +
+            'the meaning' do
+            src = ['scope :foo, (lambda { |f|',
+                   '  where(condition: "value")',
+                   '})',
+                   '',
+                   'expect { something }.to(raise_error(ErrorClass) { |error|',
+                   '  # ...',
+                   '})']
+            inspect_source(cop, src)
+            expect(cop.offences.size).to eq(2)
+          end
+
+          it 'can handle special method names such as []= and done?' do
+            src = ['h2[k2] = Hash.new { |h3,k3|',
+                   '  h3[k3] = 0',
+                   '}',
+                   '',
+                   'x = done? list.reject { |e|',
+                   '  e.nil?',
+                   '}']
+            inspect_source(cop, src)
+            expect(cop.messages).to eq([Blocks::MULTI_LINE_MSG])
+          end
         end
       end
     end

data/spec/rubocop/cops/style/character_literal_spec.rb

@@ -10,12 +10,12 @@ module Rubocop
 
         it 'registers an offence for character literals' do
           inspect_source(cop, ['x = ?x'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'registers an offence for literals like \n' do
           inspect_source(cop, ['x = ?\n'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'accepts literals like ?\C-\M-d' do

data/spec/rubocop/cops/style/comment_annotation_spec.rb

@@ -6,11 +6,24 @@ module Rubocop
   module Cop
     module Style
       describe CommentAnnotation do
+        before do
+          CommentAnnotation.config = {
+            'Keywords' => %w(TODO FIXME OPTIMIZE HACK REVIEW)
+          }
+        end
         let(:cop) { CommentAnnotation.new }
 
         it 'registers an offence for a missing colon' do
           inspect_source(cop, ['# TODO make better'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'registers an offence for a missing colon after configured word' do
+          CommentAnnotation.config = {
+            'Keywords' => %w(ISSUE)
+          }
+          inspect_source(cop, ['# ISSUE wrong order'])
+          expect(cop.offences.size).to eq(1)
         end
 
         context 'when used with the clang formatter' do
@@ -29,17 +42,17 @@ module Rubocop
 
         it 'registers an offence for lower case' do
           inspect_source(cop, ['# fixme: does not work'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'registers an offence for capitalized annotation keyword' do
           inspect_source(cop, ['# Optimize: does not work'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'registers an offence for upper case with colon but no note' do
           inspect_source(cop, ['# HACK:'])
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'accepts upper case keyword with colon, space and note' do
@@ -56,6 +69,21 @@ module Rubocop
           inspect_source(cop, ['# Todo.destroy(1)'])
           expect(cop.offences).to be_empty
         end
+
+        it 'accepts a keyword that is just the beginning of a sentence' do
+          inspect_source(cop,
+                         ["# Optimize if you want. I wouldn't recommend it.",
+                          '# Hack is a fun game.'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a word without colon if not in the configuration' do
+          CommentAnnotation.config = {
+            'Keywords' => %w(FIXME OPTIMIZE HACK REVIEW)
+          }
+          inspect_source(cop, ['# TODO make better'])
+          expect(cop.offences).to be_empty
+        end
       end
     end
   end

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

@@ -27,6 +27,11 @@ module Rubocop
             inspect_source(cop, ['puts something'])
             expect(cop.offences).to be_empty
           end
+
+          it 'does not err on method call without a method name' do
+            inspect_source(cop, ['l.', '(1)'])
+            expect(cop.offences.size).to eq(1)
+          end
         end
 
         context 'Trailing dots style' do
@@ -48,6 +53,11 @@ module Rubocop
             inspect_source(cop, ['puts something'])
             expect(cop.offences).to be_empty
           end
+
+          it 'does not err on method call without a method name' do
+            inspect_source(cop, ['l', '.(1)'])
+            expect(cop.offences.size).to eq(1)
+          end
         end
 
         context 'Unknown style' do

data/spec/rubocop/cops/style/empty_line_between_defs_spec.rb

@@ -79,6 +79,18 @@ module Rubocop
           inspect_source(empty_lines, source)
           expect(empty_lines.offences.map(&:message)).to be_empty
         end
+
+        it 'accepts a nested def' do
+          source = ['def mock_model(*attributes)',
+                    '  Class.new do',
+                    '    def initialize(attrs)',
+                    '    end',
+                    '  end',
+                    'end',
+                   ]
+          inspect_source(empty_lines, source)
+          expect(empty_lines.offences.map(&:message)).to be_empty
+        end
       end
     end
   end

data/spec/rubocop/cops/style/end_of_line_spec.rb

@@ -9,6 +9,7 @@ module Rubocop
         let(:eol) { EndOfLine.new }
 
         it 'registers an offence for CR+LF' do
+          pending 'Fails after upgdate to parser-2.0.0.pre3.'
           inspect_source(eol, ["x=0\r", ''])
           expect(eol.offences.map(&:message)).to eq(
             ['Carriage return character detected.'])

data/spec/rubocop/cops/style/favor_modifier_spec.rb

@@ -27,6 +27,24 @@ module Rubocop
              ' &&/||.'])
         end
 
+        it 'registers an offence for short multiline if near an else etc' do
+           inspect_source(if_unless,
+                          ['if x',
+                           '  y',
+                           'elsif x1',
+                           '  y1',
+                           'else',
+                           '  z',
+                           'end',
+                           'n = a ? 0 : 1',
+                           'm = 3 if m0',
+                           '',
+                           'if a',
+                           '  b',
+                           'end'])
+          expect(if_unless.offences.size).to eq(1)
+        end
+
         it "accepts multiline if that doesn't fit on one line" do
           check_too_long(if_unless, 'if')
         end

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

@@ -31,8 +31,13 @@ module Rubocop
           expect(hash_syntax.offences.map(&:message)).to be_empty
         end
 
-        it 'accepts hash rockets when keys special symbols in them' do
-          inspect_source(hash_syntax, ['x = { :"t o" => 0, :"\xab" => 1 }'])
+        it 'accepts hash rockets when keys have whitespaces in them' do
+          inspect_source(hash_syntax, ['x = { :"t o" => 0 }'])
+          expect(hash_syntax.offences.map(&:message)).to be_empty
+        end
+
+        it 'accepts hash rockets when keys have special symbols in them' do
+          inspect_source(hash_syntax, ['x = { :"\tab" => 1 }'])
           expect(hash_syntax.offences.map(&:message)).to be_empty
         end
 

data/spec/rubocop/cops/style/module_function_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Style
+      describe ModuleFunction do
+        let(:cop) { described_class.new }
+
+        it 'registers an offence for extend self in module' do
+          inspect_source(cop,
+                         ['module Test',
+                          '  extend self',
+                          '  def test; end',
+                          'end'])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts extend self in class' do
+          inspect_source(cop,
+                         ['class Test',
+                          '  extend self',
+                          'end'])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

data/spec/rubocop/cops/style/redundant_begin_spec.rb

@@ -17,7 +17,7 @@ module Rubocop
                  '  end',
                  'end']
           inspect_source(cop, src)
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'reports an offence for defs with redundant begin block' do
@@ -29,7 +29,7 @@ module Rubocop
                  '  end',
                  'end']
           inspect_source(cop, src)
-          expect(cop.offences).to have(1).item
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'accepts a def with required begin block' do