rubocop 0.12.0 → 0.13.0

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe AlignParameters do
-        let(:align) { AlignParameters.new }
+        subject(:align) { AlignParameters.new }
 
         it 'registers an offence for parameters with single indent' do
           inspect_source(align, ['function(a,',
@@ -22,7 +22,7 @@ module Rubocop
 
         it 'accepts multiline []= method call' do
           inspect_source(align, ['Test.config["something"] =',
-                                            ' true'])
+                                 ' true'])
           expect(align.offences).to be_empty
         end
 

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe AndOr do
-        let(:cop) { AndOr.new }
+        subject(:cop) { AndOr.new }
 
         it 'registers an offence for OR' do
           inspect_source(cop,

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

@@ -6,14 +6,14 @@ module Rubocop
   module Cop
     module Style
       describe AsciiComments do
-        let(:ascii) { AsciiComments.new }
+        subject(:ascii) { AsciiComments.new }
 
         it 'registers an offence for a comment with non-ascii chars' do
           inspect_source(ascii,
                          ['# encoding: utf-8',
                           '# 这是什么？'])
           expect(ascii.offences.size).to eq(1)
-          expect(ascii.offences.map(&:message))
+          expect(ascii.messages)
             .to eq([AsciiComments::MSG])
         end
 

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

@@ -6,14 +6,14 @@ module Rubocop
   module Cop
     module Style
       describe AsciiIdentifiers do
-        let(:ascii) { AsciiIdentifiers.new }
+        subject(:ascii) { AsciiIdentifiers.new }
 
         it 'registers an offence for a variable name with non-ascii chars' do
           inspect_source(ascii,
                          ['# encoding: utf-8',
                           'älg = 1'])
           expect(ascii.offences.size).to eq(1)
-          expect(ascii.offences.map(&:message))
+          expect(ascii.messages)
             .to eq([AsciiIdentifiers::MSG])
         end
 

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Attr do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence attr' do
           inspect_source(cop, ['class SomeClass',

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

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

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe BlockComments do
-        let(:block) { BlockComments.new }
+        subject(:block) { BlockComments.new }
 
         it 'registers an offence for block comments' do
           inspect_source(block,

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

@@ -5,9 +5,9 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe BlockNesting do
-        let(:block_nesting) { BlockNesting.new }
-        before { BlockNesting.config = { 'Max' => 2 } }
+      describe BlockNesting, :config do
+        subject(:block_nesting) { BlockNesting.new(config) }
+        let(:cop_config) { { 'Max' => 2 } }
 
         it 'accepts `Max` levels of nesting' do
           source = ['if a',

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Blocks do
-        let(:cop) { Blocks.new }
+        subject(:cop) { described_class.new }
 
         it 'accepts a multiline block with do-end' do
           inspect_source(cop, ['each do |x|',
@@ -24,6 +24,11 @@ module Rubocop
           expect(cop.offences).to be_empty
         end
 
+        it 'auto-corrects do and end for single line blocks to { and }' do
+          new_source = autocorrect_source(cop, 'block do |x| end')
+          expect(new_source).to eq('block { |x| }')
+        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|',
@@ -71,6 +76,25 @@ module Rubocop
             inspect_source(cop, src)
             expect(cop.messages).to eq([Blocks::MULTI_LINE_MSG])
           end
+
+          it 'auto-corrects do and end for single line blocks to { and }' do
+            source = <<-END.strip_indent
+              each { |x|
+                some_method
+                other_method
+              }
+            END
+
+            expected_source = <<-END.strip_indent
+              each do |x|
+                some_method
+                other_method
+              end
+            END
+
+            new_source = autocorrect_source(cop, source)
+            expect(new_source).to eq(expected_source)
+          end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe CaseEquality do
-        let(:ce) { CaseEquality.new }
+        subject(:ce) { CaseEquality.new }
 
         it 'registers an offence for ===' do
           inspect_source(ce, ['Array === var'])

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe CaseIndentation do
-        let(:ind) { CaseIndentation.new }
+        subject(:ind) { CaseIndentation.new }
 
         it "registers an offence for a when clause that's deeper than case" do
           source = ['case a',
@@ -16,7 +16,7 @@ module Rubocop
                     '        end',
                     'end']
           inspect_source(ind, source)
-          expect(ind.offences.map(&:message)).to eq(
+          expect(ind.messages).to eq(
             ['Indent when as deep as case.'] * 2)
         end
 
@@ -44,7 +44,7 @@ module Rubocop
                     'end',
                     '']
           inspect_source(ind, source)
-          expect(ind.offences.map(&:message)).to be_empty
+          expect(ind.messages).to be_empty
         end
 
         it "doesn't get confused by symbols named case or when" do
@@ -57,7 +57,7 @@ module Rubocop
                     'end',
                     '']
           inspect_source(ind, source)
-          expect(ind.offences.map(&:message)).to be_empty
+          expect(ind.messages).to be_empty
         end
 
         it 'accepts correctly indented whens in complex combinations' do
@@ -80,7 +80,7 @@ module Rubocop
                     'end',
                     '']
           inspect_source(ind, source)
-          expect(ind.offences.map(&:message)).to be_empty
+          expect(ind.messages).to be_empty
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe CharacterLiteral do
-        let(:cop) { CharacterLiteral.new }
+        subject(:cop) { CharacterLiteral.new }
 
         it 'registers an offence for character literals' do
           inspect_source(cop, ['x = ?x'])

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe ClassAndModuleCamelCase do
-        let(:camel_case) { ClassAndModuleCamelCase.new }
+        subject(:camel_case) { ClassAndModuleCamelCase.new }
 
         it 'registers an offence for underscore in class and module name' do
           inspect_source(camel_case,

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe ClassMethods do
-        let(:cm) { ClassMethods.new }
+        subject(:cm) { ClassMethods.new }
 
         it 'registers an offence for methods using a class name' do
           inspect_source(cm,

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Style
+      describe ClassVars do
+        subject(:cop) { described_class.new }
+
+        it 'registers an offence for class variable declaration' do
+          inspect_source(cop, ['class TestClass; @@test = 10; end'])
+          expect(cop.offences.size).to eq(1)
+          expect(cop.messages)
+            .to eq(['Replace class var @@test with a class instance var.'])
+        end
+
+        it 'does not register an offence for class variable usage' do
+          inspect_source(cop, ['@@test.test(20)'])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

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

@@ -5,8 +5,8 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe CollectionMethods do
-        CollectionMethods.config = {
+      describe CollectionMethods, :config do
+        cop_config = {
           'PreferredMethods' => {
             'collect' => 'map',
             'inject' => 'reduce',
@@ -15,13 +15,13 @@ module Rubocop
           }
         }
 
-        let(:cop) { CollectionMethods.new }
+        subject(:cop) { CollectionMethods.new(config) }
+        let(:cop_config) { cop_config }
 
-        CollectionMethods.preferred_methods.keys.each do |method|
+        cop_config['PreferredMethods'].each do |method, preferred_method|
           it "registers an offence for #{method} with block" do
             inspect_source(cop, ["[1, 2, 3].#{method} { |e| e + 1 }"])
             expect(cop.offences.size).to eq(1)
-            preferred_method = CollectionMethods.preferred_methods[method]
             expect(cop.messages)
               .to eq(["Prefer #{preferred_method} over #{method}."])
           end
@@ -29,7 +29,6 @@ module Rubocop
           it "registers an offence for #{method} with proc param" do
             inspect_source(cop, ["[1, 2, 3].#{method}(&:test)"])
             expect(cop.offences.size).to eq(1)
-            preferred_method = CollectionMethods.preferred_methods[method]
             expect(cop.messages)
               .to eq(["Prefer #{preferred_method} over #{method}."])
           end

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

@@ -7,9 +7,6 @@ module Rubocop
     module Style
       describe ColonMethodCall do
         subject(:cop) { described_class.new }
-        before do
-          described_class.config = {}
-        end
 
         it 'registers an offence for instance method call' do
           inspect_source(cop,

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

@@ -5,25 +5,24 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe CommentAnnotation do
-        before do
-          CommentAnnotation.config = {
-            'Keywords' => %w(TODO FIXME OPTIMIZE HACK REVIEW)
-          }
+      describe CommentAnnotation, :config do
+        subject(:cop) { CommentAnnotation.new(config) }
+        let(:cop_config) do
+          { '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.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)
+        context 'with configured keyword' do
+          let(:cop_config) { { 'Keywords' => %w(ISSUE) } }
+
+          it 'registers an offence for a missing colon after the word' do
+            inspect_source(cop, ['# ISSUE wrong order'])
+            expect(cop.offences.size).to eq(1)
+          end
         end
 
         context 'when used with the clang formatter' do
@@ -77,12 +76,15 @@ module Rubocop
           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
+        context 'when a keyword is not in the configuration' do
+          let(:cop_config) do
+            { 'Keywords' => %w(FIXME OPTIMIZE HACK REVIEW) }
+          end
+
+          it 'accepts the word without colon' do
+            inspect_source(cop, ['# TODO make better'])
+            expect(cop.offences).to be_empty
+          end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe ConstantName do
-        let(:const) { ConstantName.new }
+        subject(:const) { ConstantName.new }
 
         it 'registers an offence for camel case in const name' do
           inspect_source(const,

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe DefWithParentheses do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'reports an offence for def with empty parens' do
           src = ['def func()',

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe DefWithoutParentheses do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'reports an offence for def with parameters but no parens' do
           src = ['def func a, b',

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Documentation do
-        let(:documentation) { Documentation.new }
+        subject(:documentation) { Documentation.new }
 
         it 'registers an offence for non-empty class' do
           inspect_source(documentation,

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

@@ -5,11 +5,11 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe DotPosition do
-        let(:cop) { DotPosition.new }
+      describe DotPosition, :config do
+        subject(:cop) { DotPosition.new(config) }
 
         context 'Leading dots style' do
-          before { DotPosition.config = { 'Style' => 'Leading' } }
+          let(:cop_config) { { 'Style' => 'Leading' } }
 
           it 'registers an offence for trailing dot in multi-line call' do
             inspect_source(cop, ['something.',
@@ -35,7 +35,7 @@ module Rubocop
         end
 
         context 'Trailing dots style' do
-          before { DotPosition.config = { 'Style' => 'Trailing' } }
+          let(:cop_config) { { 'Style' => 'Trailing' } }
 
           it 'registers an offence for leading dot in multi-line call' do
             inspect_source(cop, ['something',
@@ -61,7 +61,7 @@ module Rubocop
         end
 
         context 'Unknown style' do
-          before { DotPosition.config = { 'Style' => 'test' } }
+          let(:cop_config) { { 'Style' => 'test' } }
 
           it 'raises an exception' do
             expect do

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

@@ -5,8 +5,9 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe EmptyLineBetweenDefs do
-        let(:empty_lines) { EmptyLineBetweenDefs.new }
+      describe EmptyLineBetweenDefs, :config do
+        subject(:empty_lines) { EmptyLineBetweenDefs.new(config) }
+        let(:cop_config) { { 'AllowAdjacentOneLineDefs' => false } }
 
         it 'finds offences in inner classes' do
           inspect_source(empty_lines, ['class K',
@@ -77,7 +78,7 @@ module Rubocop
                     'end',
                    ]
           inspect_source(empty_lines, source)
-          expect(empty_lines.offences.map(&:message)).to be_empty
+          expect(empty_lines.messages).to be_empty
         end
 
         it 'accepts a nested def' do
@@ -89,7 +90,37 @@ module Rubocop
                     'end',
                    ]
           inspect_source(empty_lines, source)
-          expect(empty_lines.offences.map(&:message)).to be_empty
+          expect(empty_lines.messages).to be_empty
+        end
+
+        it 'registers an offence for adjacent one-liners by default' do
+          source = ['def a; end',
+                    'def b; end']
+          inspect_source(empty_lines, source)
+          expect(empty_lines.offences).to have(1).item
+        end
+
+        context 'when AllowAdjacentOneLineDefs is enabled' do
+          let(:cop_config) { { 'AllowAdjacentOneLineDefs' => true } }
+
+          it 'accepts adjacent one-liners' do
+            source = ['def a; end',
+                      'def b; end']
+            inspect_source(empty_lines, source)
+            expect(empty_lines.offences).to be_empty
+          end
+
+          it 'registers an offence for adjacent defs if some are multi-line' do
+            source = ['def a; end',
+                      'def b; end',
+                      'def c', # Not a one-liner, so this is an offence.
+                      'end',
+                      # Also an offence since previous was multi-line:
+                      'def d; end'
+                     ]
+            inspect_source(empty_lines, source)
+            expect(empty_lines.offences.map(&:line)).to eq([3, 5])
+          end
         end
       end
     end