rubocop 0.13.1 → 0.14.0

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

@@ -1,95 +1,100 @@
-# encoding: utf-8
+ # encoding: utf-8
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe Semicolon do
-        subject(:s) { Semicolon.new }
-        let(:cop_config) do
-          {
-            'AllowAfterParameterListInOneLineMethods' => false,
-            'AllowBeforeEndInOneLineMethods' => true
-          }
-        end
-
-        it 'registers an offence for a single expression' do
-          inspect_source(s,
-                         ['puts "this is a test";'])
-          expect(s.offences.size).to eq(1)
-        end
-
-        it 'registers an offence for several expressions' do
-          inspect_source(s,
-                         ['puts "this is a test"; puts "So is this"'])
-          expect(s.offences.size).to eq(1)
-        end
-
-        it 'registers an offence for one line method with two statements' do
-          inspect_source(s,
-                         ['def foo(a) x(1); y(2); z(3); end'])
-          expect(s.offences.size).to eq(1)
-        end
-
-        it 'accepts semicolon before end if so configured' do
-          inspect_source(s,
-                         ['def foo(a) z(3); end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'accepts semicolon after params if so configured' do
-          inspect_source(s,
-                         ['def foo(a); z(3) end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'accepts one line method definitions' do
-          inspect_source(s,
-                         ['def foo1; x(3) end',
-                          'def initialize(*_); end',
-                          'def foo2() x(3); end',
-                          'def foo3; x(3); end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'accepts one line empty class definitions' do
-          inspect_source(s,
-                         ['# Prefer a single-line format for class ...',
-                          'class Foo < Exception; end',
-                          '',
-                          'class Bar; end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'accepts one line empty method definitions' do
-          inspect_source(s,
-                         ['# One exception to the rule are empty-body methods',
-                          'def no_op; end',
-                          '',
-                          'def foo; end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'accepts one line empty module definitions' do
-          inspect_source(s,
-                         ['module Foo; end'])
-          expect(s.offences).to be_empty
-        end
-
-        it 'registers an offence for semicolon at the end no matter what' do
-          inspect_source(s,
-                         ['module Foo; end;'])
-          expect(s.offences.size).to eq(1)
-        end
-
-        it 'accept semicolons inside strings' do
-          inspect_source(s,
-                         ['string = ";',
-                          'multi-line string"'])
-          expect(s.offences).to be_empty
-        end
-      end
-    end
+describe Rubocop::Cop::Style::Semicolon, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) { { 'AllowAsExpressionSeparator' => false } }
+
+  it 'registers an offence for a single expression' do
+    inspect_source(cop,
+                   ['puts "this is a test";'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'registers an offence for several expressions' do
+    inspect_source(cop,
+                   ['puts "this is a test"; puts "So is this"'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'registers an offence for one line method with two statements' do
+    inspect_source(cop,
+                   ['def foo(a) x(1); y(2); z(3); end'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts semicolon before end if so configured' do
+    inspect_source(cop,
+                   ['def foo(a) z(3); end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts semicolon after params if so configured' do
+    inspect_source(cop,
+                   ['def foo(a); z(3) end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts one line method definitions' do
+    inspect_source(cop,
+                   ['def foo1; x(3) end',
+                    'def initialize(*_); end',
+                    'def foo2() x(3); end',
+                    'def foo3; x(3); end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts one line empty class definitions' do
+    inspect_source(cop,
+                   ['# Prefer a single-line format for class ...',
+                    'class Foo < Exception; end',
+                    '',
+                    'class Bar; end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts one line empty method definitions' do
+    inspect_source(cop,
+                   ['# One exception to the rule are empty-body methods',
+                    'def no_op; end',
+                    '',
+                    'def foo; end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts one line empty module definitions' do
+    inspect_source(cop,
+                   ['module Foo; end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'registers an offence for semicolon at the end no matter what' do
+    inspect_source(cop,
+                   ['module Foo; end;'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accept semicolons inside strings' do
+    inspect_source(cop,
+                   ['string = ";',
+                    'multi-line string"'])
+    expect(cop.offences).to be_empty
   end
+
+   context 'when AllowAsExpressionSeparator is true' do
+     let(:cop_config) { { 'AllowAsExpressionSeparator' => true } }
+
+     it 'accepts several expressions' do
+       inspect_source(cop,
+                      ['puts "this is a test"; puts "So is this"'])
+       expect(cop.offences).to be_empty
+     end
+
+     it 'accepts one line method with two statements' do
+       inspect_source(cop,
+                      ['def foo(a) x(1); y(2); z(3); end'])
+       expect(cop.offences).to be_empty
+     end
+   end
 end

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

@@ -2,101 +2,254 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe SignalException do
-        subject(:cop) { described_class.new }
-
-        it 'registers an offence for raise in begin section' do
-          inspect_source(cop,
-                         ['begin',
-                          '  raise',
-                          'rescue Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([SignalException::FAIL_MSG])
-        end
-
-        it 'registers an offence for raise in def body' do
-          inspect_source(cop,
-                         ['def test',
-                          '  raise',
-                          'rescue Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([SignalException::FAIL_MSG])
-        end
-
-        it 'registers an offence for fail in rescue section' do
-          inspect_source(cop,
-                         ['begin',
-                          '  fail',
-                          'rescue Exception',
-                          '  fail',
-                          'end'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([SignalException::RAISE_MSG])
-        end
-
-        it 'registers an offence for fail def rescue section' do
-          inspect_source(cop,
-                         ['def test',
-                          '  fail',
-                          'rescue Exception',
-                          '  fail',
-                          'end'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([SignalException::RAISE_MSG])
-        end
-
-        it 'is not confused by nested begin/rescue' do
-          inspect_source(cop,
-                         ['begin',
-                          '  raise',
-                          '  begin',
-                          '    raise',
-                          '  rescue',
-                          '    fail',
-                          '  end',
-                          'rescue Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(cop.offences.size).to eq(3)
-          expect(cop.messages).to eq([SignalException::FAIL_MSG] * 2 +
-                                     [SignalException::RAISE_MSG])
-        end
-
-        it 'auto-corrects raise to fail when appropriate' do
-          new_source = autocorrect_source(cop,
-                                          ['begin',
-                                           '  raise',
-                                           'rescue Exception',
-                                           '  raise',
-                                           'end'])
-          expect(new_source).to eq(['begin',
-                                    '  fail',
-                                    'rescue Exception',
-                                    '  raise',
-                                    'end'].join("\n"))
-        end
-
-        it 'auto-corrects fail to raise when appropriate' do
-          new_source = autocorrect_source(cop,
-                                          ['begin',
-                                           '  fail',
-                                           'rescue Exception',
-                                           '  fail',
-                                           'end'])
-          expect(new_source).to eq(['begin',
-                                    '  fail',
-                                    'rescue Exception',
-                                    '  raise',
-                                    'end'].join("\n"))
-        end
-      end
+describe Rubocop::Cop::Style::SignalException, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when enforced style is `semantic`' do
+    let(:cop_config) { { 'EnforcedStyle' => 'semantic' } }
+
+    it 'registers an offence for raise in begin section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  raise',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Use `fail` instead of `raise` to signal exceptions.'])
+    end
+
+    it 'registers an offence for raise in def body' do
+      inspect_source(cop,
+                     ['def test',
+                      '  raise',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Use `fail` instead of `raise` to signal exceptions.'])
+    end
+
+    it 'registers an offence for fail in rescue section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  fail',
+                      'rescue Exception',
+                      '  fail',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Use `raise` instead of `fail` to rethrow exceptions.'])
+    end
+
+    it 'accepts raise in rescue section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  fail',
+                      'rescue Exception',
+                      '  raise RuntimeError',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'registers an offence for fail in def rescue section' do
+      inspect_source(cop,
+                     ['def test',
+                      '  fail',
+                      'rescue Exception',
+                      '  fail',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Use `raise` instead of `fail` to rethrow exceptions.'])
+    end
+
+    it 'accepts raise in def rescue section' do
+      inspect_source(cop,
+                     ['def test',
+                      '  fail',
+                      'rescue Exception',
+                      '  raise',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'registers an offence for raise not in a begin/rescue/end' do
+      inspect_source(cop,
+                     ["case cop_config['EnforcedStyle']",
+                      "when 'single_quotes' then true",
+                      "when 'double_quotes' then false",
+                      "else raise 'Unknown StringLiterals style'",
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Use `fail` instead of `raise` to signal exceptions.'])
+    end
+
+    it 'registers one offence for each raise' do
+      inspect_source(cop,
+                     ['cop.stub(:on_def) { raise RuntimeError }',
+                      'cop.stub(:on_def) { raise RuntimeError }'])
+      expect(cop.offences.size).to eq(2)
+      expect(cop.messages)
+        .to eq(['Use `fail` instead of `raise` to signal exceptions.'] * 2)
+    end
+
+    it 'is not confused by nested begin/rescue' do
+      inspect_source(cop,
+                     ['begin',
+                      '  raise',
+                      '  begin',
+                      '    raise',
+                      '  rescue',
+                      '    fail',
+                      '  end',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(3)
+      expect(cop.messages)
+        .to eq(['Use `fail` instead of `raise` to signal exceptions.'] * 2 +
+               ['Use `raise` instead of `fail` to rethrow exceptions.'])
+    end
+
+    it 'auto-corrects raise to fail when appropriate' do
+      new_source = autocorrect_source(cop,
+                                      ['begin',
+                                       '  raise',
+                                       'rescue Exception',
+                                       '  raise',
+                                       'end'])
+      expect(new_source).to eq(['begin',
+                                '  fail',
+                                'rescue Exception',
+                                '  raise',
+                                'end'].join("\n"))
+    end
+
+    it 'auto-corrects fail to raise when appropriate' do
+      new_source = autocorrect_source(cop,
+                                      ['begin',
+                                       '  fail',
+                                       'rescue Exception',
+                                       '  fail',
+                                       'end'])
+      expect(new_source).to eq(['begin',
+                                '  fail',
+                                'rescue Exception',
+                                '  raise',
+                                'end'].join("\n"))
+    end
+  end
+
+  context 'when enforced style is `raise`' do
+    let(:cop_config) { { 'EnforcedStyle' => 'only_raise' } }
+
+    it 'registers an offence for fail in begin section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  fail',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `raise` to signal exceptions.'])
+    end
+
+    it 'registers an offence for fail in def body' do
+      inspect_source(cop,
+                     ['def test',
+                      '  fail',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `raise` to signal exceptions.'])
+    end
+
+    it 'registers an offence for fail in rescue section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  raise',
+                      'rescue Exception',
+                      '  fail',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `raise` to signal exceptions.'])
+    end
+
+    it 'auto-corrects fail to raise always' do
+      new_source = autocorrect_source(cop,
+                                      ['begin',
+                                       '  fail',
+                                       'rescue Exception',
+                                       '  fail',
+                                       'end'])
+      expect(new_source).to eq(['begin',
+                                '  raise',
+                                'rescue Exception',
+                                '  raise',
+                                'end'].join("\n"))
+    end
+
+  end
+
+  context 'when enforced style is `fail`' do
+    let(:cop_config) { { 'EnforcedStyle' => 'only_fail' } }
+
+    it 'registers an offence for raise in begin section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  raise',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `fail` to signal exceptions.'])
+    end
+
+    it 'registers an offence for raise in def body' do
+      inspect_source(cop,
+                     ['def test',
+                      '  raise',
+                      'rescue Exception',
+                      '  #do nothing',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `fail` to signal exceptions.'])
+    end
+
+    it 'registers an offence for raise in rescue section' do
+      inspect_source(cop,
+                     ['begin',
+                      '  fail',
+                      'rescue Exception',
+                      '  raise',
+                      'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.messages)
+        .to eq(['Always use `fail` to signal exceptions.'])
+    end
+
+    it 'auto-corrects raise to fail always' do
+      new_source = autocorrect_source(cop,
+                                      ['begin',
+                                       '  raise',
+                                       'rescue Exception',
+                                       '  raise',
+                                       'end'])
+      expect(new_source).to eq(['begin',
+                                '  fail',
+                                'rescue Exception',
+                                '  fail',
+                                'end'].join("\n"))
     end
   end
 end