rubocop 0.28.0 → 0.29.0

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

@@ -7,12 +7,12 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
 
   shared_examples 'accepts quote characters' do
     it 'accepts single quotes' do
-      inspect_source(cop, ["'hi'"])
+      inspect_source(cop, "'hi'")
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts double quotes' do
-      inspect_source(cop, ['"hi"'])
+      inspect_source(cop, '"hi"')
       expect(cop.offenses).to be_empty
     end
   end
@@ -20,12 +20,12 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
   shared_examples 'accepts any q string with backslash t' do
     context 'with special characters' do
       it 'accepts %q' do
-        inspect_source(cop, ['%q(\t)'])
+        inspect_source(cop, '%q(\t)')
         expect(cop.offenses).to be_empty
       end
 
       it 'accepts %Q' do
-        inspect_source(cop, ['%Q(\t)'])
+        inspect_source(cop, '%Q(\t)')
         expect(cop.offenses).to be_empty
       end
     end
@@ -36,12 +36,12 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
 
     context 'without interpolation' do
       it 'accepts %q' do
-        inspect_source(cop, ['%q(hi)'])
+        inspect_source(cop, '%q(hi)')
         expect(cop.offenses).to be_empty
       end
 
       it 'registers offense for %Q' do
-        inspect_source(cop, ['%Q(hi)'])
+        inspect_source(cop, '%Q(hi)')
         expect(cop.messages)
           .to eq(['Do not use `%Q` unless interpolation is needed.  Use `%q`.'])
         expect(cop.highlights).to eq(['%Q('])
@@ -58,13 +58,13 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
 
     context 'with interpolation' do
       it 'accepts %Q' do
-        inspect_source(cop, ['%Q(#{1 + 2})'])
+        inspect_source(cop, '%Q(#{1 + 2})')
         expect(cop.offenses).to be_empty
       end
 
       it 'accepts %q' do
         # This is most probably a mistake, but not this cop's responsibility.
-        inspect_source(cop, ['%q(#{1 + 2})'])
+        inspect_source(cop, '%q(#{1 + 2})')
         expect(cop.offenses).to be_empty
       end
 
@@ -77,13 +77,13 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
 
     context 'without interpolation' do
       it 'registers offense for %q' do
-        inspect_source(cop, ['%q(hi)'])
+        inspect_source(cop, '%q(hi)')
         expect(cop.messages).to eq(['Use `%Q` instead of `%q`.'])
         expect(cop.highlights).to eq(['%q('])
       end
 
       it 'accepts %Q' do
-        inspect_source(cop, ['%Q(hi)'])
+        inspect_source(cop, '%Q(hi)')
         expect(cop.offenses).to be_empty
       end
 
@@ -98,7 +98,7 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
 
     context 'with interpolation' do
       it 'accepts %Q' do
-        inspect_source(cop, ['%Q(#{1 + 2})'])
+        inspect_source(cop, '%Q(#{1 + 2})')
         expect(cop.offenses).to be_empty
       end
 
@@ -106,7 +106,7 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
         # It's strange if interpolation syntax appears inside a static string,
         # but we can't be sure if it's a mistake or not. Changing it to %Q
         # would alter semantics, so we leave it as it is.
-        inspect_source(cop, ['%q(#{1 + 2})'])
+        inspect_source(cop, '%q(#{1 + 2})')
         expect(cop.offenses).to be_empty
       end
 

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

@@ -6,17 +6,17 @@ describe RuboCop::Cop::Style::PerlBackrefs do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for $1' do
-    inspect_source(cop, ['puts $1'])
+    inspect_source(cop, 'puts $1')
     expect(cop.offenses.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]')
+    expect(new_source).to eq('Regexp.last_match(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]}"')
+    expect(new_source).to eq('"#{Regexp.last_match(1)}"')
   end
 end

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

@@ -6,17 +6,17 @@ describe RuboCop::Cop::Style::Proc do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a Proc.new call' do
-    inspect_source(cop, ['f = Proc.new { |x| puts x }'])
+    inspect_source(cop, 'f = Proc.new { |x| puts x }')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts the proc method' do
-    inspect_source(cop, ['f = proc { |x| puts x }'])
+    inspect_source(cop, 'f = proc { |x| puts x }')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts the Proc.new call outside of block' do
-    inspect_source(cop, ['p = Proc.new'])
+    inspect_source(cop, 'p = Proc.new')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -9,7 +9,7 @@ describe RuboCop::Cop::Style::RaiseArgs, :config do
     let(:cop_config) { { 'EnforcedStyle' => 'compact' } }
 
     it 'reports an offense for a raise with 2 args' do
-      inspect_source(cop, ['raise RuntimeError, msg'])
+      inspect_source(cop, 'raise RuntimeError, msg')
       expect(cop.offenses.size).to eq(1)
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'exploded')
     end
@@ -27,17 +27,17 @@ describe RuboCop::Cop::Style::RaiseArgs, :config do
     end
 
     it 'reports an offense for a raise with 3 args' do
-      inspect_source(cop, ['raise RuntimeError, msg, caller'])
+      inspect_source(cop, 'raise RuntimeError, msg, caller')
       expect(cop.offenses.size).to eq(1)
     end
 
     it 'accepts a raise with msg argument' do
-      inspect_source(cop, ['raise msg'])
+      inspect_source(cop, 'raise msg')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts a raise with an exception argument' do
-      inspect_source(cop, ['raise Ex.new(msg)'])
+      inspect_source(cop, 'raise Ex.new(msg)')
       expect(cop.offenses).to be_empty
     end
   end
@@ -46,7 +46,7 @@ describe RuboCop::Cop::Style::RaiseArgs, :config do
     let(:cop_config) { { 'EnforcedStyle' => 'exploded' } }
 
     it 'reports an offense for a raise with exception object' do
-      inspect_source(cop, ['raise Ex.new(msg)'])
+      inspect_source(cop, 'raise Ex.new(msg)')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Provide an exception class and message ' \
@@ -65,22 +65,22 @@ describe RuboCop::Cop::Style::RaiseArgs, :config do
     end
 
     it 'accepts exception constructor with more than 1 argument' do
-      inspect_source(cop, ['raise RuntimeError.new(a1, a2, a3)'])
+      inspect_source(cop, 'raise RuntimeError.new(a1, a2, a3)')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts a raise with 3 args' do
-      inspect_source(cop, ['raise RuntimeError, msg, caller'])
+      inspect_source(cop, 'raise RuntimeError, msg, caller')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts a raise with 2 args' do
-      inspect_source(cop, ['raise RuntimeError, msg'])
+      inspect_source(cop, 'raise RuntimeError, msg')
       expect(cop.offenses).to be_empty
     end
 
     it 'accepts a raise with msg argument' do
-      inspect_source(cop, ['raise msg'])
+      inspect_source(cop, 'raise msg')
       expect(cop.offenses).to be_empty
     end
   end

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

@@ -6,7 +6,7 @@ describe RuboCop::Cop::Style::RedundantBegin do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for single line def with redundant begin block' do
-    src = ['  def func; begin; x; y; rescue; z end end']
+    src = '  def func; begin; x; y; rescue; z end end'
     inspect_source(cop, src)
     expect(cop.offenses.size).to eq(1)
   end

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

@@ -6,22 +6,54 @@ describe RuboCop::Cop::Style::RedundantException do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for a raise with RuntimeError' do
-    inspect_source(cop, ['raise RuntimeError, msg'])
+    inspect_source(cop, 'raise RuntimeError, msg')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'reports an offense for a fail with RuntimeError' do
-    inspect_source(cop, ['fail RuntimeError, msg'])
+    inspect_source(cop, 'fail RuntimeError, msg')
     expect(cop.offenses.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'])
+    inspect_source(cop, 'raise RuntimeError, msg, caller')
     expect(cop.offenses).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'])
+    inspect_source(cop, 'fail RuntimeError, msg, caller')
     expect(cop.offenses).to be_empty
   end
+
+  it 'auto-corrects a raise by removing RuntimeError' do
+    src = 'raise RuntimeError, msg'
+    result_src = 'raise msg'
+    new_src = autocorrect_source(cop, src)
+    expect(new_src).to eq(result_src)
+  end
+
+  it 'auto-corrects a fil by removing RuntimeError' do
+    src = 'fail RuntimeError, msg'
+    result_src = 'fail msg'
+    new_src = autocorrect_source(cop, src)
+    expect(new_src).to eq(result_src)
+  end
+
+  it 'does not modify raise w/ RuntimeError if it does not have 2 args' do
+    src = 'raise runtimeError, msg, caller'
+    new_src = autocorrect_source(cop, src)
+    expect(new_src).to eq(src)
+  end
+
+  it 'does not modify fail w/ RuntimeError if it does not have 2 args' do
+    src = 'fail RuntimeError, msg, caller'
+    new_src = autocorrect_source(cop, src)
+    expect(new_src).to eq(src)
+  end
+
+  it 'does not modify rescue w/ non redundant error' do
+    src = 'fail OtherError, msg'
+    new_src = autocorrect_source(cop, src)
+    expect(new_src).to eq(src)
+  end
 end

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

@@ -6,43 +6,43 @@ describe RuboCop::Cop::Style::RedundantSelf do
   subject(:cop) { described_class.new }
 
   it 'reports an offense a self receiver on an rvalue' do
-    src = ['a = self.b']
+    src = 'a = self.b'
     inspect_source(cop, src)
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a self receiver on an lvalue of an assignment' do
-    src = ['self.a = b']
+    src = 'self.a = b'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a self receiver on an lvalue of an or-assignment' do
-    src = ['self.logger ||= Rails.logger']
+    src = 'self.logger ||= Rails.logger'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a self receiver on an lvalue of an and-assignment' do
-    src = ['self.flag &&= value']
+    src = 'self.flag &&= value'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a self receiver on an lvalue of a plus-assignment' do
-    src = ['self.sum += 10']
+    src = 'self.sum += 10'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a self receiver with the square bracket operator' do
-    src = ['self[a]']
+    src = 'self[a]'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a self receiver with the double less-than operator' do
-    src = ['self << a']
+    src = 'self << a'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
@@ -89,54 +89,98 @@ describe RuboCop::Cop::Style::RedundantSelf do
     expect(cop.offenses).to be_empty
   end
 
-  it 'accepts a self receiver used to distinguish from blockarg' do
-    src = ['def requested_specs(&groups)',
-           '  some_method(self.groups)',
-           'end'
-          ]
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
-  end
-
-  it 'accepts a self receiver used to distinguish from argument' do
-    src = ['def requested_specs(groups)',
-           '  some_method(self.groups)',
-           'end'
-          ]
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
+  describe 'instance methods' do
+    it 'accepts a self receiver used to distinguish from blockarg' do
+      src = ['def requested_specs(&groups)',
+             '  some_method(self.groups)',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from argument' do
+      src = ['def requested_specs(groups)',
+             '  some_method(self.groups)',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from argument' do
+      src = ['def requested_specs(final = true)',
+             '  something if self.final != final',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from local variable' do
+      src = ['def requested_specs',
+             '  @requested_specs ||= begin',
+             '    groups = self.groups - Bundler.settings.without',
+             '    groups.map! { |g| g.to_sym }',
+             '    specs_for(groups)',
+             '  end',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  it 'accepts a self receiver used to distinguish from argument' do
-    src = ['def requested_specs(final = true)',
-           '  something if self.final != final',
-           'end'
-          ]
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
-  end
-
-  it 'accepts a self receiver used to distinguish from local variable' do
-    src = ['def requested_specs',
-           '  @requested_specs ||= begin',
-           '    groups = self.groups - Bundler.settings.without',
-           '    groups.map! { |g| g.to_sym }',
-           '    specs_for(groups)',
-           '  end',
-           'end'
-          ]
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
+  describe 'class methods' do
+    it 'accepts a self receiver used to distinguish from blockarg' do
+      src = ['def self.requested_specs(&groups)',
+             '  some_method(self.groups)',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from argument' do
+      src = ['def self.requested_specs(groups)',
+             '  some_method(self.groups)',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from argument' do
+      src = ['def self.requested_specs(final = true)',
+             '  something if self.final != final',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a self receiver used to distinguish from local variable' do
+      src = ['def self.requested_specs',
+             '  @requested_specs ||= begin',
+             '    groups = self.groups - Bundler.settings.without',
+             '    groups.map! { |g| g.to_sym }',
+             '    specs_for(groups)',
+             '  end',
+             'end'
+            ]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
   end
 
   it 'accepts a self receiver used to distinguish from constant' do
-    src = ['self.Foo']
+    src = 'self.Foo'
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects by removing redundant self' do
-    new_source = autocorrect_source(cop, ['self.x'])
+    new_source = autocorrect_source(cop, 'self.x')
     expect(new_source).to eq('x')
   end
 end