rubocop 0.13.1 → 0.14.0

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

@@ -2,68 +2,62 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Lint
-      describe LiteralInCondition do
-        subject(:cop) { LiteralInCondition.new }
-
-        %w(1 2.0 [1] {}).each do |lit|
-          it "registers an offence for literal #{lit} in &&" do
-            inspect_source(cop,
-                           ["if x && #{lit}",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences.size).to eq(1)
-          end
+describe Rubocop::Cop::Lint::LiteralInCondition do
+  subject(:cop) { described_class.new }
+
+  %w(1 2.0 [1] {}).each do |lit|
+    it "registers an offence for literal #{lit} in &&" do
+      inspect_source(cop,
+                     ["if x && #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences.size).to eq(1)
+    end
 
-          it "registers an offence for literal #{lit} in complex cond" do
-            inspect_source(cop,
-                           ["if x && !(a && #{lit}) && y && z",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences.size).to eq(1)
-          end
+    it "registers an offence for literal #{lit} in complex cond" do
+      inspect_source(cop,
+                     ["if x && !(a && #{lit}) && y && z",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences.size).to eq(1)
+    end
 
-          it "registers an offence for literal #{lit} in !" do
-            inspect_source(cop,
-                           ["if !#{lit}",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences.size).to eq(1)
-          end
+    it "registers an offence for literal #{lit} in !" do
+      inspect_source(cop,
+                     ["if !#{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences.size).to eq(1)
+    end
 
-          it "registers an offence for literal #{lit} in complex !" do
-            inspect_source(cop,
-                           ["if !(x && (y && #{lit}))",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences.size).to eq(1)
-          end
+    it "registers an offence for literal #{lit} in complex !" do
+      inspect_source(cop,
+                     ["if !(x && (y && #{lit}))",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences.size).to eq(1)
+    end
 
-          it "accepts literal #{lit} if it's not an and/or operand" do
-            inspect_source(cop,
-                           ["if test(#{lit})",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences).to be_empty
-          end
+    it "accepts literal #{lit} if it's not an and/or operand" do
+      inspect_source(cop,
+                     ["if test(#{lit})",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences).to be_empty
+    end
 
-          it "accepts literal #{lit} in non-toplevel and/or" do
-            inspect_source(cop,
-                           ["if (a || #{lit}).something",
-                            '  top',
-                            'end'
-                           ])
-            expect(cop.offences).to be_empty
-          end
-        end
-      end
+    it "accepts literal #{lit} in non-toplevel and/or" do
+      inspect_source(cop,
+                     ["if (a || #{lit}).something",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offences).to be_empty
     end
   end
 end

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

@@ -2,32 +2,26 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Lint
-      describe Loop do
-        subject(:loop) { Loop.new }
+describe Rubocop::Cop::Lint::Loop do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for begin/end/while' do
-          inspect_source(loop, ['begin something; top; end while test'])
-          expect(loop.offences.size).to eq(1)
-        end
+  it 'registers an offence for begin/end/while' do
+    inspect_source(cop, ['begin something; top; end while test'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'registers an offence for begin/end/until' do
-          inspect_source(loop, ['begin something; top; end until test'])
-          expect(loop.offences.size).to eq(1)
-        end
+  it 'registers an offence for begin/end/until' do
+    inspect_source(cop, ['begin something; top; end until test'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'accepts normal while' do
-          inspect_source(loop, ['while test; one; two; end'])
-          expect(loop.offences).to be_empty
-        end
+  it 'accepts normal while' do
+    inspect_source(cop, ['while test; one; two; end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'accepts normal until' do
-          inspect_source(loop, ['until test; one; two; end'])
-          expect(loop.offences).to be_empty
-        end
-      end
-    end
+  it 'accepts normal until' do
+    inspect_source(cop, ['until test; one; two; end'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,62 +2,56 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Lint
-      describe ParenthesesAsGroupedExpression do
-        subject(: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
+describe Rubocop::Cop::Lint::ParenthesesAsGroupedExpression do
+  subject(:cop) { described_class.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

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

@@ -2,126 +2,120 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Lint
-      describe RescueException do
-        subject(:re) { RescueException.new }
+describe Rubocop::Cop::Lint::RescueException do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for rescue from Exception' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          'rescue Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(re.offences.size).to eq(1)
-          expect(re.messages)
-            .to eq([RescueException::MSG])
-        end
+  it 'registers an offence for rescue from Exception' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    'rescue Exception',
+                    '  #do nothing',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Avoid rescuing the Exception class.'])
+  end
 
-        it 'registers an offence for rescue with ::Exception' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          'rescue ::Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(re.offences.size).to eq(1)
-          expect(re.messages)
-            .to eq([RescueException::MSG])
-        end
+  it 'registers an offence for rescue with ::Exception' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    'rescue ::Exception',
+                    '  #do nothing',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Avoid rescuing the Exception class.'])
+  end
 
-        it 'registers an offence for rescue with StandardError, Exception' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          'rescue StandardError, Exception',
-                          '  #do nothing',
-                          'end'])
-          expect(re.offences.size).to eq(1)
-          expect(re.messages)
-            .to eq([RescueException::MSG])
-        end
+  it 'registers an offence for rescue with StandardError, Exception' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    'rescue StandardError, Exception',
+                    '  #do nothing',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Avoid rescuing the Exception class.'])
+  end
 
-        it 'registers an offence for rescue with Exception => e' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          'rescue Exception => e',
-                          '  #do nothing',
-                          'end'])
-          expect(re.offences.size).to eq(1)
-          expect(re.messages)
-            .to eq([RescueException::MSG])
-        end
+  it 'registers an offence for rescue with Exception => e' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    'rescue Exception => e',
+                    '  #do nothing',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Avoid rescuing the Exception class.'])
+  end
 
-        it 'does not register an offence for rescue with no class' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          '  return',
-                          'rescue',
-                          '  file.close',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
+  it 'does not register an offence for rescue with no class' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    '  return',
+                    'rescue',
+                    '  file.close',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for rescue with no class and => e' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          '  return',
-                          'rescue => e',
-                          '  file.close',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
+  it 'does not register an offence for rescue with no class and => e' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    '  return',
+                    'rescue => e',
+                    '  file.close',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for rescue with other class' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          '  return',
-                          'rescue ArgumentError => e',
-                          '  file.close',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
+  it 'does not register an offence for rescue with other class' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    '  return',
+                    'rescue ArgumentError => e',
+                    '  file.close',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for rescue with other classes' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          '  return',
-                          'rescue EOFError, ArgumentError => e',
-                          '  file.close',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
+  it 'does not register an offence for rescue with other classes' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    '  return',
+                    'rescue EOFError, ArgumentError => e',
+                    '  file.close',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for rescue with a module prefix' do
-          inspect_source(re,
-                         ['begin',
-                          '  something',
-                          '  return',
-                          'rescue Test::Exception => e',
-                          '  file.close',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
+  it 'does not register an offence for rescue with a module prefix' do
+    inspect_source(cop,
+                   ['begin',
+                    '  something',
+                    '  return',
+                    'rescue Test::Exception => e',
+                    '  file.close',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not crash when the splat operator is used in a rescue' do
-          inspect_source(re,
-                         ['ERRORS = [Exception]',
-                          'begin',
-                          '  a = 3 / 0',
-                          'rescue *ERRORS',
-                          '  puts e',
-                          'end'])
-          expect(re.offences).to be_empty
-        end
-      end
-    end
+  it 'does not crash when the splat operator is used in a rescue' do
+    inspect_source(cop,
+                   ['ERRORS = [Exception]',
+                    'begin',
+                    '  a = 3 / 0',
+                    'rescue *ERRORS',
+                    '  puts e',
+                    'end'])
+    expect(cop.offences).to be_empty
   end
 end