rubocop 0.19.1 → 0.20.0

data/spec/rubocop/cop/style/{hash_methods_spec.rb → deprecated_hash_methods_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::HashMethods do
+describe Rubocop::Cop::Style::DeprecatedHashMethods do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for has_key? with one arg' do
@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::HashMethods do
                    ['o.has_key?(o)'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['has_key? is deprecated in favor of key?.'])
+      .to eq(['`Hash#has_key?` is deprecated in favor of `Hash#key?`.'])
   end
 
   it 'accepts has_key? with no args' do
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Style::HashMethods do
                    ['o.has_value?(o)'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['has_value? is deprecated in favor of value?.'])
+      .to eq(['`Hash#has_value?` is deprecated in favor of `Hash#value?`.'])
   end
 
   it 'accepts has_value? with no args' do

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

@@ -16,7 +16,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Keep a blank line before and after #{access_modifier}."])
+        .to eq(["Keep a blank line before and after `#{access_modifier}`."])
     end
 
     it 'requires blank line after #{access_modifier}' do
@@ -29,7 +29,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Keep a blank line before and after #{access_modifier}."])
+        .to eq(["Keep a blank line before and after `#{access_modifier}`."])
     end
 
     it 'accepts missing blank line when at the beginning of class/module' do

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

@@ -9,56 +9,56 @@ describe Rubocop::Cop::Style::EvenOdd do
     inspect_source(cop,
                    ['x % 2 == 0'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.even?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for x % 2 != 0' do
     inspect_source(cop,
                    ['x % 2 != 0'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for (x % 2) == 0' do
     inspect_source(cop,
                    ['(x % 2) == 0'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.even?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for (x % 2) != 0' do
     inspect_source(cop,
                    ['(x % 2) != 0'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for x % 2 == 1' do
     inspect_source(cop,
                    ['x % 2 == 1'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for x % 2 != 1' do
     inspect_source(cop,
                    ['x % 2 != 1'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.even?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for (x % 2) == 1' do
     inspect_source(cop,
                    ['(x % 2) == 1'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for (x % 2) != 1' do
     inspect_source(cop,
                    ['(x % 2) != 1'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use Fixnum.even?'])
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'accepts x % 3 == 0' do

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

@@ -6,66 +6,79 @@ describe Rubocop::Cop::Style::FileName do
   subject(:cop) { described_class.new(config) }
 
   let(:config) do
-    Rubocop::Config.new('AllCops' => { 'Includes' => includes })
+    Rubocop::Config.new(
+      { 'AllCops' => { 'Include' => includes } },
+      '/some/.rubocop.yml'
+    )
   end
 
   let(:includes) { [] }
+  let(:source) { ['print 1'] }
+  let(:processed_source) { parse_source(source) }
 
-  it 'reports offense for camelCase file names ending in .rb' do
-    source = ['print 1']
-    processed_source = parse_source(source)
+  before do
     allow(processed_source.buffer)
-      .to receive(:name).and_return('/some/dir/testCase.rb')
+    .to receive(:name).and_return(filename)
     _investigate(cop, processed_source)
-    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'reports offense for camelCase file names without file extension' do
-    source = ['print 1']
-    processed_source = parse_source(source)
-    allow(processed_source.buffer)
-      .to receive(:name).and_return('/some/dir/testCase')
-    _investigate(cop, processed_source)
-    expect(cop.offenses.size).to eq(1)
+  context 'with camelCase file names ending in .rb' do
+    let(:filename) { '/some/dir/testCase.rb' }
+
+    it 'reports an offense' do
+      expect(cop.offenses.size).to eq(1)
+    end
   end
 
-  it 'accepts offense for snake_case file names ending in .rb' do
-    source = ['print 1']
-    processed_source = parse_source(source)
-    allow(processed_source.buffer)
-      .to receive(:name).and_return('/some/dir/test_case.rb')
-    _investigate(cop, processed_source)
-    expect(cop.offenses).to be_empty
+  context 'with camelCase file names without file extension' do
+    let(:filename) { '/some/dir/testCase' }
+
+    it 'reports an offense' do
+      expect(cop.offenses.size).to eq(1)
+    end
   end
 
-  it 'accepts offense for snake_case file names without file extension' do
-    source = ['print 1']
-    processed_source = parse_source(source)
-    allow(processed_source.buffer)
-      .to receive(:name).and_return('/some/dir/test_case')
-    _investigate(cop, processed_source)
-    expect(cop.offenses).to be_empty
+  context 'with snake_case file names ending in .rb' do
+    let(:filename) { '/some/dir/test_case.rb' }
+
+    it 'reports an offense' do
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  it 'accepts offense for snake_case file names with non-rb extension' do
-    source = ['print 1']
-    processed_source = parse_source(source)
-    allow(processed_source.buffer)
-      .to receive(:name).and_return('/some/dir/some_task.rake')
-    _investigate(cop, processed_source)
-    expect(cop.offenses).to be_empty
+  context 'with snake_case file names without file extension' do
+    let(:filename) { '/some/dir/test_case' }
+
+    it 'does not report an offense' do
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  context 'when the file is specified in AllCops/Includes' do
-    let(:includes) { ['**/Gemfile'] }
+  context 'with snake_case file names with non-rb extension' do
+    let(:filename) { '/some/dir/some_task.rake' }
 
-    it 'accepts the file name even if it is not snake_case' do
-      source = ['print 1']
-      processed_source = parse_source(source)
-      allow(processed_source.buffer)
-        .to receive(:name).and_return('/some/dir/Gemfile')
-      _investigate(cop, processed_source)
+    it 'does not report an offense' do
       expect(cop.offenses).to be_empty
     end
   end
+
+  context 'with snake_case file names with multiple extensions' do
+    let(:filename) { 'some/dir/some_view.html.slim_spec.rb' }
+
+    it 'does not report an offense' do
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'when the file is specified in AllCops/Include' do
+    let(:includes) { ['**/Gemfile'] }
+
+    context 'with a non-snake_case file name' do
+      let(:filename) { '/some/dir/Gemfile' }
+
+      it 'does not report an offense' do
+        expect(cop.offenses).to be_empty
+      end
+    end
+  end
 end

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

@@ -15,7 +15,7 @@ describe Rubocop::Cop::Style::For, :config do
                       '    puts n',
                       '  end',
                       'end'])
-      expect(cop.messages).to eq(['Prefer *each* over *for*.'])
+      expect(cop.messages).to eq(['Prefer `each` over `for`.'])
       expect(cop.highlights).to eq(['for'])
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'for')
     end
@@ -30,7 +30,7 @@ describe Rubocop::Cop::Style::For, :config do
                       '    puts n',
                       '  end',
                       'end'])
-      expect(cop.messages).to eq(['Prefer *each* over *for*.'])
+      expect(cop.messages).to eq(['Prefer `each` over `for`.'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
@@ -75,7 +75,7 @@ describe Rubocop::Cop::Style::For, :config do
                       '    puts n',
                       '  end',
                       'end'])
-      expect(cop.messages).to eq(['Prefer *for* over *each*.'])
+      expect(cop.messages).to eq(['Prefer `for` over `each`.'])
       expect(cop.highlights).to eq(['each'])
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'each')
     end
@@ -90,7 +90,7 @@ describe Rubocop::Cop::Style::For, :config do
                       '    puts n',
                       '  end',
                       'end'])
-      expect(cop.messages).to eq(['Prefer *for* over *each*.'])
+      expect(cop.messages).to eq(['Prefer `for` over `each`.'])
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts "%d" % 10'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor sprintf over String#%.'])
+        .to eq(['Favor `sprintf` over `String#%`.'])
     end
 
     it 'registers an offense for something followed by an array' do
@@ -20,7 +20,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts x % [10, 11]'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor sprintf over String#%.'])
+        .to eq(['Favor `sprintf` over `String#%`.'])
     end
 
     it 'does not register an offense for numbers' do
@@ -44,7 +44,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts "#{x * 5} %d #{@test}" % 10'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor sprintf over String#%.'])
+        .to eq(['Favor `sprintf` over `String#%`.'])
     end
 
     it 'registers an offense for format' do
@@ -52,7 +52,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['format(something, a, b)'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor sprintf over format.'])
+        .to eq(['Favor `sprintf` over `format`.'])
     end
   end
 
@@ -64,7 +64,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts "%d" % 10'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor format over String#%.'])
+        .to eq(['Favor `format` over `String#%`.'])
     end
 
     it 'registers an offense for something followed by an array' do
@@ -72,7 +72,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts x % [10, 11]'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor format over String#%.'])
+        .to eq(['Favor `format` over `String#%`.'])
     end
 
     it 'does not register an offense for numbers' do
@@ -96,7 +96,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['puts "#{x * 5} %d #{@test}" % 10'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor format over String#%.'])
+        .to eq(['Favor `format` over `String#%`.'])
     end
 
     it 'registers an offense for sprintf' do
@@ -104,7 +104,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['sprintf(something, a, b)'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor format over sprintf.'])
+        .to eq(['Favor `format` over `sprintf`.'])
     end
   end
 
@@ -116,7 +116,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['format(something, a, b)'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor String#% over format.'])
+        .to eq(['Favor `String#%` over `format`.'])
     end
 
     it 'registers an offense for sprintf' do
@@ -124,7 +124,7 @@ describe Rubocop::Cop::Style::FormatString, :config do
                      ['sprintf(something, a, b)'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Favor String#% over sprintf.'])
+        .to eq(['Favor `String#%` over `sprintf`.'])
     end
 
     it 'accepts String#%' do

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

@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::GuardClause do
+  let(:cop) { described_class.new }
+
+  it 'reports an offense if method body is if without else' do
+    src = ['def func',
+           '  if something',
+           '    work',
+           '    work_more',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'reports an offense if method body ends with if without else' do
+    src = ['def func',
+           '  test',
+           '  if something',
+           '    work',
+           '    work_more',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'accepts a method which body is if with else' do
+    src = ['def func',
+           '  if something',
+           '    work',
+           '    work_more',
+           '  else',
+           '    test',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts a method which body does not end with if' do
+    src = ['def func',
+           '  if something',
+           '    work',
+           '    work_more',
+           '  end',
+           '  test',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts a method which body does not end with if' do
+    src = ['def func',
+           '  if something',
+           '    work',
+           '    work_more',
+           '  end',
+           '  test',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts a method whose body is an if with a one-line body' do
+    src = ['def func',
+           '  if something',
+           '    work',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses).to be_empty
+  end
+end

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

@@ -72,9 +72,11 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
       expect(new_source).to eq('{ a: 1, b: 2}')
     end
 
-    it 'does not auto-correct if it interferes with SpaceAroundOperators' do
+    it 'auto-corrects even if it interferes with SpaceAroundOperators' do
+      # Clobbering caused by two cops changing in the same range is dealt with
+      # by the auto-correct loop, so there's no reason to avoid a change.
       new_source = autocorrect_source(cop, '{ :a=>1, :b=>2 }')
-      expect(new_source).to eq('{ :a=>1, :b=>2 }')
+      expect(new_source).to eq('{ a: 1, b: 2 }')
     end
 
     context 'with SpaceAroundOperators disabled' do

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

@@ -23,9 +23,9 @@ describe Rubocop::Cop::Style::IfUnlessModifier do
                     "    #{body}",
                     '  end'])
     expect(cop.messages).to eq(
-      ['Favor modifier if usage when you have a single-line' \
+      ['Favor modifier `if` usage when having a single-line' \
        ' body. Another good alternative is the usage of control flow' \
-       ' &&/||.'])
+       ' `&&`/`||`.'])
   end
 
   it 'registers an offense for short multiline if near an else etc' do
@@ -59,9 +59,9 @@ describe Rubocop::Cop::Style::IfUnlessModifier do
                          '  b',
                          'end'])
     expect(cop.messages).to eq(
-      ['Favor modifier unless usage when you have a single-line' \
+      ['Favor modifier `unless` usage when having a single-line' \
        ' body. Another good alternative is the usage of control flow' \
-       ' &&/||.'])
+       ' `&&`/`||`.'])
   end
 
   it 'accepts code with EOL comment since user might want to keep it' do