rubocop 0.14.0 → 0.14.1

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

@@ -0,0 +1,193 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'no_braces' do
+    let(:cop_config) do
+      { 'EnforcedStyle' => 'no_braces' }
+    end
+
+    describe 'accepts' do
+      it 'one non-hash parameter' do
+        inspect_source(cop, ['where(2)'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one empty hash parameter' do
+        inspect_source(cop, ['where({})'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter with separators' do
+        inspect_source(cop, ["where(  {     \n }\t   )  "])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'multiple non-hash parameters' do
+        inspect_source(cop, ['where(1, "2")'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter without braces' do
+        inspect_source(cop, ['where(x: "y")'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter without braces and multiple keys' do
+        inspect_source(cop, ['where(x: "y", foo: "bar")'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter without braces and one hash value' do
+        inspect_source(cop, ['where(x: { "y" => "z" })'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'multiple hash parameters with braces' do
+        inspect_source(cop, ['where({ x: 1 }, { y: 2 })'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'property assignment with braces' do
+        inspect_source(cop, ['x.z = { y: "z" }'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'operator with a hash parameter with braces' do
+        inspect_source(cop, ['x.z - { y: "z" }'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one non-hash parameter followed by a hash parameter with braces' do
+        inspect_source(cop, ['where(1, { y: 2 })'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+    end
+
+    describe 'registers an offence for' do
+      it 'one object method hash parameter with braces' do
+        inspect_source(cop, ['x.func({ y: "z" })'])
+        expect(cop.messages).to eq([
+          'Redundant curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['{ y: "z" }'])
+      end
+
+      it 'one hash parameter with braces' do
+        inspect_source(cop, ['where({ x: 1 })'])
+        expect(cop.messages).to eq([
+          'Redundant curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['{ x: 1 }'])
+      end
+
+      it 'one hash parameter with braces and separators' do
+        inspect_source(cop, ["where(  \n { x: 1 }   )"])
+        expect(cop.messages).to eq([
+          'Redundant curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['{ x: 1 }'])
+      end
+
+      it 'one hash parameter with braces and multiple keys' do
+        inspect_source(cop, ['where({ x: 1, foo: "bar" })'])
+        expect(cop.messages).to eq([
+          'Redundant curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['{ x: 1, foo: "bar" }'])
+      end
+    end
+  end
+
+  context 'braces' do
+    let(:cop_config) do
+      { 'EnforcedStyle' => 'braces' }
+    end
+
+    describe 'accepts' do
+      it 'an empty hash parameter' do
+        inspect_source(cop, ['where({})'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one non-hash parameter' do
+        inspect_source(cop, ['where(2)'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'multiple non-hash parameters' do
+        inspect_source(cop, ['where(1, "2")'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter with braces' do
+        inspect_source(cop, ['where({ x: 1 })'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'multiple hash parameters with braces' do
+        inspect_source(cop, ['where({ x: 1 }, { y: 2 })'])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter with braces and spaces around it' do
+        inspect_source(cop, [
+          'where(     {  x: 1  }   )'
+        ])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+
+      it 'one hash parameter with braces and separators around it' do
+        inspect_source(cop, ["where( \t    {  x: 1 \n  }   )"])
+        expect(cop.messages).to be_empty
+        expect(cop.highlights).to be_empty
+      end
+    end
+
+    describe 'registers an offence for' do
+      it 'one hash parameter without braces' do
+        inspect_source(cop, ['where(x: "y")'])
+        expect(cop.messages).to eq([
+          'Missing curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['x: "y"'])
+      end
+
+      it 'one hash parameter with multiple keys and without braces' do
+        inspect_source(cop, ['where(x: "y", foo: "bar")'])
+        expect(cop.messages).to eq([
+          'Missing curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['x: "y", foo: "bar"'])
+      end
+
+      it 'one hash parameter without braces with one hash value' do
+        inspect_source(cop, ['where(x: { "y" => "z" })'])
+        expect(cop.messages).to eq([
+          'Missing curly braces around a hash parameter.'
+        ])
+        expect(cop.highlights).to eq(['x: { "y" => "z" }'])
+      end
+    end
+  end
+end

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

@@ -18,6 +18,17 @@ describe Rubocop::Cop::Style::ClassLength, :config do
     expect(cop.offences.size).to eq(1)
   end
 
+  it 'accepts a class with 5 lines' do
+    inspect_source(cop, ['class Test',
+                         '  a = 1',
+                         '  a = 2',
+                         '  a = 3',
+                         '  a = 4',
+                         '  a = 5',
+                         'end'])
+    expect(cop.offences).to be_empty
+  end
+
   it 'accepts a class with less than 5 lines' do
     inspect_source(cop, ['class Test',
                          '  a = 1',
@@ -47,6 +58,59 @@ describe Rubocop::Cop::Style::ClassLength, :config do
     expect(cop.offences).to be_empty
   end
 
+  context 'when a class has inner classes' do
+    it 'does not count lines of inner classes' do
+      inspect_source(cop, ['class NamespaceClass',
+                           '  class TestOne',
+                           '    a = 1',
+                           '    a = 2',
+                           '    a = 3',
+                           '    a = 4',
+                           '    a = 5',
+                           '  end',
+                           '  class TestTwo',
+                           '    a = 1',
+                           '    a = 2',
+                           '    a = 3',
+                           '    a = 4',
+                           '    a = 5',
+                           '  end',
+                           '  a = 1',
+                           '  a = 2',
+                           '  a = 3',
+                           '  a = 4',
+                           '  a = 5',
+                           'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'rejects a class with 6 lines that belong to the class directly' do
+      inspect_source(cop, ['class NamespaceClass',
+                           '  class TestOne',
+                           '    a = 1',
+                           '    a = 2',
+                           '    a = 3',
+                           '    a = 4',
+                           '    a = 5',
+                           '  end',
+                           '  class TestTwo',
+                           '    a = 1',
+                           '    a = 2',
+                           '    a = 3',
+                           '    a = 4',
+                           '    a = 5',
+                           '  end',
+                           '  a = 1',
+                           '  a = 2',
+                           '  a = 3',
+                           '  a = 4',
+                           '  a = 5',
+                           '  a = 6',
+                           'end'])
+      expect(cop.offences.size).to eq(1)
+    end
+  end
+
   context 'when CountComments is enabled' do
     before { cop_config['CountComments'] = true }
 

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

@@ -70,4 +70,14 @@ describe Rubocop::Cop::Style::Documentation do
                    ])
     expect(cop.offences).to be_empty
   end
+
+  it 'accepts namespace class without documentation' do
+    inspect_source(cop,
+                   ['class Test',
+                    '  class A; end',
+                    '  class B; end',
+                    'end'
+                   ])
+    expect(cop.offences).to be_empty
+  end
 end

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

@@ -209,13 +209,6 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       'end'])
       expect(cop.offences).to be_empty
     end
-
-    it 'accepts an empty case' do
-      inspect_source(cop,
-                     ['case a',
-                      'end'])
-      expect(cop.offences).to be_empty
-    end
   end
 
   context 'with while/until' do

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

@@ -35,7 +35,7 @@ describe Rubocop::Cop::Style::NumericLiterals, :config do
 
   it 'ignores non-decimal literals' do
     inspect_source(cop, ['a = 0b1010101010101',
-                         'b = 01919191919191',
+                         'b = 01717171717171',
                          'c = 0xab11111111bb'])
     expect(cop.offences).to be_empty
   end

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

@@ -37,6 +37,11 @@ describe Rubocop::Cop::Style::RaiseArgs, :config do
       expect(cop.offences.size).to eq(1)
     end
 
+    it 'accepts exception constructor with more than 1 argument' do
+      inspect_source(cop, ['raise RuntimeError.new(a1, a2, a3)'])
+      expect(cop.offences).to be_empty
+    end
+
     it 'accepts a raise with 3 args' do
       inspect_source(cop, ['raise RuntimeError, msg, caller'])
       expect(cop.offences).to be_empty

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

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::SpaceAfterNot do
+  subject(:cop) { described_class.new }
+
+  it 'reports an offence for space after !' do
+    inspect_source(cop, ['! something'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts no space after !' do
+    inspect_source(cop, ['!something'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'auto-corrects by removing redundant space' do
+    new_source = autocorrect_source(cop, '!  something')
+    expect(new_source).to eq('!something')
+  end
+end

data/spec/rubocop/cop/team_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Team do
   subject(:team) { described_class.new(cop_classes, config, options) }
   let(:cop_classes) { Rubocop::Cop::Cop.all }
-  let(:config) { Rubocop::Config.default_configuration }
+  let(:config) { Rubocop::ConfigLoader.default_configuration }
   let(:options) { nil }
 
   describe '#autocorrect?' do

data/spec/rubocop/cop/util_spec.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Util do
+  describe '#line_range' do
+    include ASTHelper
+
+    let(:source) do
+      <<-END
+        foo = 1
+        bar = 2
+        class Test
+          def some_method
+            do_something
+          end
+        end
+        baz = 8
+      END
+    end
+
+    let(:ast) do
+      processed_source = parse_source(source)
+      processed_source.ast
+    end
+
+    let(:node) do
+      target_node = scan_node(ast) do |node|
+        break node if node.type == :class
+      end
+      fail 'No target node found!' unless target_node
+      target_node
+    end
+
+    context 'when Source::Range object is passed' do
+      it 'returns line range of that' do
+        line_range = Rubocop::Cop::Util.line_range(node.loc.expression)
+        expect(line_range).to eq(3..7)
+      end
+    end
+
+    context 'when AST::Node object is passed' do
+      it 'returns line range of the expression' do
+        line_range = Rubocop::Cop::Util.line_range(node)
+        expect(line_range).to eq(3..7)
+      end
+    end
+  end
+end

data/spec/rubocop/formatter/clang_style_formatter_spec.rb

@@ -31,23 +31,49 @@ module Rubocop
                                        ''].join("\n")
         end
 
-        it 'does not display offending source line if it is blank' do
-          cop = Cop::Cop.new
-          source_buffer = Parser::Source::Buffer.new('test', 1)
-          source_buffer.source = (['     ', 'yaba']).to_a.join($RS)
-          cop.add_offence(:convention, nil,
-                          Parser::Source::Range.new(source_buffer, 0, 2),
-                          'message 1')
-          cop.add_offence(:fatal, nil,
-                          Parser::Source::Range.new(source_buffer, 6, 10),
-                          'message 2')
+        context 'when the source line is blank' do
+          it 'does not display offending source line' do
+            cop = Cop::Cop.new
+            source_buffer = Parser::Source::Buffer.new('test', 1)
+            source_buffer.source = (['     ', 'yaba']).to_a.join($RS)
+            cop.add_offence(:convention, nil,
+                            Parser::Source::Range.new(source_buffer, 0, 2),
+                            'message 1')
+            cop.add_offence(:fatal, nil,
+                            Parser::Source::Range.new(source_buffer, 6, 10),
+                            'message 2')
 
-          formatter.report_file('test', cop.offences)
-          expect(output.string).to eq ['test:1:1: C: message 1',
-                                       'test:2:1: F: message 2',
-                                       'yaba',
-                                       '^^^^',
-                                       ''].join("\n")
+            formatter.report_file('test', cop.offences)
+            expect(output.string).to eq ['test:1:1: C: message 1',
+                                         'test:2:1: F: message 2',
+                                         'yaba',
+                                         '^^^^',
+                                         ''].join("\n")
+          end
+        end
+
+        context 'when the offending source spans multiple lines' do
+          it 'displays the first line' do
+            source = ['do_something([this,',
+                      '              is,',
+                      '              target])'].join($RS)
+
+            source_buffer = Parser::Source::Buffer.new('test', 1)
+            source_buffer.source = source
+
+            location = Parser::Source::Range.new(source_buffer,
+                                                 source.index('['),
+                                                 source.index(']') + 1)
+
+            cop = Cop::Cop.new
+            cop.add_offence(:convention, nil, location, 'message 1')
+
+            formatter.report_file('test', cop.offences)
+            expect(output.string).to eq ['test:1:14: C: message 1',
+                                         'do_something([this,',
+                                         '             ^^^^^^',
+                                         ''].join("\n")
+          end
         end
 
         let(:file) { '/path/to/file' }