rubocop 0.16.0 → 0.17.0

data/spec/rubocop/config_loader_spec.rb

@@ -86,12 +86,12 @@ describe Rubocop::ConfigLoader do
         create_file('.rubocop.yml',
                     ['AllCops:',
                      '  Excludes:',
-                     '    - vendor/**',
+                     '    - vendor/**'
                     ])
 
         create_file(file_path,
                     ['AllCops:',
-                     '  Excludes: []',
+                     '  Excludes: []'
                     ])
       end
 
@@ -109,7 +109,7 @@ describe Rubocop::ConfigLoader do
                     ['AllCops:',
                      '  Excludes:',
                      '    - vendor/**',
-                     '    - !ruby/regexp /[A-Z]/',
+                     '    - !ruby/regexp /[A-Z]/'
                     ])
 
         create_file(file_path, ['inherit_from: ../.rubocop.yml'])
@@ -142,7 +142,7 @@ describe Rubocop::ConfigLoader do
         create_file('src/.rubocop.yml',
                     ['AllCops:',
                      '  Excludes:',
-                     '    - vendor/**',
+                     '    - vendor/**'
                     ])
 
         create_file(file_path, ['inherit_from: ../src/.rubocop.yml'])
@@ -251,7 +251,7 @@ describe Rubocop::ConfigLoader do
     it 'returns a configuration loaded from the passed path' do
       create_file(configuration_path, [
         'Encoding:',
-        '  Enabled: true',
+        '  Enabled: true'
       ])
       configuration = load_file
       expect(configuration['Encoding']).to eq(

data/spec/rubocop/config_spec.rb

@@ -27,7 +27,7 @@ describe Rubocop::Config do
         create_file(configuration_path, [
           'LyneLenth:',
           '  Enabled: true',
-          '  Max: 100',
+          '  Max: 100'
         ])
       end
 
@@ -43,7 +43,7 @@ describe Rubocop::Config do
         create_file(configuration_path, [
           'LineLength:',
           '  Enabled: true',
-          '  Min: 10',
+          '  Min: 10'
         ])
       end
 
@@ -64,7 +64,7 @@ describe Rubocop::Config do
           '    - lib/file.rb',
           '  Include:',
           '    - lib/file.xyz',
-          '  Severity: warning',
+          '  Severity: warning'
         ])
       end
 

data/spec/rubocop/config_store_spec.rb

@@ -6,7 +6,7 @@ describe Rubocop::ConfigStore do
   subject(:config_store) { described_class.new }
 
   before do
-    Rubocop::ConfigLoader.stub(:configuration_file_for) do |arg|
+    allow(Rubocop::ConfigLoader).to receive(:configuration_file_for) do |arg|
       # File tree:
       # file1
       # dir/.rubocop.yml
@@ -14,11 +14,12 @@ describe Rubocop::ConfigStore do
       # dir/subdir/file3
       (arg =~ /dir/ ? 'dir' : '.') + '/.rubocop.yml'
     end
-    Rubocop::ConfigLoader.stub(:configuration_from_file) { |arg| arg }
-    Rubocop::ConfigLoader.stub(:load_file) { |arg| "#{arg} loaded" }
-    Rubocop::ConfigLoader.stub(:merge_with_default) do |config, file|
-      "merged #{config}"
-    end
+    allow(Rubocop::ConfigLoader)
+      .to receive(:configuration_from_file) { |arg| arg }
+    allow(Rubocop::ConfigLoader)
+      .to receive(:load_file) { |arg| "#{arg} loaded" }
+    allow(Rubocop::ConfigLoader)
+      .to receive(:merge_with_default) { |config, file| "merged #{config}" }
   end
 
   describe '.for' do
@@ -29,12 +30,12 @@ describe Rubocop::ConfigStore do
 
     context 'when no config specified in command line' do
       it 'gets config path and config from cache if available' do
-        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
+        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
           .with('dir')
-        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
+        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
           .with('dir/subdir')
         # The stub returns the same config path for dir and dir/subdir.
-        Rubocop::ConfigLoader.should_receive(:configuration_from_file).once
+        expect(Rubocop::ConfigLoader).to receive(:configuration_from_file).once
           .with('dir/.rubocop.yml')
 
         config_store.for('dir/file2')
@@ -43,8 +44,8 @@ describe Rubocop::ConfigStore do
       end
 
       it 'searches for config path if not available in cache' do
-        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
-        Rubocop::ConfigLoader.should_receive(:configuration_from_file).once
+        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
+        expect(Rubocop::ConfigLoader).to receive(:configuration_from_file).once
         config_store.for('file1')
       end
     end

data/spec/rubocop/cop/commissioner_spec.rb

@@ -8,7 +8,7 @@ describe Rubocop::Cop::Commissioner do
     let(:cop) { double(Rubocop::Cop, offences: []).as_null_object }
 
     it 'returns all offences found by the cops' do
-      cop.stub(:offences).and_return([1])
+      allow(cop).to receive(:offences).and_return([1])
 
       commissioner = described_class.new([cop])
       source = []
@@ -17,8 +17,24 @@ describe Rubocop::Cop::Commissioner do
       expect(commissioner.investigate(processed_source)).to eq [1]
     end
 
+    context 'when a cop has no interest in the file' do
+      it 'returns all offences except the ones of the cop' do
+        cops = []
+        cops << double('cop A', offences: %w(foo), relevant_file?: true)
+        cops << double('cop B', offences: %w(bar), relevant_file?: false)
+        cops << double('cop C', offences: %w(baz), relevant_file?: true)
+        cops.each(&:as_null_object)
+
+        commissioner = described_class.new(cops)
+        source = []
+        processed_source = parse_source(source)
+
+        expect(commissioner.investigate(processed_source)).to eq %w(foo baz)
+      end
+    end
+
     it 'traverses the AST and invoke cops specific callbacks' do
-      cop.should_receive(:on_def)
+      expect(cop).to receive(:on_def)
 
       commissioner = described_class.new([cop])
       source = ['def method', '1', 'end']
@@ -30,7 +46,7 @@ describe Rubocop::Cop::Commissioner do
     it 'passes the input params to all cops that implement their own #investigate method' do
       source = []
       processed_source = parse_source(source)
-      cop.should_receive(:investigate).with(processed_source)
+      expect(cop).to receive(:investigate).with(processed_source)
 
       commissioner = described_class.new([cop])
 
@@ -38,7 +54,7 @@ describe Rubocop::Cop::Commissioner do
     end
 
     it 'stores all errors raised by the cops' do
-      cop.stub(:on_def) { fail RuntimeError }
+      allow(cop).to receive(:on_def) { fail RuntimeError }
 
       commissioner = described_class.new([cop])
       source = ['def method', '1', 'end']
@@ -52,7 +68,7 @@ describe Rubocop::Cop::Commissioner do
 
     context 'when passed :raise_error option' do
       it 're-raises the exception received while processing' do
-        cop.stub(:on_def) { fail RuntimeError }
+        allow(cop).to receive(:on_def) { fail RuntimeError }
 
         commissioner = described_class.new([cop], raise_error: true)
         source = ['def method', '1', 'end']

data/spec/rubocop/cop/cop_spec.rb

@@ -41,7 +41,7 @@ describe Rubocop::Cop::Cop do
 
   it 'will warn if custom severity is invalid' do
     cop.config[cop.name] = { 'Severity' => 'superbad' }
-    cop.should_receive(:warn)
+    expect(cop).to receive(:warn)
     cop.add_offence(nil, location, 'message')
   end
 

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

@@ -0,0 +1,113 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::AmbiguousOperator do
+  subject(:cop) { described_class.new }
+
+  before do
+    inspect_source(cop, source)
+  end
+
+  context 'with a splat operator in the first argument' do
+    context 'without parentheses' do
+      context 'without whitespaces on the right of the operator' do
+        let(:source) do
+          [
+            'array = [1, 2, 3]',
+            'puts *array'
+          ]
+        end
+
+        it 'registers an offence' do
+          expect(cop.offences.size).to eq(1)
+          expect(cop.offences.first.message).to eq(
+            'Ambiguous splat operator. ' +
+            "Parenthesize the method arguments if it's surely a splat " +
+            'operator, ' +
+            'or add a whitespace to the right of the * if it should be a ' +
+            'multiplication.'
+          )
+          expect(cop.highlights).to eq(['*'])
+        end
+      end
+
+      context 'with a whitespace on the right of the operator' do
+        let(:source) do
+          [
+            'array = [1, 2, 3]',
+            'puts * array'
+          ]
+        end
+
+        it 'accepts' do
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+
+    context 'with parentheses' do
+      let(:source) do
+        [
+          'array = [1, 2, 3]',
+          'puts(*array)'
+        ]
+      end
+
+      it 'accepts' do
+        expect(cop.offences).to be_empty
+      end
+    end
+  end
+
+  context 'with a block ampersand in the first argument' do
+    context 'without parentheses' do
+      context 'without whitespaces on the right of the operator' do
+        let(:source) do
+          [
+            'process = proc { do_something }',
+            '2.times &process'
+          ]
+        end
+
+        it 'registers an offence' do
+          expect(cop.offences.size).to eq(1)
+          expect(cop.offences.first.message).to eq(
+            'Ambiguous block operator. ' +
+            "Parenthesize the method arguments if it's surely a block " +
+            'operator, ' +
+            'or add a whitespace to the right of the & if it should be a ' +
+            'binary AND.'
+          )
+          expect(cop.highlights).to eq(['&'])
+        end
+      end
+
+      context 'with a whitespace on the right of the operator' do
+        let(:source) do
+          [
+            'process = proc { do_something }',
+            '2.times & process'
+          ]
+        end
+
+        it 'accepts' do
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+
+    context 'with parentheses' do
+      let(:source) do
+        [
+          'process = proc { do_something }',
+          '2.times(&process)'
+        ]
+      end
+
+      it 'accepts' do
+        expect(cop.offences).to be_empty
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::AmbiguousRegexpLiteral do
+  subject(:cop) { described_class.new }
+
+  before do
+    inspect_source(cop, source)
+  end
+
+  context 'with a regexp literal in the first argument' do
+    context 'without parentheses' do
+      let(:source) { 'p /pattern/' }
+
+      it 'registers an offence' do
+        expect(cop.offences.size).to eq(1)
+        expect(cop.offences.first.message).to eq(
+          'Ambiguous regexp literal. Parenthesize the method arguments ' +
+          "if it's surely a regexp literal, or add a whitespace to the " +
+          'right of the / if it should be a division.'
+        )
+        expect(cop.highlights).to eq(['/'])
+      end
+    end
+
+    context 'with parentheses' do
+      let(:source) { 'p(/pattern/)' }
+
+      it 'accepts' do
+        expect(cop.offences).to be_empty
+      end
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       '  type_check_value(subvalue, array_type)',
                       'end',
                       'a || b do',
-                      'end',
+                      'end'
                      ])
       expect(cop.offences).to be_empty
     end
@@ -49,7 +49,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
     it 'accepts end aligned with the first variable' do
       inspect_source(cop,
                      ['a = b = c = test do |ala|',
-                      'end',
+                      'end'
                      ])
       expect(cop.offences).to be_empty
     end

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

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::ConditionPosition do
+  subject(:cop) { described_class.new }
+
+  %w(if unless while until).each do |keyword|
+    it 'registers an offence for condition on the next line' do
+      inspect_source(cop,
+                     ["#{keyword}",
+                      'x == 10',
+                      'end'
+                    ])
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'accepts condition on the same line' do
+      inspect_source(cop,
+                     ["#{keyword} x == 10",
+                      ' bala',
+                      'end'
+                    ])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  it 'registers an offence for elsif condition on the next line' do
+    inspect_source(cop,
+                   ['if something',
+                    '  test',
+                    'elsif',
+                    '  something',
+                    '  test',
+                    'end'
+                  ])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'handles ternary ops' do
+    inspect_source(cop, ['x ? a : b'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'handles modifier forms' do
+    inspect_source(cop, ['x if something'])
+    expect(cop.offences).to be_empty
+  end
+end

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

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::ElseLayout do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence for expr on same line as else' do
+    inspect_source(cop,
+                   ['if something',
+                    '  test',
+                    'else ala',
+                    '  something',
+                    '  test',
+                    'end'
+                  ])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts proper else' do
+    inspect_source(cop,
+                   ['if something',
+                    '  test',
+                    'else',
+                    '  something',
+                    '  test',
+                    'end'
+                  ])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts single-expr else regardless of layout' do
+    inspect_source(cop,
+                   ['if something',
+                    '  test',
+                    'else bala',
+                    'end'
+                  ])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'can handle elsifs' do
+    inspect_source(cop,
+                   ['if something',
+                    '  test',
+                    'elsif something',
+                    '  bala',
+                    'else ala',
+                    '  something',
+                    '  test',
+                    'end'
+                  ])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'handles ternary ops' do
+    inspect_source(cop, 'x ? a : b')
+    expect(cop.offences).to be_empty
+  end
+
+  it 'handles modifier forms' do
+    inspect_source(cop, 'x if something')
+    expect(cop.offences).to be_empty
+  end
+end