rubocop 0.18.1 → 0.19.0

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

@@ -4,80 +4,101 @@ require 'spec_helper'
 
 describe Rubocop::Cop::Style::RegexpLiteral, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'MaxSlashes' => 1 } }
-
-  context 'when a regexp uses // delimiters' do
-    context 'when MaxSlashes is 1' do
-      it 'registers an offence for two slashes in regexp' do
-        inspect_source(cop, ['x =~ /home\/\//',
-                             'y =~ /etc\/top\//'])
-        expect(cop.messages)
-          .to eq(['Use %r for regular expressions matching more ' \
-                  "than 1 '/' character."] * 2)
-        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
-      end
-
-      it 'accepts zero or one slash in regexp' do
-        inspect_source(cop, ['x =~ /\/home/',
-                             'y =~ /\//',
-                             'w =~ /\//m',
-                             'z =~ /a/'])
-        expect(cop.offences).to be_empty
-      end
+
+  context 'when MaxSlashes is -1' do
+    let(:cop_config) { { 'MaxSlashes' => -1 } }
+
+    it 'fails' do
+      expect { inspect_source(cop, ['x =~ /home/']) }
+        .to raise_error(RuntimeError)
     end
+  end
 
-    context 'when MaxSlashes is 0' do
-      let(:cop_config) { { 'MaxSlashes' => 0 } }
-
-      it 'registers an offence for one slash in regexp' do
-        inspect_source(cop, ['x =~ /home\//'])
-        expect(cop.messages)
-          .to eq(['Use %r for regular expressions matching more ' \
-                  "than 0 '/' characters."])
-        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
-      end
-
-      it 'accepts zero slashes in regexp' do
-        inspect_source(cop, ['z =~ /a/'])
-        expect(cop.offences).to be_empty
-      end
-
-      it 'registers an offence for zero slashes in regexp' do
-        inspect_source(cop, ['y =~ %r(etc)'])
-        expect(cop.messages)
-          .to eq(['Use %r only for regular expressions matching more ' \
-                  "than 0 '/' characters."])
-        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
-      end
-
-      it 'accepts regexp with one slash' do
-        inspect_source(cop, ['x =~ %r(/home)'])
-        expect(cop.offences).to be_empty
-      end
+  context 'when MaxSlashes is 0' do
+    let(:cop_config) { { 'MaxSlashes' => 0 } }
+
+    it 'registers an offense for one slash in // regexp' do
+      inspect_source(cop, ['x =~ /home\//'])
+      expect(cop.messages)
+        .to eq(['Use %r for regular expressions matching more ' \
+                "than 0 '/' characters."])
+      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => 1)
     end
 
-    it 'ignores slashes do not belong regexp' do
-      inspect_source(cop, ['x =~ /\s{#{x[/\s+/].length}}/'])
-      expect(cop.offences).to be_empty
+    it 'accepts zero slashes in // regexp' do
+      inspect_source(cop, ['z =~ /a/'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for zero slashes in %r regexp' do
+      inspect_source(cop, ['y =~ %r(etc)'])
+      expect(cop.messages)
+        .to eq(['Use %r only for regular expressions matching more ' \
+                "than 0 '/' characters."])
+      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => -1)
+    end
+
+    it 'accepts %r regexp with one slash' do
+      inspect_source(cop, ['x =~ %r(/home)'])
+      expect(cop.offenses).to be_empty
     end
   end
 
-  context 'when a regexp uses %r delimiters' do
-    context 'when MaxSlashes is 1' do
-      it 'registers an offence for zero or one slash in regexp' do
-        inspect_source(cop, ['x =~ %r(/home)',
-                             'y =~ %r(etc)'])
-        expect(cop.messages)
-          .to eq(['Use %r only for regular expressions matching more ' \
-                  "than 1 '/' character."] * 2)
-        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
-      end
-
-      it 'accepts regexp with two or more slashes' do
-        inspect_source(cop, ['x =~ %r(/home/)',
-                             'y =~ %r(/////)'])
-        expect(cop.offences).to be_empty
-      end
+  context 'when MaxSlashes is 1' do
+    let(:cop_config) { { 'MaxSlashes' => 1 } }
+
+    it 'registers an offense for two slashes in // regexp' do
+      inspect_source(cop, ['x =~ /home\/\//',
+                           'y =~ /etc\/top\//'])
+      expect(cop.messages)
+        .to eq(['Use %r for regular expressions matching more ' \
+                "than 1 '/' character."] * 2)
+      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => 2)
+    end
+
+    it 'registers offenses for slashes with too many and %r with too few' do
+      inspect_source(cop, ['x =~ /home\/\//',
+                           'y =~ %r{home}'])
+      expect(cop.messages)
+        .to eq(['Use %r for regular expressions matching more ' \
+                "than 1 '/' character.",
+                'Use %r only for regular expressions matching more ' \
+                "than 1 '/' character."])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'registers offenses for %r with too few and slashes with too many' do
+      inspect_source(cop, ['y =~ %r{home}',
+                           'x =~ /home\/\//'])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'accepts zero or one slash in // regexp' do
+      inspect_source(cop, ['x =~ /\/home/',
+                           'y =~ /\//',
+                           'w =~ /\//m',
+                           'z =~ /a/'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'ignores slashes do not belong // regexp' do
+      inspect_source(cop, ['x =~ /\s{#{x[/\s+/].length}}/'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for zero or one slash in %r regexp' do
+      inspect_source(cop, ['x =~ %r(/home)',
+                           'y =~ %r(etc)'])
+      expect(cop.messages)
+        .to eq(['Use %r only for regular expressions matching more ' \
+                "than 1 '/' character."] * 2)
+      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => -1)
+    end
+
+    it 'accepts %r regexp with two or more slashes' do
+      inspect_source(cop, ['x =~ %r(/home/)',
+                           'y =~ %r(/////)'])
+      expect(cop.offenses).to be_empty
     end
   end
 end

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

@@ -5,10 +5,10 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::RescueModifier do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for modifier rescue' do
+  it 'registers an offense for modifier rescue' do
     inspect_source(cop,
                    ['method rescue handle'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid using rescue in its modifier form.'])
   end
@@ -16,7 +16,7 @@ describe Rubocop::Cop::Style::RescueModifier do
   it 'handles more complex expression with modifier rescue' do
     inspect_source(cop,
                    ['method1 or method2 rescue handle'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid using rescue in its modifier form.'])
   end
@@ -28,21 +28,21 @@ describe Rubocop::Cop::Style::RescueModifier do
                     'rescue',
                     '  normal_handle',
                     'end'])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.first.line).to eq(2)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.first.line).to eq(2)
   end
 
-  it 'does not register an offence for normal rescue' do
+  it 'does not register an offense for normal rescue' do
     inspect_source(cop,
                    ['begin',
                     '  test',
                     'rescue',
                     '  handle',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for normal rescue with ensure' do
+  it 'does not register an offense for normal rescue with ensure' do
     inspect_source(cop,
                    ['begin',
                     '  test',
@@ -51,10 +51,10 @@ describe Rubocop::Cop::Style::RescueModifier do
                     'ensure',
                     '  cleanup',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for nested normal rescue' do
+  it 'does not register an offense for nested normal rescue' do
     inspect_source(cop,
                    ['begin',
                     '  begin',
@@ -65,7 +65,7 @@ describe Rubocop::Cop::Style::RescueModifier do
                     'rescue',
                     '  handle_outer',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when an instance method has implicit begin' do
@@ -76,7 +76,7 @@ describe Rubocop::Cop::Style::RescueModifier do
                       'rescue',
                       '  handle',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'handles modifier rescue in body of implicit begin' do
@@ -86,8 +86,8 @@ describe Rubocop::Cop::Style::RescueModifier do
                       'rescue',
                       '  normal_handle',
                       'end'])
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.line).to eq(2)
     end
   end
 
@@ -99,7 +99,7 @@ describe Rubocop::Cop::Style::RescueModifier do
                       'rescue',
                       '  handle',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'handles modifier rescue in body of implicit begin' do
@@ -109,8 +109,8 @@ describe Rubocop::Cop::Style::RescueModifier do
                       'rescue',
                       '  normal_handle',
                       'end'])
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.line).to eq(2)
     end
   end
 end

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

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::SelfAssignment do
+  subject(:cop) { described_class.new }
+
+  described_class::OPS.product(['x', '@x', '@@x']).each do |op, var|
+    it "registers an offense for non-shorthand assignment #{op} and #{var}" do
+      inspect_source(cop,
+                     ["#{var} = #{var} #{op} y"])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(["Use self-assignment shorthand #{op}=."])
+    end
+
+    it "accepts shorthand assignment for #{op} and #{var}" do
+      inspect_source(cop,
+                     ["#{var} = #{var} #{op} y"])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(["Use self-assignment shorthand #{op}=."])
+    end
+  end
+
+  ['||', '&&'].product(['x', '@x', '@@x']).each do |op, var|
+    it "registers an offense for non-shorthand assignment #{op} and #{var}" do
+      inspect_source(cop,
+                     ["#{var} = #{var} #{op} y"])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(["Use self-assignment shorthand #{op}=."])
+    end
+
+    it "accepts shorthand assignment for #{op} and #{var}" do
+      inspect_source(cop,
+                     ["#{var} = #{var} #{op} y"])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(["Use self-assignment shorthand #{op}=."])
+    end
+  end
+end

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

@@ -6,34 +6,34 @@ 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
+  it 'registers an offense for a single expression' do
     inspect_source(cop,
                    ['puts "this is a test";'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for several expressions' do
+  it 'registers an offense for several expressions' do
     inspect_source(cop,
                    ['puts "this is a test"; puts "So is this"'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for one line method with two statements' do
+  it 'registers an offense 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)
+    expect(cop.offenses.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
+    expect(cop.offenses).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
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts one line method definitions' do
@@ -42,7 +42,7 @@ describe Rubocop::Cop::Style::Semicolon, :config do
                     'def initialize(*_); end',
                     'def foo2() x(3); end',
                     'def foo3; x(3); end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts one line empty class definitions' do
@@ -51,7 +51,7 @@ describe Rubocop::Cop::Style::Semicolon, :config do
                     'class Foo < Exception; end',
                     '',
                     'class Bar; end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts one line empty method definitions' do
@@ -60,26 +60,40 @@ describe Rubocop::Cop::Style::Semicolon, :config do
                     'def no_op; end',
                     '',
                     'def foo; end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts one line empty module definitions' do
     inspect_source(cop,
                    ['module Foo; end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for semicolon at the end no matter what' do
+  it 'registers an offense for semicolon at the end no matter what' do
     inspect_source(cop,
                    ['module Foo; end;'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accept semicolons inside strings' do
     inspect_source(cop,
                    ['string = ";',
                     'multi-line string"'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'auto-corrects semicolons when syntactically possible' do
+    corrected =
+      autocorrect_source(cop,
+                         ['module Foo; end;',
+                          'puts "this is a test";',
+                          'puts "this is a test"; puts "So is this"',
+                          'def foo(a) x(1); y(2); z(3); end'])
+    expect(corrected)
+      .to eq(['module Foo; end',
+              'puts "this is a test"',
+              'puts "this is a test"; puts "So is this"',
+              'def foo(a) x(1); y(2); z(3); end'].join("\n"))
   end
 
   context 'when AllowAsExpressionSeparator is true' do
@@ -88,13 +102,13 @@ describe Rubocop::Cop::Style::Semicolon, :config do
     it 'accepts several expressions' do
       inspect_source(cop,
                      ['puts "this is a test"; puts "So is this"'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).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
+      expect(cop.offenses).to be_empty
     end
   end
 end

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

@@ -8,38 +8,38 @@ describe Rubocop::Cop::Style::SignalException, :config do
   context 'when enforced style is `semantic`' do
     let(:cop_config) { { 'EnforcedStyle' => 'semantic' } }
 
-    it 'registers an offence for raise in begin section' do
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense for fail in rescue section' do
       inspect_source(cop,
                      ['begin',
                       '  fail',
                       'rescue Exception',
                       '  fail',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use `raise` instead of `fail` to rethrow exceptions.'])
     end
@@ -51,28 +51,28 @@ describe Rubocop::Cop::Style::SignalException, :config do
                       'rescue Exception',
                       '  raise RuntimeError',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for fail in def rescue section' do
+    it 'registers an offense 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.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use `raise` instead of `fail` to rethrow exceptions.'])
     end
 
-    it 'registers only offence for one raise that should be fail' do
+    it 'registers only offense for one raise that should be fail' do
       # This is a special case that has caused double reporting.
       inspect_source(cop,
                      ['map do',
                       "  raise 'I'",
                       'end.flatten.compact'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use `fail` instead of `raise` to signal exceptions.'])
     end
@@ -84,26 +84,26 @@ describe Rubocop::Cop::Style::SignalException, :config do
                       'rescue Exception',
                       '  raise',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for raise not in a begin/rescue/end' do
+    it 'registers an offense 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.offenses.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
+    it 'registers one offense 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.offenses.size).to eq(2)
       expect(cop.messages)
         .to eq(['Use `fail` instead of `raise` to signal exceptions.'] * 2)
     end
@@ -120,7 +120,7 @@ describe Rubocop::Cop::Style::SignalException, :config do
                       'rescue Exception',
                       '  #do nothing',
                       'end'])
-      expect(cop.offences.size).to eq(3)
+      expect(cop.offenses.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.'])
@@ -158,38 +158,38 @@ describe Rubocop::Cop::Style::SignalException, :config do
   context 'when enforced style is `raise`' do
     let(:cop_config) { { 'EnforcedStyle' => 'only_raise' } }
 
-    it 'registers an offence for fail in begin section' do
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense for fail in rescue section' do
       inspect_source(cop,
                      ['begin',
                       '  raise',
                       'rescue Exception',
                       '  fail',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Always use `raise` to signal exceptions.'])
     end
@@ -213,38 +213,38 @@ describe Rubocop::Cop::Style::SignalException, :config do
   context 'when enforced style is `fail`' do
     let(:cop_config) { { 'EnforcedStyle' => 'only_fail' } }
 
-    it 'registers an offence for raise in begin section' do
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense 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.offenses.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
+    it 'registers an offense for raise in rescue section' do
       inspect_source(cop,
                      ['begin',
                       '  fail',
                       'rescue Exception',
                       '  raise',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Always use `fail` to signal exceptions.'])
     end