rubocop 0.15.0 → 0.16.0

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

@@ -152,6 +152,21 @@ describe Rubocop::Cop::Style::WhileUntilModifier do
     check_short_multiline(cop, 'while')
   end
 
+  it 'accepts oneline while when condition has local variable assignment' do
+    inspect_source(cop, ['lines = %w{first second third}',
+                         'while (line = lines.shift)',
+                         '  puts line',
+                         'end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'registers an offence for oneline while when assignment is in body' do
+    inspect_source(cop, ['while true',
+                         '  x = 0',
+                         'end'])
+    expect(cop.offences.size).to eq(1)
+  end
+
   it 'registers an offence for multiline until that fits on one line' do
     check_really_short(cop, 'until')
   end

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

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::FlipFlop do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence for inclusive flip flops' do
+    inspect_source(cop,
+                   ['DATA.each_line do |line|',
+                    'print line if (line =~ /begin/)..(line =~ /end/)',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'registers an offence for exclusive flip flops' do
+    inspect_source(cop,
+                   ['DATA.each_line do |line|',
+                    'print line if (line =~ /begin/)...(line =~ /end/)',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+  end
+end

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

@@ -2,26 +2,104 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::For do
-  subject(:cop) { described_class.new }
-
-  it 'registers an offence for for' do
-    inspect_source(cop,
-                   ['def func',
-                    '  for n in [1, 2, 3] do',
-                    '    puts n',
-                    '  end',
-                    'end'])
-    expect(cop.offences.size).to eq(1)
-  end
+describe Rubocop::Cop::Style::For, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when each is the enforced style' do
+    let(:cop_config) { { 'EnforcedStyle' => 'each' } }
+
+    it 'registers an offence for for' do
+      inspect_source(cop,
+                     ['def func',
+                      '  for n in [1, 2, 3] do',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.messages).to eq(['Prefer *each* over *for*.'])
+      expect(cop.highlights).to eq(['for'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'for')
+    end
+
+    it 'registers an offence for opposite + correct style' do
+      inspect_source(cop,
+                     ['def func',
+                      '  for n in [1, 2, 3] do',
+                      '    puts n',
+                      '  end',
+                      '  [1, 2, 3].each do |n|',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.messages).to eq(['Prefer *each* over *for*.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+    end
+
+    it 'accepts multiline each' do
+      inspect_source(cop,
+                     ['def func',
+                      '  [1, 2, 3].each do |n|',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
 
-  it 'does not register an offence for :for' do
-    inspect_source(cop, ['[:for, :ala, :bala]'])
-    expect(cop.offences).to be_empty
+    it 'accepts :for' do
+      inspect_source(cop, ['[:for, :ala, :bala]'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts def for' do
+      inspect_source(cop, ['def for; end'])
+      expect(cop.offences).to be_empty
+    end
   end
 
-  it 'does not register an offence for def for' do
-    inspect_source(cop, ['def for; end'])
-    expect(cop.offences).to be_empty
+  context 'when for is the enforced style' do
+    let(:cop_config) { { 'EnforcedStyle' => 'for' } }
+
+    it 'accepts for' do
+      inspect_source(cop,
+                     ['def func',
+                      '  for n in [1, 2, 3] do',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'registers an offence for multiline each' do
+      inspect_source(cop,
+                     ['def func',
+                      '  [1, 2, 3].each do |n|',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.messages).to eq(['Prefer *for* over *each*.'])
+      expect(cop.highlights).to eq(['each'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'each')
+    end
+
+    it 'registers an offence for correct + opposite style' do
+      inspect_source(cop,
+                     ['def func',
+                      '  for n in [1, 2, 3] do',
+                      '    puts n',
+                      '  end',
+                      '  [1, 2, 3].each do |n|',
+                      '    puts n',
+                      '  end',
+                      'end'])
+      expect(cop.messages).to eq(['Prefer *for* over *each*.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+    end
+
+    it 'accepts single line each' do
+      inspect_source(cop,
+                     ['def func',
+                      '  [1, 2, 3].each { |n| puts n }',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
   end
 end

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

@@ -7,7 +7,10 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
 
   context 'configured to enforce ruby19 style' do
     let(:config) do
-      Rubocop::Config.new('HashSyntax' => { 'EnforcedStyle' => 'ruby19' },
+      Rubocop::Config.new('HashSyntax' => {
+                            'EnforcedStyle'   => 'ruby19',
+                            'SupportedStyles' => %w(ruby19 hash_rockets)
+                          },
                           'SpaceAroundOperators' => { 'Enabled' => true })
     end
 
@@ -73,7 +76,10 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
 
     context 'with SpaceAroundOperators disabled' do
       let(:config) do
-        Rubocop::Config.new('HashSyntax' => { 'EnforcedStyle' => 'ruby19' },
+        Rubocop::Config.new('HashSyntax' => {
+                              'EnforcedStyle'   => 'ruby19',
+                              'SupportedStyles' => %w(ruby19 hash_rockets)
+                            },
                             'SpaceAroundOperators' => { 'Enabled' => false })
       end
 

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

@@ -10,9 +10,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['if cond',
                       ' func',
+                      '  func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of an else body' do
@@ -21,9 +23,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '  func1',
                       'else',
                       ' func2',
+                      '  func2',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of an elsif body' do
@@ -32,11 +36,13 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '  b1',
                       'elsif a2',
                       ' b2',
+                      'b3',
                       'else',
                       '  c',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers offence for bad indentation of ternary inside else' do
@@ -106,6 +112,94 @@ describe Rubocop::Cop::Style::IndentationWidth do
       expect(cop.offences).to be_empty
     end
 
+    it 'accepts an if in assignment with end aligned with variable' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '  0',
+                      'end',
+                      '@var = if a',
+                      '  0',
+                      'end',
+                      '$var = if a',
+                      '  0',
+                      'end',
+                      'var ||= if a',
+                      '  0',
+                      'end',
+                      'var &&= if a',
+                      '  0',
+                      'end',
+                      'var -= if a',
+                      '  0',
+                      'end',
+                      'VAR = if a',
+                      '  0',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else in assignment with end aligned with variable' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '  0',
+                      'else',
+                      '  1',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else in assignment with end aligned with variable ' +
+      'and chaining after the end' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '  0',
+                      'else',
+                      '  1',
+                      'end.abc.join("")'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else in assignment with end aligned with variable ' +
+      'and chaining with a block after the end' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '  0',
+                      'else',
+                      '  1',
+                      'end.abc.tap {}'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if in assignment with end aligned with if' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '        0',
+                      '      end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else in assignment with end aligned with if' do
+      inspect_source(cop,
+                     ['var = if a',
+                      '        0',
+                      '      else',
+                      '        1',
+                      '      end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else in assignment on next line with end aligned ' +
+      'with if' do
+      inspect_source(cop,
+                     ['var =',
+                      '  if a',
+                      '    0',
+                      '  else',
+                      '    1',
+                      '  end'])
+      expect(cop.offences).to be_empty
+    end
+
     it 'accepts an if/else branches with rescue clauses' do
       # Because of how the rescue clauses come out of Parser, these are
       # special and need to be tested.
@@ -124,9 +218,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['unless cond',
                       ' func',
+                      '  func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty unless' do
@@ -144,9 +240,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
                      ['case a',
                       'when b',
                       ' c',
+                      '    d',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation in a case/else body' do
@@ -158,9 +256,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '  e',
                       'else',
                       '   f',
+                      '  g',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 3) spaces for indentation.'])
+        .to eq(['Use 2 (not 3) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts correctly indented case/when/else' do
@@ -168,6 +268,7 @@ describe Rubocop::Cop::Style::IndentationWidth do
                      ['case a',
                       'when b',
                       '  c',
+                      '  c',
                       'when d',
                       'else',
                       '  f',
@@ -216,29 +317,33 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['while cond',
                       ' func',
+                      '  func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of begin/end/while' do
       inspect_source(cop,
-                     ['begin',
+                     ['something = begin',
                       ' func1',
                       '   func2',
                       'end while cond'])
       expect(cop.messages)
         .to eq(['Use 2 (not 1) spaces for indentation.',
-                'Use 2 (not 3) spaces for indentation.'])
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of an until body' do
       inspect_source(cop,
                      ['until cond',
                       ' func',
+                      '  func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty while' do
@@ -254,9 +359,11 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['for var in 1..10',
                       ' func',
+                      'func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty for' do
@@ -272,19 +379,22 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['def test',
                       '    func1',
-                      '     func2', # No offence registered for this.
+                      '     func2',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.'])
+        .to eq(['Use 2 (not 4) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of a defs body' do
       inspect_source(cop,
                      ['def self.test',
                       '   func',
+                      '    func',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 3) spaces for indentation.'])
+        .to eq(['Use 2 (not 3) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty def body' do
@@ -306,11 +416,14 @@ describe Rubocop::Cop::Style::IndentationWidth do
     it 'registers an offence for bad indentation of a class body' do
       inspect_source(cop,
                      ['class Test',
-                      '    def func',
+                      '    def func1',
                       '    end',
+                      '  def func2',
+                      '  end',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.'])
+        .to eq(['Use 2 (not 4) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty class body' do
@@ -319,17 +432,64 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       'end'])
       expect(cop.offences).to be_empty
     end
+
+    it 'accepts indented public, protected, and private' do
+      inspect_source(cop,
+                     ['class Test',
+                      '  public',
+                      '',
+                      '  def e',
+                      '  end',
+                      '',
+                      '  protected',
+                      '',
+                      '  def f',
+                      '  end',
+                      '',
+                      '  private',
+                      '',
+                      '  def g',
+                      '  end',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'registers an offence for bad indentation of def but not for ' +
+      'outdented public, protected, and private' do
+      inspect_source(cop,
+                     ['class Test',
+                      'public',
+                      '',
+                      '  def e',
+                      '  end',
+                      '',
+                      'protected',
+                      '',
+                      '  def f',
+                      '  end',
+                      '',
+                      'private',
+                      '',
+                      ' def g',
+                      ' end',
+                      'end'])
+      expect(cop.messages).to eq(['Inconsistent indentation detected.'])
+      expect(cop.highlights).to eq([' '])
+    end
   end
 
   context 'with module' do
     it 'registers an offence for bad indentation of a module body' do
       inspect_source(cop,
                      ['module Test',
-                      '    def func',
+                      '    def func1',
                       '    end',
+                      '     def func2',
+                      '     end',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.'])
+        .to eq(['Use 2 (not 4) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts an empty module body' do
@@ -345,24 +505,29 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['a = func do',
                       ' b',
+                      '  c',
                       'end'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.'])
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'registers an offence for bad indentation of a {} body' do
       inspect_source(cop,
                      ['func {',
                       '   b',
+                      '  c',
                       '}'])
       expect(cop.messages)
-        .to eq(['Use 2 (not 3) spaces for indentation.'])
+        .to eq(['Use 2 (not 3) spaces for indentation.',
+                'Inconsistent indentation detected.'])
     end
 
     it 'accepts a correctly indented block body' do
       inspect_source(cop,
                      ['a = func do',
                       '  b',
+                      '  c',
                       'end'])
       expect(cop.offences).to be_empty
     end