rubocop 0.23.0 → 0.24.0

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

@@ -13,8 +13,83 @@ describe RuboCop::Cop::Style::LineLength, :config do
     expect(cop.config_to_allow_offenses).to eq('Max' => 81)
   end
 
+  it 'highlights excessive characters' do
+    inspect_source(cop, '#' * 80 + 'abc')
+    expect(cop.highlights).to eq(['abc'])
+  end
+
   it "accepts a line that's 80 characters wide" do
     inspect_source(cop, ['#' * 80])
     expect(cop.offenses).to be_empty
   end
+
+  context 'when AllowURI option is enabled' do
+    let(:cop_config) { { 'Max' => 80, 'AllowURI' => true } }
+
+    context 'and all the excessive characters are part of an URL' do
+      # This code example is allowed by AllowURI feature itself :).
+      let(:source) { <<-END }
+        # Some documentation comment...
+        # See: https://github.com/bbatsov/rubocop/commit/3b48d8bdf5b1c2e05e35061837309890f04ab08c
+      END
+
+      it 'accepts the line' do
+        inspect_source(cop, source)
+        expect(cop.offenses).to be_empty
+      end
+    end
+
+    context 'and the excessive characters include a complete URL' do
+      # rubocop:disable Style/LineLength
+      let(:source) { <<-END }
+        # See: http://google.com/, http://gmail.com/, https://maps.google.com/, http://plus.google.com/
+      END
+      # rubocop:enable Style/LineLength
+
+      it 'registers an offense for the line' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+      end
+
+      it 'highlights all the excessive characters' do
+        inspect_source(cop, source)
+        expect(cop.highlights).to eq(['http://plus.google.com/'])
+      end
+    end
+
+    context 'and the excessive characters include part of an URL ' \
+            'and another word' do
+      # rubocop:disable Style/LineLength
+      let(:source) { <<-END }
+        # See: https://github.com/bbatsov/rubocop/commit/3b48d8bdf5b1c2e05e35061837309890f04ab08c and
+        #   http://google.com/
+      END
+      # rubocop:enable Style/LineLength
+
+      it 'registers an offense for the line' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+      end
+
+      it 'highlights only the non-URL part' do
+        inspect_source(cop, source)
+        expect(cop.highlights).to eq([' and'])
+      end
+    end
+  end
+
+  context 'when AllowURI option is disabled' do
+    let(:cop_config) { { 'Max' => 80, 'AllowURI' => false } }
+
+    context 'and all the excessive characters are part of an URL' do
+      let(:source) { <<-END }
+        # See: https://github.com/bbatsov/rubocop/commit/3b48d8bdf5b1c2e05e35061837309890f04ab08c
+      END
+
+      it 'registers an offense for the line' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+      end
+    end
+  end
 end

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

@@ -7,6 +7,7 @@ describe RuboCop::Cop::Style::Next, :config do
   let(:cop_config) { {} }
 
   it 'finds all kind of loops with condition at the end of the iteration' do
+    # TODO: Split this long example into multiple examples.
     inspect_source(cop,
                    ['3.downto(1) do',
                     '  if o == 1',
@@ -122,6 +123,28 @@ describe RuboCop::Cop::Style::Next, :config do
                     '',
                     'loop do',
                     '  break unless o == 1',
+                    'end',
+                    '',
+                    'loop do',
+                    '  if o == 1',
+                    '    break',
+                    '  end',
+                    'end'])
+    expect(cop.offenses.size).to eq(0)
+  end
+
+  it 'ignores loops with conditional return' do
+    inspect_source(cop,
+                   ['loop do',
+                    "  puts ''",
+                    '  return if o == 1',
+                    'end',
+                    '',
+                    'loop do',
+                    "  puts ''",
+                    '  if o == 1',
+                    '    return',
+                    '  end',
                     'end'])
     expect(cop.offenses.size).to eq(0)
   end
@@ -216,4 +239,9 @@ describe RuboCop::Cop::Style::Next, :config do
                     'end'])
     expect(cop.offenses.size).to eq(0)
   end
+
+  it 'does not blow up on empty body until block' do
+    inspect_source(cop, 'until sup; end')
+    expect(cop.offenses.size).to eq(0)
+  end
 end

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

@@ -67,4 +67,14 @@ describe RuboCop::Cop::Style::NumericLiterals, :config do
     corrected = autocorrect_source(cop, ['a = -123456'])
     expect(corrected).to eq 'a = -123_456'
   end
+
+  it 'autocorrects floating-point numbers' do
+    corrected = autocorrect_source(cop, ['a = 123456.78'])
+    expect(corrected).to eq 'a = 123_456.78'
+  end
+
+  it 'autocorrects negative floating-point numbers' do
+    corrected = autocorrect_source(cop, ['a = -123456.78'])
+    expect(corrected).to eq 'a = -123_456.78'
+  end
 end

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

@@ -106,6 +106,11 @@ describe RuboCop::Cop::Style::ParenthesesAroundCondition, :config do
     end
   end
 
+  it 'does not blow up when the condition is a ternary op' do
+    inspect_source(cop, ['x if (a ? b : c)'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   context 'safe assignment is allowed' do
     it 'accepts = in condition surrounded with parentheses' do
       inspect_source(cop,

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

@@ -18,6 +18,23 @@ describe RuboCop::Cop::Style::SpaceAfterColon do
     expect(cop.messages).to be_empty
   end
 
+  it 'accepts colon in ternary followed by space' do
+    inspect_source(cop, ['x = w ? a : b'])
+    expect(cop.messages).to be_empty
+  end
+
+  it 'accepts hash rockets' do
+    inspect_source(cop, ['x = {"a"=>1}'])
+    expect(cop.messages).to be_empty
+  end
+
+  it 'accepts if' do
+    inspect_source(cop, ['x = if w',
+                         '      a',
+                         '    end'])
+    expect(cop.messages).to be_empty
+  end
+
   if RUBY_VERSION >= '2.1'
     it 'accepts colons denoting required keyword argument' do
       inspect_source(cop, ['def initialize(table:, nodes:)',

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

@@ -36,6 +36,17 @@ describe RuboCop::Cop::Style::SpaceAroundEqualsInParameterDefault, :config do
       new_source = autocorrect_source(cop, ['def f(x, y=0, z=1)', 'end'])
       expect(new_source).to eq(['def f(x, y = 0, z = 1)', 'end'].join("\n"))
     end
+
+    it 'accepts default value assignment with space' do
+      inspect_source(cop, ['def f(x, y = +1, z = {})', 'end'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, ['def f(x=-1, y= 0, z =+1)', 'end'])
+      expect(new_source).to eq(['def f(x = -1, y = 0, z = +1)',
+                                'end'].join("\n"))
+    end
   end
 
   context 'when EnforcedStyle is no_space' do

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

@@ -130,6 +130,7 @@ describe RuboCop::Cop::Style::SpaceAroundOperators do
                     '  end',
                     '',
                     '  def each &block',
+                    '    +11',
                     '  end',
                     '',
                     '  def self.search *args',

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

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::SpaceBeforeComma do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for block argument with space before comma' do
+    inspect_source(cop, ['each { |s , t| }'])
+    expect(cop.messages).to eq(
+      ['Space found before comma.'])
+  end
+
+  it 'registers an offense for array index with space before comma' do
+    inspect_source(cop, ['formats[0 , 1]'])
+    expect(cop.messages).to eq(
+      ['Space found before comma.'])
+  end
+
+  it 'registers an offense for method call arg with space before comma' do
+    inspect_source(cop, ['a(1 , 2)'])
+    expect(cop.messages).to eq(
+      ['Space found before comma.'])
+  end
+
+  it 'does not register an offense for no spaces before comma' do
+    inspect_source(cop, ['a(1, 2)'])
+    expect(cop.messages).to be_empty
+  end
+
+  it 'auto-corrects space before comma' do
+    new_source = autocorrect_source(cop,
+                                    'each { |s , t| a(1 , formats[0 , 1])}')
+    expect(new_source).to eq('each { |s, t| a(1, formats[0, 1])}')
+  end
+
+  it 'handles more than one space before a comma' do
+    new_source = autocorrect_source(cop,
+                                    'each { |s  , t| a(1  , formats[0  , 1])}')
+    expect(new_source).to eq('each { |s, t| a(1, formats[0, 1])}')
+  end
+end

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

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::SpaceBeforeSemicolon do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for space before semicolon' do
+    inspect_source(cop, ['x = 1 ; y = 2'])
+    expect(cop.messages).to eq(
+      ['Space found before semicolon.'])
+  end
+
+  it 'does not register an offense for no space before semicolons' do
+    inspect_source(cop, ['x = 1; y = 2'])
+    expect(cop.messages).to be_empty
+  end
+
+  it 'auto-corrects space before semicolon' do
+    new_source = autocorrect_source(cop, 'x = 1 ; y = 2')
+    expect(new_source).to eq('x = 1; y = 2')
+  end
+
+  it 'handles more than one space before a semicolon' do
+    new_source = autocorrect_source(cop, 'x = 1  ; y = 2')
+    expect(new_source).to eq('x = 1; y = 2')
+  end
+end

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

@@ -5,25 +5,26 @@ require 'spec_helper'
 describe RuboCop::Cop::Style::TrailingComma, :config do
   subject(:cop) { described_class.new(config) }
 
-  shared_examples 'single line lists' do
+  shared_examples 'single line lists' do |extra_info|
     it 'registers an offense for trailing comma in an Array literal' do
       inspect_source(cop, 'VALUES = [1001, 2020, 3333, ]')
       expect(cop.messages)
-        .to eq(['Avoid comma after the last item of an array.'])
+        .to eq(["Avoid comma after the last item of an array#{extra_info}."])
       expect(cop.highlights).to eq([','])
     end
 
     it 'registers an offense for trailing comma in a Hash literal' do
       inspect_source(cop, 'MAP = { a: 1001, b: 2020, c: 3333, }')
       expect(cop.messages)
-        .to eq(['Avoid comma after the last item of a hash.'])
+        .to eq(["Avoid comma after the last item of a hash#{extra_info}."])
       expect(cop.highlights).to eq([','])
     end
 
     it 'registers an offense for trailing comma in a method call' do
       inspect_source(cop, 'some_method(a, b, c, )')
       expect(cop.messages)
-        .to eq(['Avoid comma after the last parameter of a method call.'])
+        .to eq(['Avoid comma after the last parameter of a method ' \
+                "call#{extra_info}."])
       expect(cop.highlights).to eq([','])
     end
 
@@ -31,7 +32,8 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
        ' parameters at the end' do
       inspect_source(cop, 'some_method(a, b, c: 0, d: 1, )')
       expect(cop.messages)
-        .to eq(['Avoid comma after the last parameter of a method call.'])
+        .to eq(['Avoid comma after the last parameter of a method ' \
+                "call#{extra_info}."])
       expect(cop.highlights).to eq([','])
     end
 
@@ -78,12 +80,13 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
   context 'with single line list of values' do
     context 'when EnforcedStyleForMultiline is no_comma' do
       let(:cop_config) { { 'EnforcedStyleForMultiline' => 'no_comma' } }
-      include_examples 'single line lists'
+      include_examples 'single line lists', ''
     end
 
     context 'when EnforcedStyleForMultiline is comma' do
       let(:cop_config) { { 'EnforcedStyleForMultiline' => 'comma' } }
-      include_examples 'single line lists'
+      include_examples 'single line lists',
+                       ', unless each item is on its own line'
     end
   end
 
@@ -157,13 +160,21 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
     context 'when EnforcedStyleForMultiline is comma' do
       let(:cop_config) { { 'EnforcedStyleForMultiline' => 'comma' } }
 
-      it 'accepts Array literal with no trailing comma when closing bracket ' \
-         'is on same line as last value' do
-        inspect_source(cop, ['VALUES = [',
-                             '           1001,',
-                             '           2020,',
-                             '           3333]'])
-        expect(cop.offenses).to be_empty
+      context 'when closing bracket is on same line as last value' do
+        it 'accepts Array literal with no trailing comma' do
+          inspect_source(cop, ['VALUES = [',
+                               '           1001,',
+                               '           2020,',
+                               '           3333]'])
+          expect(cop.offenses).to be_empty
+        end
+
+        it 'accepts a method call with Hash as last parameter split on ' \
+           'multiple lines' do
+          inspect_source(cop, ['some_method(a: "b",',
+                               '            c: "d")'])
+          expect(cop.offenses).to be_empty
+        end
       end
 
       it 'accepts Array literal with two of the values on the same line' do
@@ -174,6 +185,17 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
         expect(cop.offenses).to be_empty
       end
 
+      it 'registers an offense for an Array literal with two of the values ' \
+         'on the same line and a trailing comma' do
+        inspect_source(cop, ['VALUES = [',
+                             '           1001, 2020,',
+                             '           3333,',
+                             '         ]'])
+        expect(cop.messages)
+          .to eq(['Avoid comma after the last item of an array, unless each ' \
+                  'item is on its own line.'])
+      end
+
       it 'registers an offense for no trailing comma in a Hash literal' do
         inspect_source(cop, ['MAP = { a: 1001,',
                              '        b: 2020,',
@@ -248,7 +270,7 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
                              "  'auth' => <<-HELP.chomp",
                              '...',
                              'HELP',
-                             '},)']) # We still need a comma after the hash.
+                             '})'])
         expect(cop.offenses).to be_empty
       end
     end

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

@@ -71,15 +71,13 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
     expect(cop.offenses).to be_empty
   end
 
-  # TESTS FOR AUTOCORRECTION
-
-  # it 'auto-corrects an array of words' do
-  #   new_source = autocorrect_source(cop, "['one', %q(two), 'three']")
-  #   expect(new_source).to eq('%w(one two three)')
-  # end
+  it 'auto-corrects an array of words' 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, '[%{one}, %Q(two), ?\n, ?\t]')
-  #   expect(new_source).to eq('%W(one two \n \t)')
-  # 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

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

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::UnneededPercentQ do
+  subject(:cop) { described_class.new }
+
+  context 'with %q strings' do
+    it 'registers an offense for only single quotes' do
+      inspect_source(cop, "%q('hi')")
+      expect(cop.messages).to eq(['Use `%q` only for strings that contain ' \
+                                  'both single quotes and double quotes.'])
+    end
+
+    it 'registers an offense for only double quotes' do
+      inspect_source(cop, '%q("hi")')
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it 'accepts a string with single quotes and double quotes' do
+      inspect_source(cop, %Q(%q('"hi"')))
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'normally auto-corrects %q to single quotes' do
+      new_source = autocorrect_source(cop, '%q(hi)')
+      expect(new_source).to eq("'hi'")
+    end
+
+    it 'auto-corrects %q to double quotes if necessary' do
+      new_source = autocorrect_source(cop, "%q('hi')")
+      expect(new_source).to eq(%q("'hi'"))
+    end
+  end
+
+  context 'with %Q strings' do
+    it 'registers an offense for static string with only double quotes' do
+      inspect_source(cop, '%Q("hi")')
+      expect(cop.messages).to eq(['Use `%Q` only for strings that contain ' \
+                                  'both single quotes and double quotes, or ' \
+                                  'for dynamic strings that contain double ' \
+                                  'quotes.'])
+    end
+
+    it 'accepts a string with single quotes and double quotes' do
+      inspect_source(cop, %Q(%Q('"hi"')))
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts a dynamic %Q string with double quotes' do
+      inspect_source(cop, '%Q("hi#{4}")')
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'auto-corrects static %Q to double quotes' do
+      new_source = autocorrect_source(cop, '%Q(hi)')
+      # One could argue that the double quotes are not necessary for a static
+      # string, but that's the job of the StringLiterals cop to check.
+      expect(new_source).to eq('"hi"')
+    end
+
+    it 'auto-corrects static %Q with inner double quotes to single quotes' do
+      new_source = autocorrect_source(cop, '%Q("hi")')
+      expect(new_source).to eq(%q('"hi"'))
+    end
+
+    it 'auto-corrects dynamic %Q to double quotes' do
+      new_source = autocorrect_source(cop, '%Q(hi #{func})')
+      expect(new_source).to eq('"hi #{func}"')
+    end
+  end
+end