rubocop 0.13.1 → 0.14.0

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

@@ -2,22 +2,16 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe PerlBackrefs do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::PerlBackrefs do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for $1' do
-          inspect_source(cop, ['puts $1'])
-          expect(cop.offences.size).to eq(1)
-        end
+  it 'registers an offence for $1' do
+    inspect_source(cop, ['puts $1'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'auto-corrects $1 to Regexp.last_match[1]' do
-          new_source = autocorrect_source(cop, '$1')
-          expect(new_source).to eq('Regexp.last_match[1]')
-        end
-      end
-    end
+  it 'auto-corrects $1 to Regexp.last_match[1]' do
+    new_source = autocorrect_source(cop, '$1')
+    expect(new_source).to eq('Regexp.last_match[1]')
   end
 end

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

@@ -2,27 +2,21 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe Proc do
-        subject(:proc) { Proc.new }
+describe Rubocop::Cop::Style::Proc do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for a Proc.new call' do
-          inspect_source(proc, ['f = Proc.new { |x| puts x }'])
-          expect(proc.offences.size).to eq(1)
-        end
+  it 'registers an offence for a Proc.new call' do
+    inspect_source(cop, ['f = Proc.new { |x| puts x }'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'accepts the proc method' do
-          inspect_source(proc, ['f = proc { |x| puts x }'])
-          expect(proc.offences).to be_empty
-        end
+  it 'accepts the proc method' do
+    inspect_source(cop, ['f = proc { |x| puts x }'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'accepts the Proc.new call outside of block' do
-          inspect_source(proc, ['p = Proc.new'])
-          expect(proc.offences).to be_empty
-        end
-      end
-    end
+  it 'accepts the Proc.new call outside of block' do
+    inspect_source(cop, ['p = Proc.new'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::RaiseArgs, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when enforced style is compact' do
+    let(:cop_config) { { 'EnforcedStyle' => 'compact' } }
+
+    it 'reports an offence for a raise with 2 args' do
+      inspect_source(cop, ['raise RuntimeError, msg'])
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for a raise with 3 args' do
+      inspect_source(cop, ['raise RuntimeError, msg, caller'])
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'accepts a raise with msg argument' do
+      inspect_source(cop, ['raise msg'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts a raise with an exception argument' do
+      inspect_source(cop, ['raise Ex.new(msg)'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'when enforced style is exploded' do
+    let(:cop_config) { { 'EnforcedStyle' => 'exploded' } }
+
+    it 'reports an offence for a raise with exception object' do
+      inspect_source(cop, ['raise Ex.new(msg)'])
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'accepts a raise with 3 args' do
+      inspect_source(cop, ['raise RuntimeError, msg, caller'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts a raise with 2 args' do
+      inspect_source(cop, ['raise RuntimeError, msg'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts a raise with msg argument' do
+      inspect_source(cop, ['raise msg'])
+      expect(cop.offences).to be_empty
+    end
+  end
+end

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

@@ -2,65 +2,59 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe ReduceArguments do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::ReduceArguments do
+  subject(:cop) { described_class.new }
 
-        it 'find wrong argument names in calls with different syntax' do
-          inspect_source(cop,
-                         ['def m',
-                          '  [0, 1].reduce { |c, d| c + d }',
-                          '  [0, 1].reduce{ |c, d| c + d }',
-                          '  [0, 1].reduce(5) { |c, d| c + d }',
-                          '  [0, 1].reduce(5){ |c, d| c + d }',
-                          '  [0, 1].reduce (5) { |c, d| c + d }',
-                          '  [0, 1].reduce(5) { |c, d| c + d }',
-                          'end'])
-          expect(cop.offences.size).to eq(6)
-          expect(cop.offences.map(&:line).sort).to eq((2..7).to_a)
-        end
+  it 'find wrong argument names in calls with different syntax' do
+    inspect_source(cop,
+                   ['def m',
+                    '  [0, 1].reduce { |c, d| c + d }',
+                    '  [0, 1].reduce{ |c, d| c + d }',
+                    '  [0, 1].reduce(5) { |c, d| c + d }',
+                    '  [0, 1].reduce(5){ |c, d| c + d }',
+                    '  [0, 1].reduce (5) { |c, d| c + d }',
+                    '  [0, 1].reduce(5) { |c, d| c + d }',
+                    'end'])
+    expect(cop.offences.size).to eq(6)
+    expect(cop.offences.map(&:line).sort).to eq((2..7).to_a)
+  end
 
-        it 'allows calls with proper argument names' do
-          inspect_source(cop,
-                         ['def m',
-                          '  [0, 1].reduce { |a, e| a + e }',
-                          '  [0, 1].reduce{ |a, e| a + e }',
-                          '  [0, 1].reduce(5) { |a, e| a + e }',
-                          '  [0, 1].reduce(5){ |a, e| a + e }',
-                          '  [0, 1].reduce (5) { |a, e| a + e }',
-                          '  [0, 1].reduce(5) { |a, e| a + e }',
-                          'end'])
-          expect(cop.offences).to be_empty
-        end
+  it 'allows calls with proper argument names' do
+    inspect_source(cop,
+                   ['def m',
+                    '  [0, 1].reduce { |a, e| a + e }',
+                    '  [0, 1].reduce{ |a, e| a + e }',
+                    '  [0, 1].reduce(5) { |a, e| a + e }',
+                    '  [0, 1].reduce(5){ |a, e| a + e }',
+                    '  [0, 1].reduce (5) { |a, e| a + e }',
+                    '  [0, 1].reduce(5) { |a, e| a + e }',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'ignores do..end blocks' do
-          inspect_source(cop,
-                         ['def m',
-                          '  [0, 1].reduce do |c, d|',
-                          '    c + d',
-                          '  end',
-                          'end'])
-          expect(cop.offences).to be_empty
-        end
+  it 'ignores do..end blocks' do
+    inspect_source(cop,
+                   ['def m',
+                    '  [0, 1].reduce do |c, d|',
+                    '    c + d',
+                    '  end',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'ignores :reduce symbols' do
-          inspect_source(cop,
-                         ['def m',
-                          '  call_method(:reduce) { |a, b| a + b}',
-                          'end'])
-          expect(cop.offences).to be_empty
-        end
+  it 'ignores :reduce symbols' do
+    inspect_source(cop,
+                   ['def m',
+                    '  call_method(:reduce) { |a, b| a + b}',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not report when destructuring is used' do
-          inspect_source(cop,
-                         ['def m',
-                          '  test.reduce { |a, (id, _)| a + id}',
-                          'end'])
-          expect(cop.offences).to be_empty
-        end
-      end
-    end
+  it 'does not report when destructuring is used' do
+    inspect_source(cop,
+                   ['def m',
+                    '  test.reduce { |a, (id, _)| a + id}',
+                    'end'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,62 +2,56 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe RedundantBegin do
-        subject(:cop) { RedundantBegin.new }
+describe Rubocop::Cop::Style::RedundantBegin do
+  subject(:cop) { described_class.new }
 
-        it 'reports an offence for def with redundant begin block' do
-          src = ['def func',
-                 '  begin',
-                 '    ala',
-                 '  rescue => e',
-                 '    bala',
-                 '  end',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
+  it 'reports an offence for def with redundant begin block' do
+    src = ['def func',
+           '  begin',
+           '    ala',
+           '  rescue => e',
+           '    bala',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'reports an offence for defs with redundant begin block' do
-          src = ['def Test.func',
-                 '  begin',
-                 '    ala',
-                 '  rescue => e',
-                 '    bala',
-                 '  end',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
+  it 'reports an offence for defs with redundant begin block' do
+    src = ['def Test.func',
+           '  begin',
+           '    ala',
+           '  rescue => e',
+           '    bala',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'accepts a def with required begin block' do
-          src = ['def func',
-                 '  begin',
-                 '    ala',
-                 '  rescue => e',
-                 '    bala',
-                 '  end',
-                 '  something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences).to be_empty
-        end
+  it 'accepts a def with required begin block' do
+    src = ['def func',
+           '  begin',
+           '    ala',
+           '  rescue => e',
+           '    bala',
+           '  end',
+           '  something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences).to be_empty
+  end
 
-        it 'accepts a defs with required begin block' do
-          src = ['def Test.func',
-                 '  begin',
-                 '    ala',
-                 '  rescue => e',
-                 '    bala',
-                 '  end',
-                 '  something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences).to be_empty
-        end
-      end
-    end
+  it 'accepts a defs with required begin block' do
+    src = ['def Test.func',
+           '  begin',
+           '    ala',
+           '  rescue => e',
+           '    bala',
+           '  end',
+           '  something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::RedundantException do
+  subject(:cop) { described_class.new }
+
+  it 'reports an offence for a raise with RuntimeError' do
+    inspect_source(cop, ['raise RuntimeError, msg'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'reports an offence for a fail with RuntimeError' do
+    inspect_source(cop, ['fail RuntimeError, msg'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts a raise with RuntimeError if it does not have 2 args' do
+    inspect_source(cop, ['raise RuntimeError, msg, caller'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts a fail with RuntimeError if it does not have 2 args' do
+    inspect_source(cop, ['fail RuntimeError, msg, caller'])
+    expect(cop.offences).to be_empty
+  end
+end

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

@@ -2,78 +2,170 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe RedundantReturn do
-        subject(:cop) { described_class.new }
-
-        it 'reports an offence for def with only a return' do
-          src = ['def func',
-                 '  return something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'reports an offence for defs with only a return' do
-          src = ['def Test.func',
-                 '  return something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'reports an offence for def ending with return' do
-          src = ['def func',
-                 '  one',
-                 '  two',
-                 '  return something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'reports an offence for defs ending with return' do
-          src = ['def func',
-                 '  one',
-                 '  two',
-                 '  return something',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts return in a non-final position' do
-          src = ['def func',
-                 '  return something if something_else',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences).to be_empty
-        end
-
-        it 'does not blow up on empty method body' do
-          src = ['def func',
-                 'end']
-          inspect_source(cop, src)
-          expect(cop.offences).to be_empty
-        end
-
-        it 'auto-corrects by removing redundant returns' do
-          src = ['def func',
-                 '  one',
-                 '  two',
-                 '  return something',
-                 'end'].join("\n")
-          result_src = ['def func',
-                        '  one',
-                        '  two',
-                        '  something',
-                        'end'].join("\n")
-          new_source = autocorrect_source(cop, src)
-          expect(new_source).to eq(result_src)
-        end
-      end
+describe Rubocop::Cop::Style::RedundantReturn, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) { { 'AllowMultipleReturnValues' => false } }
+
+  it 'reports an offence for def with only a return' do
+    src = ['def func',
+           '  return something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'reports an offence for defs with only a return' do
+    src = ['def Test.func',
+           '  return something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'reports an offence for def ending with return' do
+    src = ['def func',
+           '  one',
+           '  two',
+           '  return something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'reports an offence for defs ending with return' do
+    src = ['def func',
+           '  one',
+           '  two',
+           '  return something',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts return in a non-final position' do
+    src = ['def func',
+           '  return something if something_else',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences).to be_empty
+  end
+
+  it 'does not blow up on empty method body' do
+    src = ['def func',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offences).to be_empty
+  end
+
+  it 'auto-corrects by removing redundant returns' do
+    src = ['def func',
+           '  one',
+           '  two',
+           '  return something',
+           'end'].join("\n")
+    result_src = ['def func',
+                  '  one',
+                  '  two',
+                  '  something',
+                  'end'].join("\n")
+    new_source = autocorrect_source(cop, src)
+    expect(new_source).to eq(result_src)
+  end
+
+  context 'when multi-value returns are not allowed' do
+    it 'reports an offence for def with only a return' do
+      src = ['def func',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for defs with only a return' do
+      src = ['def Test.func',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for def ending with return' do
+      src = ['def func',
+             '  one',
+             '  two',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'reports an offence for defs ending with return' do
+      src = ['def func',
+             '  one',
+             '  two',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+    end
+
+    it 'auto-corrects by making implicit arrays explicit' do
+      src = ['def func',
+             '  return  1, 2',
+             'end'].join("\n")
+      result_src = ['def func',
+                    '  [1, 2]', # Just 1, 2 is not valid Ruby.
+                    'end'].join("\n")
+      new_source = autocorrect_source(cop, src)
+      expect(new_source).to eq(result_src)
+    end
+  end
+
+  context 'when multi-value returns are allowed' do
+    let(:cop_config) { { 'AllowMultipleReturnValues' => true } }
+
+    it 'accepts def with only a return' do
+      src = ['def func',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts defs with only a return' do
+      src = ['def Test.func',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts def ending with return' do
+      src = ['def func',
+             '  one',
+             '  two',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts defs ending with return' do
+      src = ['def func',
+             '  one',
+             '  two',
+             '  return something, test',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
+    it 'does not auto-correct' do
+      src = ['def func',
+             '  return  1, 2',
+             'end'].join("\n")
+      new_source = autocorrect_source(cop, src)
+      expect(new_source).to eq(src)
     end
   end
 end