rubocop 0.12.0 → 0.13.0

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

@@ -6,18 +6,18 @@ module Rubocop
   module Cop
     module Style
       describe IfWithSemicolon do
-        let(:iws) { IfWithSemicolon.new }
+        subject(:iws) { IfWithSemicolon.new }
 
         it 'registers an offence for one line if/;/end' do
           inspect_source(iws, ['if cond; run else dont end'])
-          expect(iws.offences.map(&:message)).to eq(
+          expect(iws.messages).to eq(
             ['Never use if x; Use the ternary operator instead.'])
         end
 
         it 'can handle modifier conditionals' do
           inspect_source(iws, ['class Hash',
                                'end if RUBY_VERSION < "1.8.7"'])
-          expect(iws.offences.map(&:message)).to be_empty
+          expect(iws.messages).to be_empty
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe IndentationWidth do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         context 'with if statement' do
           it 'registers an offence for bad indentation of an if body' do
@@ -14,7 +14,7 @@ module Rubocop
                            ['if cond',
                             ' func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -25,7 +25,7 @@ module Rubocop
                             'else',
                             ' func2',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -38,7 +38,7 @@ module Rubocop
                             'else',
                             '  c',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -49,7 +49,7 @@ module Rubocop
                             'else',
                             '     x ? y : z',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 5) spaces for indentation.'])
           end
 
@@ -60,7 +60,7 @@ module Rubocop
                             'else',
                             '   x if y',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 3) spaces for indentation.'])
           end
 
@@ -128,7 +128,7 @@ module Rubocop
                            ['unless cond',
                             ' func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -148,7 +148,7 @@ module Rubocop
                             'when b',
                             ' c',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -162,7 +162,7 @@ module Rubocop
                             'else',
                             '   f',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 3) spaces for indentation.'])
           end
 
@@ -227,7 +227,7 @@ module Rubocop
                            ['while cond',
                             ' func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -237,7 +237,7 @@ module Rubocop
                             ' func1',
                             '   func2',
                             'end while cond'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.',
                       'Use 2 (not 3) spaces for indentation.'])
           end
@@ -247,7 +247,7 @@ module Rubocop
                            ['until cond',
                             ' func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -265,7 +265,7 @@ module Rubocop
                            ['for var in 1..10',
                             ' func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -284,7 +284,7 @@ module Rubocop
                             '    func1',
                             '     func2', # No offence registered for this.
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 4) spaces for indentation.'])
           end
 
@@ -293,7 +293,7 @@ module Rubocop
                            ['def self.test',
                             '   func',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 3) spaces for indentation.'])
           end
 
@@ -319,7 +319,7 @@ module Rubocop
                             '    def func',
                             '    end',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 4) spaces for indentation.'])
           end
 
@@ -338,7 +338,7 @@ module Rubocop
                             '    def func',
                             '    end',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 4) spaces for indentation.'])
           end
 
@@ -356,7 +356,7 @@ module Rubocop
                            ['a = func do',
                             ' b',
                             'end'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 1) spaces for indentation.'])
           end
 
@@ -365,7 +365,7 @@ module Rubocop
                            ['func {',
                             '   b',
                             '}'])
-            expect(cop.offences.map(&:message))
+            expect(cop.messages)
               .to eq(['Use 2 (not 3) spaces for indentation.'])
           end
 

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Lambda do
-        let(:lambda) { Lambda.new }
+        subject(:lambda) { Lambda.new }
 
         it 'registers an offence for an old single-line lambda call' do
           inspect_source(lambda, ['f = lambda { |x| x }'])
@@ -16,22 +16,22 @@ module Rubocop
 
         it 'accepts the new lambda literal with single-line body' do
           inspect_source(lambda, ['lambda = ->(x) { x }',
-                                     'lambda.(1)'])
+                                  'lambda.(1)'])
           expect(lambda.offences).to be_empty
         end
 
         it 'registers an offence for a new multi-line lambda call' do
           inspect_source(lambda, ['f = ->(x) do',
-                                          '  x',
-                                          'end'])
+                                  '  x',
+                                  'end'])
           expect(lambda.offences.size).to eq(1)
           expect(lambda.messages).to eq([Lambda::MULTI_MSG])
         end
 
         it 'accepts the old lambda syntax with multi-line body' do
           inspect_source(lambda, ['l = lambda do |x|',
-                                          '  x',
-                                          'end'])
+                                  '  x',
+                                  'end'])
           expect(lambda.offences).to be_empty
         end
 

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe LeadingCommentSpace do
-        let(:lcs) { LeadingCommentSpace.new }
+        subject(:lcs) { LeadingCommentSpace.new }
 
         it 'registers an offence for comment without leading space' do
           inspect_source(lcs,

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

@@ -5,9 +5,9 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe LineLength do
-        let(:ll) { LineLength.new }
-        before { LineLength.config = { 'Max' => 79 } }
+      describe LineLength, :config do
+        subject(:ll) { LineLength.new(config) }
+        let(:cop_config) { { 'Max' => 79 } }
 
         it "registers an offence for a line that's 80 characters wide" do
           inspect_source(ll, ['#' * 80])

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

@@ -6,15 +6,14 @@ module Rubocop
   module Cop
     module Style
       describe MethodAndVariableSnakeCase do
-        let(:cop) { described_class.new }
-        let(:highlights) { cop.offences.map { |o| o.location.source } }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for camel case in instance method name' do
           inspect_source(cop, ['def myMethod',
                                '  # ...',
                                'end'])
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['myMethod'])
+          expect(cop.highlights).to eq(['myMethod'])
         end
 
         it 'registers an offence for camel case in singleton method name' do
@@ -22,32 +21,32 @@ module Rubocop
                                '  # ...',
                                'end'])
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['myMethod'])
+          expect(cop.highlights).to eq(['myMethod'])
         end
 
         it 'registers an offence for camel case in local variable name' do
           inspect_source(cop, 'myLocal = 1')
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['myLocal'])
+          expect(cop.highlights).to eq(['myLocal'])
         end
 
         it 'registers an offence for camel case in instance variable name' do
           inspect_source(cop, '@myAttribute = 3')
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['@myAttribute'])
+          expect(cop.highlights).to eq(['@myAttribute'])
         end
 
         it 'registers an offence for camel case in setter name' do
           inspect_source(cop, 'self.mySetter = 2')
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['mySetter'])
+          expect(cop.highlights).to eq(['mySetter'])
         end
 
         it 'registers an offence for capitalized camel case' do
           inspect_source(cop, ['def MyMethod',
                                'end'])
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['MyMethod'])
+          expect(cop.highlights).to eq(['MyMethod'])
         end
 
         it 'accepts snake case in names' do
@@ -63,7 +62,7 @@ module Rubocop
           inspect_source(cop, ['def visit_Arel_Nodes_SelectStatement',
                                'end'])
           expect(cop.offences).to have(1).item
-          expect(highlights).to eq(['visit_Arel_Nodes_SelectStatement'])
+          expect(cop.highlights).to eq(['visit_Arel_Nodes_SelectStatement'])
         end
 
         it 'accepts screaming snake case globals' do

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe MethodCallParentheses do
-        let(:cop) { described_class.new }
+        subject(:cop) { described_class.new }
 
         it 'registers an offence for parens in method call without args' do
           inspect_source(cop, ['top.test()'])

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

@@ -5,11 +5,9 @@ require 'spec_helper'
 module Rubocop
   module Cop
     module Style
-      describe MethodLength do
-        let(:method_length) { MethodLength.new }
-        before do
-          MethodLength.config = { 'Max' => 5, 'CountComments' => false }
-        end
+      describe MethodLength, :config do
+        subject(:method_length) { MethodLength.new(config) }
+        let(:cop_config) { { 'Max' => 5, 'CountComments' => false } }
 
         it 'rejects a method with more than 5 lines' do
           inspect_source(method_length, ['def m()',
@@ -132,18 +130,21 @@ module Rubocop
           expect(method_length.offences).to be_empty
         end
 
-        it 'has the option of counting commented lines' do
-          MethodLength.config['CountComments'] = true
-          inspect_source(method_length, ['def m()',
-                                         '  a = 1',
-                                         '  #a = 2',
-                                         '  a = 3',
-                                         '  #a = 4',
-                                         '  a = 5',
-                                         '  a = 6',
-                                         'end'])
-          expect(method_length.offences.size).to eq(1)
-          expect(method_length.offences.map(&:line).sort).to eq([1])
+        context 'when CountComments is enabled' do
+          before { cop_config['CountComments'] = true }
+
+          it 'also counts commented lines' do
+            inspect_source(method_length, ['def m()',
+                                           '  a = 1',
+                                           '  #a = 2',
+                                           '  a = 3',
+                                           '  #a = 4',
+                                           '  a = 5',
+                                           '  a = 6',
+                                           'end'])
+            expect(method_length.offences.size).to eq(1)
+            expect(method_length.offences.map(&:line).sort).to eq([1])
+          end
         end
       end
     end

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

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

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

@@ -0,0 +1,84 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Style
+      describe MultilineBlockChain do
+        subject(:cop) { described_class.new }
+
+        context 'with multi-line block chaining' do
+          it 'registers an offence for a simple case' do
+            inspect_source(cop, ['a do',
+                                 '  b',
+                                 'end.c do',
+                                 '  d',
+                                 'end'])
+            expect(cop.offences).to have(1).item
+            expect(cop.highlights).to eq(['end.c'])
+          end
+
+          it 'registers an offence for a slightly more complicated case' do
+            inspect_source(cop, ['a do',
+                                 '  b',
+                                 'end.c1.c2 do',
+                                 '  d',
+                                 'end'])
+            expect(cop.offences).to have(1).item
+            expect(cop.highlights).to eq(['end.c1.c2'])
+          end
+
+          it 'registers two offences for a chain of three blocks' do
+            inspect_source(cop, ['a do',
+                                 '  b',
+                                 'end.c do',
+                                 '  d',
+                                 'end.e do',
+                                 '  f',
+                                 'end'])
+            expect(cop.offences).to have(2).item
+            expect(cop.highlights).to eq(['end.c', 'end.e'])
+          end
+
+          it 'registers an offence for a chain where the second block is ' +
+            'single-line' do
+            inspect_source(cop, ['Thread.list.find_all { |t|',
+                                 '  t.alive?',
+                                 '}.map { |thread| thread.object_id }'])
+            expect(cop.offences).to have(1).item
+            expect(cop.highlights).to eq(['}.map'])
+          end
+
+          it 'accepts a chain where the first block is single-line' do
+            inspect_source(cop,
+                           ['Thread.list.find_all { |t| t.alive? }.map { |t| ',
+                            '  t.object_id',
+                            '}'])
+            expect(cop.offences).to be_empty
+          end
+        end
+
+        it 'accepts a chain of blocks spanning one line' do
+          inspect_source(cop, ['a { b }.c { d }',
+                               'w do x end.y do z end'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a multi-line block chained with calls on one line' do
+          inspect_source(cop, ['a do',
+                               '  b',
+                               'end.c.d'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a chain of calls followed by a multi-line block' do
+          inspect_source(cop, ['a1.a2.a3 do',
+                               '  b',
+                               'end'])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end