rubocop 0.25.0 → 0.26.0

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

@@ -127,6 +127,18 @@ describe RuboCop::Cop::Style::FormatString, :config do
         .to eq(['Favor `String#%` over `sprintf`.'])
     end
 
+    it 'accepts format with 1 argument' do
+      inspect_source(cop,
+                     ['format :xml'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts sprintf with 1 argument' do
+      inspect_source(cop,
+                     ['sprintf :xml'])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'accepts String#%' do
       inspect_source(cop,
                      ['puts "%d" % 10'])

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::InfiniteLoop do
+  subject(:cop) { described_class.new }
+
+  %w(1 2.0 [1] {}).each do |lit|
+    it "registers an offense for a while loop with #{lit} as condition" do
+      inspect_source(cop,
+                     ["while #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+  end
+
+  %w(false nil).each do |lit|
+    it "registers an offense for a until loop with #{lit} as condition" do
+      inspect_source(cop,
+                     ["until #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+  end
+
+  it 'accepts Kernel#loop' do
+    inspect_source(cop,
+                   ['loop { break if something }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'auto-corrects the usage of "while/until" with do' do
+    new_source = autocorrect_source(cop, ['while true do',
+                                          'end'])
+    expect(new_source).to eq("loop do\nend")
+  end
+
+  it 'auto-corrects the usage of "while/until" without do' do
+    new_source = autocorrect_source(cop, ['while 1',
+                                          'end'])
+    expect(new_source).to eq("loop do\nend")
+  end
+end

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

@@ -53,7 +53,9 @@ describe RuboCop::Cop::Style::MethodDefParentheses, :config do
 
     it 'auto-adds required parens to argument lists on multiple lines' do
       new_source = autocorrect_source(cop, ['def test one,', 'two', 'end'])
-      expect(new_source).to eq("def test(one,\ntwo)\nend")
+      expect(new_source).to eq(['def test(one,',
+                                'two)',
+                                'end'].join("\n"))
     end
   end
 

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

@@ -104,4 +104,13 @@ describe RuboCop::Cop::Style::MultilineIfThen do
                       'end'])
     end.not_to raise_error
   end
+
+  it 'auto-corrects the usage of "then" in multiline if' do
+    new_source = autocorrect_source(cop, ['if cond then',
+                                          '  something',
+                                          'end'])
+    expect(new_source).to eq(['if cond',
+                              '  something',
+                              'end'].join("\n"))
+  end
 end

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

@@ -230,6 +230,23 @@ describe RuboCop::Cop::Style::PercentLiteralDelimiters, :config do
       expect(new_source).to eq('%w[some words]')
     end
 
+    it 'fixes a string array in a scope' do
+      new_source = autocorrect_source(cop, ['module Foo',
+                                            '   class Bar',
+                                            '     def baz',
+                                            '       %(one two)',
+                                            '     end',
+                                            '   end',
+                                            ' end'])
+      expect(new_source).to eq(['module Foo',
+                                '   class Bar',
+                                '     def baz',
+                                '       %[one two]',
+                                '     end',
+                                '   end',
+                                ' end'].join("\n"))
+    end
+
     it 'fixes a regular expression' do
       original_source = '%r(.*)'
       new_source = autocorrect_source(cop, original_source)
@@ -256,7 +273,10 @@ describe RuboCop::Cop::Style::PercentLiteralDelimiters, :config do
 
     it 'preserves line breaks when fixing a multiline array' do
       new_source = autocorrect_source(cop, ['%w(', 'some', 'words', ')'])
-      expect(new_source).to eq("%w[\nsome\nwords\n]")
+      expect(new_source).to eq(['%w[',
+                                'some',
+                                'words',
+                                ']'].join("\n"))
     end
 
     it 'preserves indentation when correcting a multiline array' do

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

@@ -4,23 +4,54 @@ require 'spec_helper'
 
 describe RuboCop::Cop::Style::PredicateName, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'NamePrefixBlacklist' => %w(has_ is_) } }
 
-  %w(has is).each do |prefix|
-    it 'registers an offense for blacklisted method_name' do
-      inspect_source(cop, ["def #{prefix}_attr",
+  context 'with blacklisted prefices' do
+    let(:cop_config) do
+      { 'NamePrefix' => %w(has_ is_),
+        'NamePrefixBlacklist' => %w(has_ is_) }
+    end
+
+    %w(has is).each do |prefix|
+      it 'registers an offense when method name starts with known prefix' do
+        inspect_source(cop, ["def #{prefix}_attr",
+                             '  # ...',
+                             'end'])
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.messages).to eq(["Rename `#{prefix}_attr` to `attr?`."])
+        expect(cop.highlights).to eq(["#{prefix}_attr"])
+      end
+    end
+
+    it 'accepts method name that starts with unknown prefix' do
+      inspect_source(cop, ['def have_attr',
                            '  # ...',
                            'end'])
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(["Rename `#{prefix}_attr` to `attr?`."])
-      expect(cop.highlights).to eq(["#{prefix}_attr"])
+      expect(cop.offenses).to be_empty
     end
-  end
 
-  it 'accepts non-blacklisted method name' do
-    inspect_source(cop, ['def have_attr',
-                         '  # ...',
-                         'end'])
-    expect(cop.offenses).to be_empty
+    context 'with blacklisted prefices' do
+      let(:cop_config) do
+        { 'NamePrefix' => %w(has_ is_), 'NamePrefixBlacklist' => [] }
+      end
+
+      %w(has is).each do |prefix|
+        it 'registers an offense when method name starts with known prefix' do
+          inspect_source(cop, ["def #{prefix}_attr",
+                               '  # ...',
+                               'end'])
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.messages)
+            .to eq(["Rename `#{prefix}_attr` to `#{prefix}_attr?`."])
+          expect(cop.highlights).to eq(["#{prefix}_attr"])
+        end
+      end
+
+      it 'accepts method name that starts with unknown prefix' do
+        inspect_source(cop, ['def have_attr',
+                             '  # ...',
+                             'end'])
+        expect(cop.offenses).to be_empty
+      end
+    end
   end
 end

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

@@ -86,4 +86,36 @@ describe RuboCop::Cop::Style::RedundantBegin do
     new_source = autocorrect_source(cop, src)
     expect(new_source).to eq(result_src)
   end
+
+  it "doesn't modify spacing when auto-correcting" do
+    src = ['def method',
+           '  begin',
+           '    BlockA do |strategy|',
+           '      foo',
+           '    end',
+           '',
+           '    BlockB do |portfolio|',
+           '      foo',
+           '    end',
+           '',
+           '  rescue => e',
+           '    bar',
+           '  end',
+           'end']
+
+    result_src = ['def method',
+                  '  BlockA do |strategy|',
+                  '    foo',
+                  '  end',
+                  '',
+                  '  BlockB do |portfolio|',
+                  '    foo',
+                  '  end',
+                  '',
+                  'rescue => e',
+                  '  bar',
+                  'end'].join("\n")
+    new_source = autocorrect_source(cop, src)
+    expect(new_source).to eq(result_src)
+  end
 end

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

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::SpaceInsideRangeLiteral do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for space inside .. literal' do
+    inspect_source(cop,
+                   ['1 .. 2',
+                    '1.. 2',
+                    '1 ..2'])
+    expect(cop.offenses.size).to eq(3)
+    expect(cop.messages)
+      .to eq(['Space inside range literal.'] * 3)
+  end
+
+  it 'accepts no space inside .. literal' do
+    inspect_source(cop, '1..2')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'registers an offense for space inside ... literal' do
+    inspect_source(cop,
+                   ['1 ... 2',
+                    '1... 2',
+                    '1 ...2'])
+    expect(cop.offenses.size).to eq(3)
+    expect(cop.messages)
+      .to eq(['Space inside range literal.'] * 3)
+  end
+
+  it 'accepts no space inside ... literal' do
+    inspect_source(cop, '1...2')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts complex range literal with space in it' do
+    inspect_source(cop, '0...(line - 1)')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'autocorrects space around .. literal' do
+    corrected = autocorrect_source(cop, ['1  .. 2'])
+    expect(corrected).to eq '1..2'
+  end
+
+  it 'autocorrects space around ... literal' do
+    corrected = autocorrect_source(cop, ['1  ... 2'])
+    expect(corrected).to eq '1...2'
+  end
+end

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

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::SymbolProc, :config do
+  subject(:cop) { described_class.new(config) }
+
+  let(:cop_config) { { 'IgnoredMethods' => %w(respond_to) } }
+
+  it 'registers an offense for a block with paratermess method call on param' do
+    inspect_source(cop, 'coll.map { |e| e.upcase }')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Pass `&:upcase` as an argument to `map` instead of a block.'])
+  end
+
+  it 'registers an offense for a block when method in body is unary -/=' do
+    inspect_source(cop, ['something.map { |x| -x }'])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Pass `&:-@` as an argument to `map` instead of a block.'])
+  end
+
+  it 'accepts method receiving another argument beside the block' do
+    inspect_source(cop, ['File.open(file) { |f| f.readlines }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts block with more than 1 arguments' do
+    inspect_source(cop, ['something { |x, y| x.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts lambda with 1 argument' do
+    inspect_source(cop, ['->(x) { x.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts ignored method' do
+    inspect_source(cop, ['respond_to { |format| format.xml }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts block with no arguments' do
+    inspect_source(cop, ['something { x.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts empty block body' do
+    inspect_source(cop, ['something { |x| }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts block with more than 1 expression in body' do
+    inspect_source(cop, ['something { |x| x.method; something_else }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts block when method in body is not called on block arg' do
+    inspect_source(cop, ['something { |x| y.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'autocorrects alias with symbols as proc' do
+    corrected = autocorrect_source(cop, ['coll.map { |s| s.upcase }'])
+    expect(corrected).to eq 'coll.map(&:upcase)'
+  end
+end

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

@@ -10,8 +10,38 @@ describe RuboCop::Cop::Style::Tab do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'registers an offence for a line indented with multiple tabs' do
+    inspect_source(cop, ["\t\t\tx = 0"])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'registers an offence for a line indented with mixed whitespace' do
+    inspect_source(cop, [" \tx = 0"])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'accepts a line with tab in a string' do
     inspect_source(cop, ["(x = \"\t\")"])
     expect(cop.offenses).to be_empty
   end
+
+  it 'auto-corrects a line indented with tab' do
+    new_source = autocorrect_source(cop, ["\tx = 0"])
+    expect(new_source).to eq('  x = 0')
+  end
+
+  it 'auto-corrects a line indented with multiple tabs' do
+    new_source = autocorrect_source(cop, ["\t\t\tx = 0"])
+    expect(new_source).to eq('      x = 0')
+  end
+
+  it 'auto-corrects a line indented with mixed whitespace' do
+    new_source = autocorrect_source(cop, [" \tx = 0"])
+    expect(new_source).to eq('   x = 0')
+  end
+
+  it 'auto-corrects a line with tab in a string indented with tab' do
+    new_source = autocorrect_source(cop, ["\t(x = \"\t\")"])
+    expect(new_source).to eq("  (x = \"\t\")")
+  end
 end

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

@@ -17,7 +17,8 @@ describe RuboCop::Cop::Style::TrailingWhitespace do
   end
 
   it 'accepts a line without trailing whitespace' do
-    inspect_source(cop, ["x = 0\n"])
+    inspect_source(cop, ['x = 0',
+                         ''])
     expect(cop.offenses).to be_empty
   end
 

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

@@ -29,6 +29,24 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
     expect(cop.offenses).to be_empty
   end
 
+  it 'registers no offense for %W with special characters' do
+    source = ['def dangerous_characters',
+              '  %W(\000) +',
+              '  %W(\001) +',
+              '  %W(\027) +',
+              '  %W(\002) +',
+              '  %W(\003) +',
+              '  %W(\004) +',
+              '  %W(\005) +',
+              '  %W(\006) +',
+              '  %W(\007) +',
+              '  %W(\00) +',
+              '  %W(\a)',
+              'end']
+    inspect_source(cop, source)
+    expect(cop.offenses).to be_empty
+  end
+
   it 'registers no offense for %w without interpolation' do
     inspect_source(cop,
                    ['%w(cat dog)'])
@@ -75,9 +93,4 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
     new_source = autocorrect_source(cop, '%W(one two three)')
     expect(new_source).to eq('%w(one two three)')
   end
-
-  it 'auto-corrects an array of words and character constants' do
-    new_source = autocorrect_source(cop, '%W(one two ?\n ?\t)')
-    expect(new_source).to eq('%w(one two ?\n ?\t)')
-  end
 end