rubocop 0.18.1 → 0.19.0

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

@@ -6,13 +6,13 @@ describe Rubocop::Cop::Lint::ConditionPosition do
   subject(:cop) { described_class.new }
 
   %w(if unless while until).each do |keyword|
-    it 'registers an offence for condition on the next line' do
+    it 'registers an offense for condition on the next line' do
       inspect_source(cop,
                      ["#{keyword}",
                       'x == 10',
                       'end'
                     ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it 'accepts condition on the same line' do
@@ -21,11 +21,11 @@ describe Rubocop::Cop::Lint::ConditionPosition do
                       ' bala',
                       'end'
                     ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
-  it 'registers an offence for elsif condition on the next line' do
+  it 'registers an offense for elsif condition on the next line' do
     inspect_source(cop,
                    ['if something',
                     '  test',
@@ -34,16 +34,16 @@ describe Rubocop::Cop::Lint::ConditionPosition do
                     '  test',
                     'end'
                   ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'handles ternary ops' do
     inspect_source(cop, ['x ? a : b'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'handles modifier forms' do
     inspect_source(cop, ['x if something'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,35 +5,35 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::Debugger do
   subject(:cop) { described_class.new  }
 
-  it 'reports an offence for a debugger call' do
+  it 'reports an offense for a debugger call' do
     src = ['debugger']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'reports an offence for pry bindings' do
+  it 'reports an offense for pry bindings' do
     src = ['binding.pry',
            'binding.remote_pry']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 
-  it 'does not report an offence for non-pry binding' do
+  it 'does not report an offense for non-pry binding' do
     src = ['binding.pirate']
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not report an offence for debugger in comments' do
+  it 'does not report an offense for debugger in comments' do
     src = ['# debugger']
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not report an offence for a debugger or pry method' do
+  it 'does not report an offense for a debugger or pry method' do
     src = ['code.debugger',
            'door.pry']
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+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)'])
+    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)'])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Dir.exists? is deprecated in favor of Dir.exist?.'])
+  end
+
+  it 'auto-corrects File.exists? with File.exist?' do
+    new_source = autocorrect_source(cop, 'File.exists?(something)')
+    expect(new_source).to eq('File.exist?(something)')
+  end
+
+  it 'auto-corrects Dir.exists? with Dir.exist?' do
+    new_source = autocorrect_source(cop, 'Dir.exists?(something)')
+    expect(new_source).to eq('Dir.exist?(something)')
+  end
+end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::ElseLayout do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for expr on same line as else' do
+  it 'registers an offense for expr on same line as else' do
     inspect_source(cop,
                    ['if something',
                     '  test',
@@ -14,7 +14,7 @@ describe Rubocop::Cop::Lint::ElseLayout do
                     '  test',
                     'end'
                   ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts proper else' do
@@ -26,7 +26,7 @@ describe Rubocop::Cop::Lint::ElseLayout do
                     '  test',
                     'end'
                   ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts single-expr else regardless of layout' do
@@ -36,7 +36,7 @@ describe Rubocop::Cop::Lint::ElseLayout do
                     'else bala',
                     'end'
                   ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'can handle elsifs' do
@@ -50,16 +50,16 @@ describe Rubocop::Cop::Lint::ElseLayout do
                     '  test',
                     'end'
                   ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'handles ternary ops' do
     inspect_source(cop, 'x ? a : b')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'handles modifier forms' do
     inspect_source(cop, 'x if something')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,16 +5,16 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::EmptyEnsure do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for empty ensure' do
+  it 'registers an offense for empty ensure' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'ensure',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for non-empty ensure' do
+  it 'does not register an offense for non-empty ensure' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -22,6 +22,6 @@ describe Rubocop::Cop::Lint::EmptyEnsure do
                     'ensure',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -4,22 +4,21 @@ require 'spec_helper'
 
 describe Rubocop::Cop::Lint::EndAlignment, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { {} }
   let(:cop_config) { { 'AlignWith' => 'keyword' } }
   let(:opposite) do
     cop_config['AlignWith'] == 'keyword' ? 'variable' : 'keyword'
   end
 
-  shared_examples 'misaligned' do |alignment_base, arg, end_kw, name|
+  shared_examples 'misaligned' do |prefix, alignment_base, arg, end_kw, name|
     name ||= alignment_base
-    it "registers an offence for mismatched #{name} ... end" do
-      inspect_source(cop, ["#{alignment_base} #{arg}",
+    it "registers an offense for mismatched #{name} ... end" do
+      inspect_source(cop, ["#{prefix}#{alignment_base} #{arg}",
                            end_kw])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages.first)
         .to match(/end at 2, \d+ is not aligned with #{alignment_base} at 1,/)
       expect(cop.highlights.first).to eq('end')
-      expect(cop.config_to_allow_offences).to eq('AlignWith' => opposite)
+      expect(cop.config_to_allow_offenses).to eq('AlignWith' => opposite)
     end
   end
 
@@ -28,18 +27,18 @@ describe Rubocop::Cop::Lint::EndAlignment, :config do
     it "accepts matching #{name} ... end" do
       inspect_source(cop, ["#{alignment_base} #{arg}",
                            end_kw])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
-  include_examples 'misaligned', 'class',  'Test',      '  end'
-  include_examples 'misaligned', 'module', 'Test',      '  end'
-  include_examples 'misaligned', 'def',    'test',      '  end'
-  include_examples 'misaligned', 'def',    'Test.test', '  end', 'defs'
-  include_examples 'misaligned', 'if',     'test',      '  end'
-  include_examples 'misaligned', 'unless', 'test',      '  end'
-  include_examples 'misaligned', 'while',  'test',      '  end'
-  include_examples 'misaligned', 'until',  'test',      '  end'
+  include_examples 'misaligned', '', 'class',  'Test',      '  end'
+  include_examples 'misaligned', '', 'module', 'Test',      '  end'
+  include_examples 'misaligned', '', 'def',    'test',      '  end'
+  include_examples 'misaligned', '', 'def',    'Test.test', '  end', 'defs'
+  include_examples 'misaligned', '', 'if',     'test',      '  end'
+  include_examples 'misaligned', '', 'unless', 'test',      '  end'
+  include_examples 'misaligned', '', 'while',  'test',      '  end'
+  include_examples 'misaligned', '', 'until',  'test',      '  end'
 
   include_examples 'aligned', 'class',  'Test',      'end'
   include_examples 'aligned', 'module', 'Test',      'end'
@@ -56,50 +55,50 @@ describe Rubocop::Cop::Lint::EndAlignment, :config do
     include_examples 'aligned', 'private def',         'test', 'end'
     include_examples 'aligned', 'module_function def', 'test', 'end'
 
-    include_examples('misaligned',
+    include_examples('misaligned', '',
                      'public def', 'test',
                      '       end')
-    include_examples('misaligned',
+    include_examples('misaligned', '',
                      'protected def', 'test',
                      '          end')
-    include_examples('misaligned',
+    include_examples('misaligned', '',
                      'private def', 'test',
                      '        end')
-    include_examples('misaligned',
+    include_examples('misaligned', '',
                      'module_function def', 'test',
                      '                end')
   end
 
   it 'can handle ternary if' do
     inspect_source(cop, 'a = cond ? x : y')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'can handle modifier if' do
     inspect_source(cop, 'a = x if cond')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for correct + opposite' do
+  it 'registers an offense for correct + opposite' do
     inspect_source(cop, ['x = if a',
                          '      a1',
                          '    end',
                          'y = if b',
                          '  b1',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages.first)
-      .to eq('end at 6, 0 is not aligned with y = if at 4, 4')
+      .to eq('end at 6, 0 is not aligned with if at 4, 4')
     expect(cop.highlights.first).to eq('end')
-    expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+    expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
   end
 
   context 'regarding assignment' do
     context 'when AlignWith is keyword' do
-      include_examples 'misaligned', 'var = if',     'test', 'end'
-      include_examples 'misaligned', 'var = unless', 'test', 'end'
-      include_examples 'misaligned', 'var = while',  'test', 'end'
-      include_examples 'misaligned', 'var = until',  'test', 'end'
+      include_examples 'misaligned', 'var = ', 'if',     'test', 'end'
+      include_examples 'misaligned', 'var = ', 'unless', 'test', 'end'
+      include_examples 'misaligned', 'var = ', 'while',  'test', 'end'
+      include_examples 'misaligned', 'var = ', 'until',  'test', 'end'
 
       include_examples 'aligned', 'var = if',     'test', '      end'
       include_examples 'aligned', 'var = unless', 'test', '      end'
@@ -117,11 +116,11 @@ describe Rubocop::Cop::Lint::EndAlignment, :config do
       include_examples 'aligned', 'var = until',  'test', 'end.abc.join("")'
       include_examples 'aligned', 'var = until',  'test', 'end.abc.tap {}'
 
-      include_examples 'misaligned', 'var = if',     'test', '      end'
-      include_examples 'misaligned', 'var = unless', 'test', '      end'
-      include_examples 'misaligned', 'var = while',  'test', '      end'
-      include_examples 'misaligned', 'var = until',  'test', '      end'
-      include_examples 'misaligned', 'var = until',  'test', '      end.join'
+      include_examples 'misaligned', '', 'var = if',     'test', '      end'
+      include_examples 'misaligned', '', 'var = unless', 'test', '      end'
+      include_examples 'misaligned', '', 'var = while',  'test', '      end'
+      include_examples 'misaligned', '', 'var = until',  'test', '      end'
+      include_examples 'misaligned', '', 'var = until',  'test', '      end.j'
 
       include_examples 'aligned', '@var = if',  'test', 'end'
       include_examples 'aligned', '@@var = if', 'test', 'end'

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

@@ -5,25 +5,25 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::EndInMethod do
   subject(:cop) { described_class.new }
 
-  it 'reports an offence for def with an END inside' do
+  it 'reports an offense for def with an END inside' do
     src = ['def test',
            '  END { something }',
            'end']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'reports an offence for defs with an END inside' do
+  it 'reports an offense for defs with an END inside' do
     src = ['def self.test',
            '  END { something }',
            'end']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts END outside of def(s)' do
     src = ['END { something }']
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::EnsureReturn do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for return in ensure' do
+  it 'registers an offense for return in ensure' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -13,10 +13,10 @@ describe Rubocop::Cop::Lint::EnsureReturn do
                     '  file.close',
                     '  return',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for return outside ensure' do
+  it 'does not register an offense for return outside ensure' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Lint::EnsureReturn do
                     'ensure',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not check when ensure block has no body' do

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

@@ -5,31 +5,31 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::Eval do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for eval as function' do
+  it 'registers an offense for eval as function' do
     inspect_source(cop,
                    ['eval(something)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['The use of eval is a serious security risk.'])
   end
 
-  it 'registers an offence for eval as command' do
+  it 'registers an offense for eval as command' do
     inspect_source(cop,
                    ['eval something'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['The use of eval is a serious security risk.'])
   end
 
-  it 'does not register an offence for eval as variable' do
+  it 'does not register an offense for eval as variable' do
     inspect_source(cop,
                    ['eval = something'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for eval as method' do
+  it 'does not register an offense for eval as method' do
     inspect_source(cop,
                    ['something.eval'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end