rubocop 0.12.0 → 0.13.0

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe EmptyLines do
-        let(:empty_lines) { EmptyLines.new }
+        subject(:empty_lines) { EmptyLines.new }
 
         it 'registers an offence for consecutive empty lines' do
           inspect_source(empty_lines,

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

@@ -6,14 +6,14 @@ module Rubocop
   module Cop
     module Style
       describe EmptyLiteral do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         describe 'Empty Array' do
           it 'registers an offence for Array.new()' do
             inspect_source(cop,
                            ['test = Array.new()'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::ARR_MSG])
           end
 
@@ -21,7 +21,7 @@ module Rubocop
             inspect_source(cop,
                            ['test = Array.new'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::ARR_MSG])
           end
 
@@ -42,7 +42,7 @@ module Rubocop
             inspect_source(cop,
                            ['test = Hash.new()'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::HASH_MSG])
           end
 
@@ -50,7 +50,7 @@ module Rubocop
             inspect_source(cop,
                            ['test = Hash.new'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::HASH_MSG])
           end
 
@@ -77,7 +77,7 @@ module Rubocop
             inspect_source(cop,
                            ['test = String.new()'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::STR_MSG])
           end
 
@@ -85,7 +85,7 @@ module Rubocop
             inspect_source(cop,
                            ['test = String.new'])
             expect(cop.offences.size).to eq(1)
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq([EmptyLiteral::STR_MSG])
           end
 

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

@@ -6,12 +6,12 @@ module Rubocop
   module Cop
     module Style
       describe Encoding do
-        let(:encoding) { Encoding.new }
+        subject(:encoding) { Encoding.new }
 
         it 'registers an offence when no encoding present', ruby: 1.9 do
           inspect_source(encoding, ['def foo() end'])
 
-          expect(encoding.offences.map(&:message)).to eq(
+          expect(encoding.messages).to eq(
             ['Missing utf-8 encoding comment.'])
         end
 
@@ -27,14 +27,14 @@ module Rubocop
                                     '# encoding: utf-8',
                                     'def foo() end'])
 
-          expect(encoding.offences.map(&:message)).to be_empty
+          expect(encoding.messages).to be_empty
         end
 
         it 'books an offence when encoding is in the wrong place', ruby: 1.9 do
           inspect_source(encoding, ['def foo() end',
                                     '# encoding: utf-8'])
 
-          expect(encoding.offences.map(&:message)).to eq(
+          expect(encoding.messages).to eq(
             ['Missing utf-8 encoding comment.'])
         end
 
@@ -48,7 +48,13 @@ module Rubocop
           inspect_source(encoding, ['# -*- encoding : utf-8 -*-',
                                     'def foo() end'])
 
-          expect(encoding.offences.map(&:message)).to be_empty
+          expect(encoding.messages).to be_empty
+        end
+
+        it 'accepts vim-style encoding comments', ruby: 1.9 do
+          inspect_source(encoding, ['# vim:fileencoding=utf-8',
+                                    'def foo() end'])
+          expect(encoding.messages).to be_empty
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe EndBlock do
-        let(:cop) { EndBlock.new }
+        subject(:cop) { EndBlock.new }
 
         it 'reports an offence for an END block' do
           src = ['END { test }']

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

@@ -6,18 +6,19 @@ module Rubocop
   module Cop
     module Style
       describe EndOfLine do
-        let(:eol) { EndOfLine.new }
+        subject(: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(
+          expect(eol.messages).to eq(
             ['Carriage return character detected.'])
         end
 
         it 'registers an offence for CR at end of file' do
+          pending
           inspect_source(eol, ["x=0\r"])
-          expect(eol.offences.map(&:message)).to eq(
+          expect(eol.messages).to eq(
             ['Carriage return character detected.'])
         end
       end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe EvenOdd do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for x % 2 == 0' do
           inspect_source(cop,

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

@@ -6,13 +6,13 @@ module Rubocop
   module Cop
     module Style
       describe FavorJoin do
-        let(:fj) { FavorJoin.new }
+        subject(:fj) { FavorJoin.new }
 
         it 'registers an offence for an array followed by string' do
           inspect_source(fj,
                          ['%w(one two three) * ", "'])
           expect(fj.offences.size).to eq(1)
-          expect(fj.offences.map(&:message))
+          expect(fj.messages)
             .to eq([FavorJoin::MSG])
         end
 

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

@@ -6,9 +6,12 @@ module Rubocop
   module Cop
     module Style
       describe FavorModifier do
-        let(:if_unless) { IfUnlessModifier.new }
-        let(:while_until) { WhileUntilModifier.new }
-        before { LineLength.config = { 'Max' => 79 } }
+        let(:if_unless) { IfUnlessModifier.new(config) }
+        let(:while_until) { WhileUntilModifier.new(config) }
+        let(:config) do
+          hash = { 'LineLength' => { 'Max' => 79 } }
+          Rubocop::Config.new(hash)
+        end
 
         it 'registers an offence for multiline if that fits on one line' do
           # This if statement fits exactly on one line if written as a
@@ -21,7 +24,7 @@ module Rubocop
                          ["  if #{condition}",
                           "    #{body}",
                           '  end'])
-          expect(if_unless.offences.map(&:message)).to eq(
+          expect(if_unless.messages).to eq(
             ['Favor modifier if/unless usage when you have a single-line' +
              ' body. Another good alternative is the usage of control flow' +
              ' &&/||.'])
@@ -55,9 +58,9 @@ module Rubocop
 
         it 'registers an offence for multiline unless that fits on one line' do
           inspect_source(if_unless, ['unless a',
-                                    '  b',
-                                    'end'])
-          expect(if_unless.offences.map(&:message)).to eq(
+                                     '  b',
+                                     'end'])
+          expect(if_unless.messages).to eq(
             ['Favor modifier if/unless usage when you have a single-line' +
              ' body. Another good alternative is the usage of control flow' +
              ' &&/||.'])
@@ -74,7 +77,7 @@ module Rubocop
           inspect_source(if_unless,
                          ['if args.last.is_a? Hash then args.pop else ' +
                           'Hash.new end'])
-          expect(if_unless.offences.map(&:message)).to be_empty
+          expect(if_unless.messages).to be_empty
         end
 
         it "accepts multiline unless that doesn't fit on one line" do
@@ -145,7 +148,7 @@ module Rubocop
           inspect_source(cop, ["#{keyword} a",
                                '  b',
                                'end'])
-          expect(cop.offences.map(&:message)).to eq(
+          expect(cop.messages).to eq(
             ['Favor modifier while/until usage when you have a single-line ' +
              'body.'])
           expect(cop.offences.map { |o| o.location.source }).to eq([keyword])
@@ -171,7 +174,7 @@ module Rubocop
                           "  require 'simplecov'",
                           '  SimpleCov.start',
                           'end'])
-          expect(cop.offences.map(&:message)).to be_empty
+          expect(cop.messages).to be_empty
         end
       end
     end

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

@@ -6,13 +6,13 @@ module Rubocop
   module Cop
     module Style
       describe FavorSprintf do
-        let(:fs) { FavorSprintf.new }
+        subject(:fs) { FavorSprintf.new }
 
         it 'registers an offence for a string followed by something' do
           inspect_source(fs,
                          ['puts "%d" % 10'])
           expect(fs.offences.size).to eq(1)
-          expect(fs.offences.map(&:message))
+          expect(fs.messages)
             .to eq([FavorSprintf::MSG])
         end
 
@@ -20,7 +20,7 @@ module Rubocop
           inspect_source(fs,
                          ['puts x % [10, 11]'])
           expect(fs.offences.size).to eq(1)
-          expect(fs.offences.map(&:message))
+          expect(fs.messages)
             .to eq([FavorSprintf::MSG])
         end
 
@@ -44,7 +44,7 @@ module Rubocop
           inspect_source(fs,
                          ['puts "#{x * 5} %d #{@test}" % 10'])
           expect(fs.offences.size).to eq(1)
-          expect(fs.offences.map(&:message))
+          expect(fs.messages)
             .to eq([FavorSprintf::MSG])
         end
       end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe FavorUnlessOverNegatedIf do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for if with exclamation point condition' do
           inspect_source(cop,

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe FavorUntilOverNegatedWhile do
-        let(:fav_until) { FavorUntilOverNegatedWhile.new }
+        subject(:fav_until) { FavorUntilOverNegatedWhile.new }
 
         it 'registers an offence for while with exclamation point condition' do
           inspect_source(fav_until,
@@ -15,7 +15,7 @@ module Rubocop
                           'end',
                           'some_method while !a_condition',
                          ])
-          expect(fav_until.offences.map(&:message)).to eq(
+          expect(fav_until.messages).to eq(
             ['Favor until over while for negative conditions.'] * 2)
         end
 
@@ -25,7 +25,7 @@ module Rubocop
                           '  some_method',
                           'end',
                           'some_method while not a_condition'])
-          expect(fav_until.offences.map(&:message)).to eq(
+          expect(fav_until.messages).to eq(
             ['Favor until over while for negative conditions.'] * 2)
           expect(fav_until.offences.map(&:line)).to eq([1, 4])
         end
@@ -39,7 +39,7 @@ module Rubocop
                           '  some_method',
                           'end',
                           'some_method while not a_condition or other_cond'])
-          expect(fav_until.offences.map(&:message)).to be_empty
+          expect(fav_until.messages).to be_empty
         end
       end
     end

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Style
+      describe FinalNewline do
+        subject(:cop) { described_class.new }
+
+        it 'registers an offence for missing final newline' do
+          source = ['x = 0', 'top']
+          inspect_source(cop, source)
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts a final newline' do
+          source = ['x = 0', 'top', '']
+          inspect_source(cop, source)
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

data/spec/rubocop/cop/style/{avoid_for_spec.rb → for_spec.rb}

@@ -5,31 +5,27 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe AvoidFor do
-        let(:af) { AvoidFor.new }
+      describe For do
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for for' do
-          inspect_source(af,
+          inspect_source(cop,
                          ['def func',
                           '  for n in [1, 2, 3] do',
                           '    puts n',
                           '  end',
                           'end'])
-          expect(af.offences.size).to eq(1)
-          expect(af.offences.map(&:message))
-            .to eq([AvoidFor::MSG])
+          expect(cop.offences.size).to eq(1)
         end
 
         it 'does not register an offence for :for' do
-          inspect_source(af,
-                         ['[:for, :ala, :bala]'])
-          expect(af.offences).to be_empty
+          inspect_source(cop, ['[:for, :ala, :bala]'])
+          expect(cop.offences).to be_empty
         end
 
         it 'does not register an offence for def for' do
-          inspect_source(af,
-                         ['def for; end'])
-          expect(af.offences).to be_empty
+          inspect_source(cop, ['def for; end'])
+          expect(cop.offences).to be_empty
         end
       end
     end

data/spec/rubocop/cop/style/{avoid_global_vars_spec.rb → global_vars_spec.rb}

@@ -5,15 +5,25 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe AvoidGlobalVars do
-        let(:cop) { AvoidGlobalVars.new }
+      describe GlobalVars, :config do
+        cop_config = {
+          'AllowedVariables' => ['$allowed']
+        }
+
+        subject(:cop) { described_class.new(config) }
+        let(:cop_config) { cop_config }
 
         it 'registers an offence for $custom' do
           inspect_source(cop, ['puts $custom'])
           expect(cop.offences.size).to eq(1)
         end
 
-        AvoidGlobalVars::BUILT_IN_VARS.each do |var|
+        it 'allows user whitelisted variables' do
+          inspect_source(cop, ['puts $allowed'])
+          expect(cop.offences).to be_empty
+        end
+
+        described_class::BUILT_IN_VARS.each do |var|
           it "does not register an offence for built-in variable #{var}" do
             inspect_source(cop, ["puts #{var}"])
             expect(cop.offences).to be_empty

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe HashMethods do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for has_key? with one arg' do
           inspect_source(cop,

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

@@ -6,49 +6,60 @@ module Rubocop
   module Cop
     module Style
       describe HashSyntax do
-        let(:hash_syntax) { HashSyntax.new }
+        subject(:hash_syntax) { HashSyntax.new }
 
         it 'registers offence for hash rocket syntax when new is possible' do
           inspect_source(hash_syntax, ['x = { :a => 0 }'])
-          expect(hash_syntax.offences.map(&:message)).to eq(
+          expect(hash_syntax.messages).to eq(
             ['Ruby 1.8 hash syntax detected'])
         end
 
         it 'registers an offence for mixed syntax when new is possible' do
           inspect_source(hash_syntax, ['x = { :a => 0, b: 1 }'])
-          expect(hash_syntax.offences.map(&:message)).to eq(
+          expect(hash_syntax.messages).to eq(
             ['Ruby 1.8 hash syntax detected'])
         end
 
         it 'registers an offence for hash rockets in method calls' do
           inspect_source(hash_syntax, ['func(3, :a => 0)'])
-          expect(hash_syntax.offences.map(&:message)).to eq(
+          expect(hash_syntax.messages).to eq(
             ['Ruby 1.8 hash syntax detected'])
         end
 
         it 'accepts hash rockets when keys have different types' do
           inspect_source(hash_syntax, ['x = { :a => 0, "b" => 1 }'])
-          expect(hash_syntax.offences.map(&:message)).to be_empty
+          expect(hash_syntax.messages).to be_empty
         end
 
         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
+          expect(hash_syntax.messages).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
+          expect(hash_syntax.messages).to be_empty
+        end
+
+        it 'accepts hash rockets when keys start with a digit' do
+          inspect_source(hash_syntax, ['x = { :"1" => 1 }'])
+          expect(hash_syntax.messages).to be_empty
+        end
+
+        it 'registers offence when keys start with an uppercase letter' do
+          inspect_source(hash_syntax, ['x = { :A => 0 }'])
+          expect(hash_syntax.messages).to eq(
+            ['Ruby 1.8 hash syntax detected'])
         end
 
         it 'accepts new syntax in a hash literal' do
           inspect_source(hash_syntax, ['x = { a: 0, b: 1 }'])
-          expect(hash_syntax.offences.map(&:message)).to be_empty
+          expect(hash_syntax.messages).to be_empty
         end
 
         it 'accepts new syntax in method calls' do
           inspect_source(hash_syntax, ['func(3, a: 0)'])
-          expect(hash_syntax.offences.map(&:message)).to be_empty
+          expect(hash_syntax.messages).to be_empty
         end
       end
     end