rubocop 0.11.1 → 0.12.0

data/spec/rubocop/config_spec.rb

@@ -75,10 +75,11 @@ describe Rubocop::Config do
         create_file(file_path, ['Encoding:',
                                 '  Enabled: false'])
       end
-
       it 'returns a configuration inheriting from default.yml' do
+        config = DEFAULT_CONFIG['Encoding'].dup
+        config['Enabled'] = false
         expect(configuration_from_file)
-          .to eq(DEFAULT_CONFIG.merge('Encoding' => { 'Enabled' => false }))
+          .to eql(DEFAULT_CONFIG.merge('Encoding' => config))
       end
     end
 
@@ -175,16 +176,21 @@ describe Rubocop::Config do
       end
 
       it 'returns the ancestor configuration plus local overrides' do
-        expect(configuration_from_file)
-          .to eq(DEFAULT_CONFIG.merge('LineLength' => {
-                                        'Enabled' => true,
-                                        'Max' => 77
-                                      },
-                                      'MethodLength' => {
-                                        'Enabled' => true,
-                                        'CountComments' => false,
-                                        'Max' => 5
-                                      }))
+        config = DEFAULT_CONFIG
+                   .merge('LineLength' => {
+                          'Description' =>
+                             DEFAULT_CONFIG['LineLength']['Description'],
+                          'Enabled' => true,
+                          'Max' => 77
+                          },
+                          'MethodLength' => {
+                            'Description' =>
+                               DEFAULT_CONFIG['MethodLength']['Description'],
+                            'Enabled' => true,
+                            'CountComments' => false,
+                            'Max' => 5
+                          })
+        expect(configuration_from_file).to eq(config)
       end
     end
 
@@ -216,11 +222,11 @@ describe Rubocop::Config do
       end
 
       it 'returns values from the last one when possible' do
-        expect(configuration_from_file['MethodLength'])
-          .to eq('Enabled' => true,       # overridden in .rubocop.yml
-                 'CountComments' => true, # only defined in normal.yml
-                 'Max' => 200             # special.yml takes precedence
-                 )
+        expected = { 'Enabled' => true,        # overridden in .rubocop.yml
+                     'CountComments' => true,  # only defined in normal.yml
+                     'Max' => 200 }            # special.yml takes precedence
+        expect(configuration_from_file['MethodLength'].to_set)
+          .to be_superset(expected.to_set)
       end
     end
   end

data/spec/rubocop/cop/commissioner_spec.rb

@@ -54,16 +54,16 @@ module Rubocop
 
         context 'when passed :raise_error option' do
           it 're-raises the exception received while processing' do
-          cop = double(Cop, offences: [])
-          cop.stub(:on_def) { raise RuntimeError }
+            cop = double(Cop, offences: [])
+            cop.stub(:on_def) { raise RuntimeError }
 
-          commissioner = Commissioner.new([cop], raise_error: true)
-          source = ['def method', '1', 'end']
-          processed_source = parse_source(source)
+            commissioner = Commissioner.new([cop], raise_error: true)
+            source = ['def method', '1', 'end']
+            processed_source = parse_source(source)
 
-          expect do
-            commissioner.investigate(processed_source)
-          end.to raise_error(RuntimeError)
+            expect do
+              commissioner.investigate(processed_source)
+            end.to raise_error(RuntimeError)
           end
         end
       end

data/spec/rubocop/cop/cop_spec.rb

@@ -33,6 +33,86 @@ module Rubocop
         cop.add_offence(:convention, location, 'message')
         expect(cop.offences.first.cop_name).to eq('AvoidFor')
       end
+
+      describe 'description' do
+        let(:short_desc) { 'abc' }
+        let(:long_desc) { short_desc + "\n" + short_desc + 'def' }
+        before { Cop.config['Description'] = long_desc }
+        context '#full_description' do
+          it 'contains whole text' do
+            expect(Cop.full_description).to eq(long_desc)
+            expect(Cop.full_description.lines.to_a.size).to be > 1
+          end
+        end
+        context '#short_description' do
+          it 'contains first line' do
+            expect(Cop.short_description).to eq(short_desc)
+            expect(Cop.short_description.lines.to_a.size).to eq(1)
+          end
+        end
+      end
+
+      context 'with no submodule' do
+        subject(:cop) { Cop }
+        it('has right name') { expect(cop.cop_name).to eq('Cop') }
+        it('has right type') { expect(cop.cop_type).to eq(:cop) }
+      end
+
+      context 'with style cops' do
+        subject(:cop) { Style::AvoidFor }
+        it('has right name') { expect(cop.cop_name).to eq('AvoidFor') }
+        it('has right type') { expect(cop.cop_type).to eq(:style) }
+      end
+
+      context 'with lint cops' do
+        subject(:cop) { Lint::Loop }
+        it('has right name') { expect(cop.cop_name).to eq('Loop') }
+        it('has right type') { expect(cop.cop_type).to eq(:lint) }
+      end
+
+      context 'with rails cops' do
+        subject(:cop) { Rails::Validation }
+        it('has right name') { expect(cop.cop_name).to eq('Validation') }
+        it('has right type') { expect(cop.cop_type).to eq(:rails) }
+      end
+
+      describe 'CopStore' do
+        context '#types' do
+          subject { Rubocop::Cop::Cop.all.types }
+          it('has types') { expect(subject.length).not_to eq(0) }
+          it { should include :lint }
+          it do
+            pending 'Rails cops are usually removed after CLI start, ' +
+                    'so CLI spec impacts this one'
+            should include :rails
+          end
+          it { should include :style }
+          it 'contains every value only once' do
+            expect(subject.length).to eq(subject.uniq.length)
+          end
+        end
+        context '#with_type' do
+          let(:types) { Rubocop::Cop::Cop.all.types }
+          it 'has at least one cop per type' do
+            types.each do |c|
+              expect(Rubocop::Cop::Cop.all.with_type(c).length).to be > 0
+            end
+          end
+
+          it 'has each cop in exactly one type' do
+            sum = 0
+            types.each do |c|
+              sum = sum + Rubocop::Cop::Cop.all.with_type(c).length
+            end
+            expect(sum).to be Rubocop::Cop::Cop.all.length
+          end
+
+          it 'returns 0 for an invalid type' do
+            expect(Rubocop::Cop::Cop.all.with_type('x').length).to be 0
+          end
+        end
+      end
+
     end
   end
 end

data/spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Lint
+      describe ParenthesesAsGroupedExpression do
+        let(:cop) { ParenthesesAsGroupedExpression.new }
+
+        it 'registers an offence for method call with space before the ' +
+          'parenthesis' do
+          inspect_source(cop, ['a.func (x)'])
+          expect(cop.offences).to have(1).item
+        end
+
+        it 'registers an offence for predicate method call with space ' +
+          'before the parenthesis' do
+          inspect_source(cop, ['is? (x)'])
+          expect(cop.offences).to have(1).item
+        end
+
+        it 'registers an offence for math expression' do
+          inspect_source(cop, ['puts (2 + 3) * 4'])
+          expect(cop.offences).to have(1).item
+        end
+
+        it 'accepts a method call without arguments' do
+          inspect_source(cop, ['func'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a method call with arguments but no parentheses' do
+          inspect_source(cop, ['puts x'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a chain of method calls' do
+          inspect_source(cop, ['a.b',
+                               'a.b 1',
+                               'a.b(1)'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts method with parens as arg to method without' do
+          inspect_source(cop, ['a b(c)'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts an operator call with argument in parentheses' do
+          inspect_source(cop, ['a % (b + c)',
+                               'a.b = (c == d)'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts a space inside opening paren followed by left paren' do
+          inspect_source(cop, ['a( (b) )'])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

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

@@ -48,6 +48,65 @@ module Rubocop
           expect(cop.offences.size).to eq(1)
         end
 
+        it 'accepts def ending with ivar assignment' do
+          inspect_source(cop,
+                         ['def test',
+                          '  something',
+                          '  @top = 5',
+                          'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts def ending ivar attr assignment' do
+          inspect_source(cop,
+                         ['def test',
+                          '  something',
+                          '  @top.attr = 5',
+                          'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts def ending with argument attr assignment' do
+          inspect_source(cop,
+                         ['def test(some_arg)',
+                          '  unrelated_local_variable = Top.new',
+                          '  some_arg.attr = 5',
+                          'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        context 'when a lvar has an object passed as argument ' +
+                'at the end of the method' do
+          it 'accepts the lvar attr assignment' do
+            inspect_source(cop,
+                           ['def test(some_arg)',
+                            '  @some_ivar = some_arg',
+                            '  @some_ivar.do_something',
+                            '  some_lvar = @some_ivar',
+                            '  some_lvar.do_something',
+                            '  some_lvar.attr = 5',
+                            'end'
+                           ])
+            expect(cop.offences).to be_empty
+          end
+        end
+
+        context 'when a lvar declared as an argument ' +
+                'is no longer the passed object at the end of the method' do
+          it 'registers an offence for the lvar attr assignment' do
+            inspect_source(cop,
+                           ['def test(some_arg)',
+                            '  some_arg = Top.new',
+                            '  some_arg.attr = 5',
+                            'end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+        end
+
         it 'is not confused by operators ending with =' do
           inspect_source(cop,
                          ['def test',

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Rails
+      describe HasAndBelongsToMany do
+        let(:cop) { described_class.new }
+
+        it 'registers an offence for has_and_belongs_to_many' do
+          inspect_source(cop,
+                         ['has_and_belongs_to_many :groups'])
+          expect(cop.offences.size).to eq(1)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Rails
+      describe ReadAttribute do
+        let(:cop) { described_class.new }
+
+        it 'registers an offence for read_attribute' do
+          inspect_source(cop,
+                         ['res = read_attribute(:test)'])
+          expect(cop.offences.size).to eq(1)
+        end
+      end
+    end
+  end
+end

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

@@ -6,20 +6,20 @@ module Rubocop
   module Cop
     module Rails
       describe Validation do
-        let(:val) { Validation.new }
+        let(:cop) { described_class.new }
 
         Validation::BLACKLIST.each do |validation|
           it "registers an offence for #{validation}" do
-            inspect_source(val,
+            inspect_source(cop,
                            ["#{validation} :name"])
-            expect(val.offences.size).to eq(1)
+            expect(cop.offences.size).to eq(1)
           end
         end
 
         it 'accepts sexy validations' do
-          inspect_source(val,
+          inspect_source(cop,
                          ['validates :name'])
-          expect(val.offences).to be_empty
+          expect(cop.offences).to be_empty
         end
       end
     end

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

@@ -47,6 +47,34 @@ module Rubocop
             .to eq([format(AccessControl::INDENT_MSG, 'private')])
         end
 
+        it 'registers an offence for misaligned private in class ' +
+           'defined with Class.new' do
+          inspect_source(a,
+                         ['Test = Class.new do',
+                          '',
+                          'private',
+                          '',
+                          '  def test; end',
+                          'end'])
+          expect(a.offences.size).to eq(1)
+          expect(a.offences.map(&:message))
+            .to eq([format(AccessControl::INDENT_MSG, 'private')])
+        end
+
+        it 'registers an offence for misaligned private in module ' +
+           'defined with Module.new' do
+          inspect_source(a,
+                         ['Test = Module.new do',
+                          '',
+                          'private',
+                          '',
+                          '  def test; end',
+                          'end'])
+          expect(a.offences.size).to eq(1)
+          expect(a.offences.map(&:message))
+            .to eq([format(AccessControl::INDENT_MSG, 'private')])
+        end
+
         it 'registers an offence for misaligned protected' do
           inspect_source(a,
                          ['class Test',

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

@@ -6,7 +6,7 @@ module Rubocop
   module Cop
     module Style
       describe Attr do
-        let(:cop) { Attr.new }
+        let(:cop) { described_class.new }
 
         it 'registers an offence attr' do
           inspect_source(cop, ['class SomeClass',
@@ -14,6 +14,11 @@ module Rubocop
                                'end'])
           expect(cop.offences.size).to eq(1)
         end
+
+        it 'auto-corrects attr to attr_reader' do
+          new_source = autocorrect_source(cop, 'attr')
+          expect(new_source).to eq('attr_reader')
+        end
       end
     end
   end

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

@@ -43,6 +43,11 @@ module Rubocop
             inspect_source(cop, ["[1, 2, 3].#{method}"])
             expect(cop.offences).to be_empty
           end
+
+          it 'auto-corrects to preferred method' do
+            new_source = autocorrect_source(cop, 'some.collect(&:test)')
+            expect(new_source).to eq('some.map(&:test)')
+          end
         end
       end
     end

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

@@ -44,6 +44,15 @@ module Rubocop
           expect(const.offences).to be_empty
         end
 
+        it 'does not check names if rhs is a method call with block' do
+          inspect_source(const,
+                         ['AnythingGoes = test do',
+                          '  do_something',
+                          'end'
+                          ])
+          expect(const.offences).to be_empty
+        end
+
         it 'checks qualified const names' do
           inspect_source(const,
                          ['::AnythingGoes = 30',