rubocop 0.19.1 → 0.20.0

data/spec/rubocop/config_loader_spec.rb

@@ -85,18 +85,18 @@ describe Rubocop::ConfigLoader do
       before do
         create_file('.rubocop.yml',
                     ['AllCops:',
-                     '  Excludes:',
+                     '  Exclude:',
                      '    - vendor/**'
                     ])
 
         create_file(file_path,
                     ['AllCops:',
-                     '  Excludes: []'
+                     '  Exclude: []'
                     ])
       end
 
-      it 'gets AllCops/Excludes from the highest directory level' do
-        excludes = configuration_from_file['AllCops']['Excludes']
+      it 'gets AllCops/Exclude from the highest directory level' do
+        excludes = configuration_from_file['AllCops']['Exclude']
         expect(excludes).to eq([File.expand_path('vendor/**')])
       end
     end
@@ -107,7 +107,7 @@ describe Rubocop::ConfigLoader do
       before do
         create_file('.rubocop.yml',
                     ['AllCops:',
-                     '  Excludes:',
+                     '  Exclude:',
                      '    - vendor/**',
                      '    - !ruby/regexp /[A-Z]/'
                     ])
@@ -115,8 +115,8 @@ describe Rubocop::ConfigLoader do
         create_file(file_path, ['inherit_from: ../.rubocop.yml'])
       end
 
-      it 'gets an absolute AllCops/Excludes' do
-        excludes = configuration_from_file['AllCops']['Excludes']
+      it 'gets an absolute AllCops/Exclude' do
+        excludes = configuration_from_file['AllCops']['Exclude']
         expect(excludes).to eq([File.expand_path('vendor/**'), /[A-Z]/])
       end
     end
@@ -141,7 +141,7 @@ describe Rubocop::ConfigLoader do
       before do
         create_file('src/.rubocop.yml',
                     ['AllCops:',
-                     '  Excludes:',
+                     '  Exclude:',
                      '    - vendor/**'
                     ])
 
@@ -149,7 +149,7 @@ describe Rubocop::ConfigLoader do
       end
 
       it 'gets an absolute AllCops/Exclude' do
-        excludes = configuration_from_file['AllCops']['Excludes']
+        excludes = configuration_from_file['AllCops']['Exclude']
         expect(excludes).to eq([File.expand_path('src/vendor/**')])
       end
     end
@@ -266,19 +266,19 @@ describe Rubocop::ConfigLoader do
     let(:base) do
       {
         'AllCops' => {
-          'Includes' => ['**/*.gemspec', '**/Rakefile'],
-          'Excludes' => []
+          'Include' => ['**/*.gemspec', '**/Rakefile'],
+          'Exclude' => []
         }
       }
     end
     let(:derived) do
-      { 'AllCops' => { 'Excludes' => ['example.rb', 'exclude_*'] } }
+      { 'AllCops' => { 'Exclude' => ['example.rb', 'exclude_*'] } }
     end
 
     it 'returns a recursive merge of its two arguments' do
       expect(merge).to eq('AllCops' => {
-                            'Includes' => ['**/*.gemspec', '**/Rakefile'],
-                            'Excludes' => ['example.rb', 'exclude_*']
+                            'Include' => ['**/*.gemspec', '**/Rakefile'],
+                            'Exclude' => ['example.rb', 'exclude_*']
                           })
     end
   end

data/spec/rubocop/config_spec.rb

@@ -78,7 +78,7 @@ describe Rubocop::Config do
     let(:hash) do
       {
         'AllCops' => {
-          'Includes' => ['Gemfile', 'config/unicorn.rb.example']
+          'Include' => ['Gemfile', 'config/unicorn.rb.example']
         }
       }
     end
@@ -104,7 +104,7 @@ describe Rubocop::Config do
     let(:hash) do
       {
         'AllCops' => {
-          'Excludes' => ['/home/foo/project/log/*']
+          'Exclude' => ['/home/foo/project/log/*']
         }
       }
     end
@@ -135,16 +135,16 @@ describe Rubocop::Config do
     let(:hash) { {} }
     let(:loaded_path) { 'example/.rubocop.yml' }
 
-    context 'when config file has AllCops => Includes key' do
+    context 'when config file has AllCops => Include key' do
       let(:hash) do
         {
           'AllCops' => {
-            'Includes' => ['Gemfile', 'config/unicorn.rb.example']
+            'Include' => ['Gemfile', 'config/unicorn.rb.example']
           }
         }
       end
 
-      it 'returns the Includes value' do
+      it 'returns the Include value' do
         expect(patterns_to_include).to eq([
           'Gemfile',
           'config/unicorn.rb.example'
@@ -162,16 +162,16 @@ describe Rubocop::Config do
     let(:hash) { {} }
     let(:loaded_path) { 'example/.rubocop.yml' }
 
-    context 'when config file has AllCops => Excludes key' do
+    context 'when config file has AllCops => Exclude key' do
       let(:hash) do
         {
           'AllCops' => {
-            'Excludes' => ['log/*']
+            'Exclude' => ['log/*']
           }
         }
       end
 
-      it 'returns the Excludes value' do
+      it 'returns the Exclude value' do
         expect(patterns_to_exclude).to eq(['log/*'])
       end
     end

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

@@ -6,19 +6,24 @@ describe Rubocop::Cop::Lint::DeprecatedClassMethods do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for File.exists?' do
-    inspect_source(cop,
-                   ['File.exists?(o)'])
+    inspect_source(cop, 'File.exists?(o)')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['File.exists? is deprecated in favor of File.exist?.'])
+      .to eq(['`File.exists?` is deprecated in favor of `File.exist?`.'])
+  end
+
+  it 'registers an offense for ::File.exists?' do
+    inspect_source(cop, '::File.exists?(o)')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['`File.exists?` is deprecated in favor of `File.exist?`.'])
   end
 
   it 'registers an offense for Dir.exists?' do
-    inspect_source(cop,
-                   ['Dir.exists?(o)'])
+    inspect_source(cop, 'Dir.exists?(o)')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Dir.exists? is deprecated in favor of Dir.exist?.'])
+      .to eq(['`Dir.exists?` is deprecated in favor of `Dir.exist?`.'])
   end
 
   it 'auto-corrects File.exists? with File.exist?' do

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

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::EmptyInterpolation do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for #{} in interpolation' do
+    inspect_source(cop, ['"this is the #{}"'])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['#{}'])
+  end
+
+  it 'accepts non-empty interpolation' do
+    inspect_source(cop, '"this is #{top} silly"')
+    expect(cop.offenses).to be_empty
+  end
+end

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

@@ -9,16 +9,14 @@ describe Rubocop::Cop::Lint::Eval do
     inspect_source(cop,
                    ['eval(something)'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['The use of eval is a serious security risk.'])
+    expect(cop.highlights) .to eq(['eval'])
   end
 
   it 'registers an offense for eval as command' do
     inspect_source(cop,
                    ['eval something'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['The use of eval is a serious security risk.'])
+    expect(cop.highlights) .to eq(['eval'])
   end
 
   it 'does not register an offense for eval as variable' do

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

@@ -18,4 +18,14 @@ describe Rubocop::Cop::Lint::LiteralInInterpolation do
       expect(cop.offenses.size).to eq(1)
     end
   end
+
+  it 'accepts empty interpolation' do
+    inspect_source(cop, '"this is #{} silly"')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts strings like __FILE__' do
+    inspect_source(cop, '"this is #{__FILE__} silly"')
+    expect(cop.offenses).to be_empty
+  end
 end

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

@@ -13,8 +13,6 @@ describe Rubocop::Cop::Lint::RescueException do
                     '  #do nothing',
                     'end'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Avoid rescuing the Exception class.'])
   end
 
   it 'registers an offense for rescue with ::Exception' do
@@ -25,8 +23,6 @@ describe Rubocop::Cop::Lint::RescueException do
                     '  #do nothing',
                     'end'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Avoid rescuing the Exception class.'])
   end
 
   it 'registers an offense for rescue with StandardError, Exception' do
@@ -37,8 +33,6 @@ describe Rubocop::Cop::Lint::RescueException do
                     '  #do nothing',
                     'end'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Avoid rescuing the Exception class.'])
   end
 
   it 'registers an offense for rescue with Exception => e' do
@@ -49,8 +43,6 @@ describe Rubocop::Cop::Lint::RescueException do
                     '  #do nothing',
                     'end'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Avoid rescuing the Exception class.'])
   end
 
   it 'does not register an offense for rescue with no class' do

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

@@ -22,7 +22,7 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       inspect_source(cop, source)
       expect(cop.offenses.size).to eq(1)
       expect(cop.offenses.first.message)
-        .to include('Shadowing outer local variable - foo')
+        .to include('Shadowing outer local variable - `foo`')
       expect(cop.offenses.first.line).to eq(4)
     end
 
@@ -46,7 +46,7 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       inspect_source(cop, source)
       expect(cop.offenses.size).to eq(1)
       expect(cop.offenses.first.message)
-        .to include('Shadowing outer local variable - foo')
+        .to include('Shadowing outer local variable - `foo`')
       expect(cop.offenses.first.line).to eq(4)
     end
 
@@ -72,7 +72,7 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       inspect_source(cop, source)
       expect(cop.offenses.size).to eq(1)
       expect(cop.offenses.first.message)
-        .to include('Shadowing outer local variable - foo')
+        .to include('Shadowing outer local variable - `foo`')
       expect(cop.offenses.first.line).to eq(4)
     end
 
@@ -97,7 +97,7 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       inspect_source(cop, source)
       expect(cop.offenses.size).to eq(1)
       expect(cop.offenses.first.message)
-        .to include('Shadowing outer local variable - foo')
+        .to include('Shadowing outer local variable - `foo`')
       expect(cop.offenses.first.line).to eq(4)
     end
 

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::SpaceBeforeFirstArg do
+  subject(:cop) { described_class.new }
+
+  context 'for method calls without parentheses' do
+    it 'registers an offense for method call with no space before the ' \
+       'first arg' do
+      inspect_source(cop, ['something?x',
+                           'a.something!y, z'])
+      expect(cop.messages)
+        .to eq(['Put space between the method name and the first ' \
+                'argument.'] * 2)
+      expect(cop.highlights).to eq(%w(x y))
+    end
+
+    it 'accepts a method call with space before the first arg' do
+      inspect_source(cop, ['something? x',
+                           'a.something! y, z'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts square brackets operator' do
+      inspect_source(cop, ['something[:x]'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'for method calls with parentheses' do
+    it 'accepts a method call without space' do
+      inspect_source(cop, ['something?(x)',
+                           'a.something(y, z)'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a method call with space after the left parenthesis' do
+      inspect_source(cop, ['something?(  x  )'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts setter call' do
+      inspect_source(cop, ['self.class.controller_path=(path)'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+end

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

@@ -24,4 +24,14 @@ describe Rubocop::Cop::Lint::StringConversionInInterpolation do
     inspect_source(cop, '"this is the #{result}"')
     expect(cop.offenses).to be_empty
   end
+
+  it 'does not explode on empty interpolation' do
+    inspect_source(cop, '"this is #{} silly"')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'autocorrects by removing the redundant to_s' do
+    corrected = autocorrect_source(cop, ['"some #{something.to_s}"'])
+    expect(corrected).to eq '"some #{something}"'
+  end
 end

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

@@ -0,0 +1,154 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::UselessAccessModifier do
+  subject(:cop) { described_class.new }
+
+  context 'when an access modifier has no effect' do
+    let(:source) do
+      [
+        'class SomeClass',
+        '  def some_method',
+        '    puts 10',
+        '  end',
+        '  private',
+        '  def self.some_method',
+        '    puts 10',
+        '  end',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless `private` access modifier.')
+      expect(cop.offenses.first.line).to eq(5)
+      expect(cop.highlights).to eq(['private'])
+    end
+  end
+
+  context 'when an access modifier has no methods' do
+    let(:source) do
+      [
+        'class SomeClass',
+        '  protected',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless `protected` access modifier.')
+      expect(cop.offenses.first.line).to eq(2)
+      expect(cop.highlights).to eq(['protected'])
+    end
+  end
+
+  context 'when consecutive access modifiers' do
+    let(:source) do
+      [
+        'class SomeClass',
+        ' private',
+        ' private',
+        '  def some_method',
+        '    puts 10',
+        '  end',
+        '  def some_other_method',
+        '    puts 10',
+        '  end',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless `private` access modifier.')
+      expect(cop.offenses.first.line).to eq(2)
+      expect(cop.highlights).to eq(['private'])
+    end
+  end
+
+  context 'when passing method as symbol' do
+    let(:source) do
+      [
+        'class SomeClass',
+        '  def some_method',
+        '    puts 10',
+        '  end',
+        '  private :some_method',
+        'end'
+      ]
+    end
+
+    it 'does not register an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(0)
+    end
+  end
+
+  context 'when class is empty save modifier' do
+    let(:source) do
+      [
+        'class SomeClass',
+        '  private',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless `private` access modifier.')
+      expect(cop.offenses.first.line).to eq(2)
+      expect(cop.highlights).to eq(['private'])
+    end
+  end
+
+  context 'when multiple class definitions in file but only one has offense' do
+    let(:source) do
+      [
+        'class SomeClass',
+        '  private',
+        'end',
+        'class SomeOtherClass',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless `private` access modifier.')
+      expect(cop.offenses.first.line).to eq(2)
+      expect(cop.highlights).to eq(['private'])
+    end
+  end
+
+  if RUBY_ENGINE == 'ruby' && RUBY_VERSION.start_with?('2.1')
+    context 'ruby 2.1 style modifiers' do
+      let(:source) do
+        [
+          'class SomeClass',
+          '  private def some_method',
+          '    puts 10',
+          '  end',
+          'end'
+        ]
+      end
+
+      it 'does not register an offense' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(0)
+      end
+    end
+  end
+end