rubocop 0.16.0 → 0.17.0

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

@@ -10,11 +10,8 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'registers an offence for bad indentation of an else body' do
@@ -23,11 +20,8 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '  func1',
                       'else',
                       ' func2',
-                      '  func2',
                       'end'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'registers an offence for bad indentation of an elsif body' do
@@ -36,13 +30,10 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'registers offence for bad indentation of ternary inside else' do
@@ -218,11 +209,8 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'accepts an empty unless' do
@@ -240,11 +228,8 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'registers an offence for bad indentation in a case/else body' do
@@ -256,11 +241,8 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '  e',
                       'else',
                       '   f',
-                      '  g',
                       'end'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 3) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 3) spaces for indentation.'])
     end
 
     it 'accepts correctly indented case/when/else' do
@@ -317,11 +299,8 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'registers an offence for bad indentation of begin/end/while' do
@@ -330,20 +309,15 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       ' func1',
                       '   func2',
                       'end while cond'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 1) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'accepts an empty while' do
@@ -359,11 +333,8 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     end
 
     it 'accepts an empty for' do
@@ -379,22 +350,17 @@ describe Rubocop::Cop::Style::IndentationWidth do
       inspect_source(cop,
                      ['def test',
                       '    func1',
-                      '     func2',
+                      '     func2', # No offence registered for this.
                       'end'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 4) spaces for indentation.'])
     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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 3) spaces for indentation.'])
     end
 
     it 'accepts an empty def body' do
@@ -416,14 +382,10 @@ describe Rubocop::Cop::Style::IndentationWidth do
     it 'registers an offence for bad indentation of a class body' do
       inspect_source(cop,
                      ['class Test',
-                      '    def func1',
+                      '    def func',
                       '    end',
-                      '  def func2',
-                      '  end',
                       'end'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 4) spaces for indentation.'])
     end
 
     it 'accepts an empty class body' do
@@ -453,43 +415,16 @@ describe Rubocop::Cop::Style::IndentationWidth do
                       '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 func1',
+                      '    def func',
                       '    end',
-                      '     def func2',
-                      '     end',
                       'end'])
-      expect(cop.messages)
-        .to eq(['Use 2 (not 4) spaces for indentation.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 4) spaces for indentation.'])
     end
 
     it 'accepts an empty module body' do
@@ -505,29 +440,22 @@ 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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indentation.'])
     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.',
-                'Inconsistent indentation detected.'])
+      expect(cop.messages).to eq(['Use 2 (not 3) spaces for indentation.'])
     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

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

@@ -12,6 +12,15 @@ describe Rubocop::Cop::Style::LambdaCall, :config do
       inspect_source(cop,
                      ['x.(a, b)'])
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'braces')
+    end
+
+    it 'registers an offence for correct + opposite' do
+      inspect_source(cop,
+                     ['x.call(a, b)',
+                      'x.(a, b)'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts x.call()' do
@@ -32,6 +41,15 @@ describe Rubocop::Cop::Style::LambdaCall, :config do
       inspect_source(cop,
                      ['x.call(a, b)'])
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'call')
+    end
+
+    it 'registers an offence for opposite + correct' do
+      inspect_source(cop,
+                     ['x.call(a, b)',
+                      'x.(a, b)'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts x.()' do

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

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
       inspect_source(cop, ['a do',
                            '  b',
                            'end.c'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['end.c'])
     end
 
@@ -34,7 +34,7 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
   context 'with a single-line do..end block' do
     it 'registers an offence for a chained call' do
       inspect_source(cop, ['a do b end.c'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['end.c'])
     end
 

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

@@ -13,6 +13,18 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
              'end']
       inspect_source(cop, src)
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'require_no_parentheses')
+    end
+
+    it 'reports an offence for correct + opposite' do
+      src = ['def func(a, b)',
+             'end',
+             'def func a, b',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'reports an offence for class def with parameters but no parens' do
@@ -29,11 +41,16 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
       expect(cop.offences).to be_empty
     end
 
-    it 'auto-adds required parens' do
+    it 'auto-adds required parens for a def' do
       new_source = autocorrect_source(cop, 'def test param; end')
       expect(new_source).to eq('def test(param); end')
     end
 
+    it 'auto-adds required parens for a defs' do
+      new_source = autocorrect_source(cop, 'def self.test param; end')
+      expect(new_source).to eq('def self.test(param); end')
+    end
+
     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")
@@ -48,6 +65,18 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
              'end']
       inspect_source(cop, src)
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'require_parentheses')
+    end
+
+    it 'reports an offence for opposite + correct' do
+      src = ['def func(a, b)',
+             'end',
+             'def func a, b',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'reports an offence for class def with parameters with parens' do
@@ -68,5 +97,10 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
       new_source = autocorrect_source(cop, 'def test(param); end')
       expect(new_source).to eq('def test param; end')
     end
+
+    it 'auto-removes the parens for defs' do
+      new_source = autocorrect_source(cop, 'def self.test(param); end')
+      expect(new_source).to eq('def self.test param; end')
+    end
   end
 end

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

@@ -17,6 +17,7 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          'end'])
     expect(cop.offences.size).to eq(1)
     expect(cop.offences.map(&:line).sort).to eq([1])
+    expect(cop.config_to_allow_offences).to eq('Max' => 6)
   end
 
   it 'accepts a method with less than 5 lines' do

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

@@ -9,14 +9,14 @@ describe Rubocop::Cop::Style::MethodName, :config do
     it 'registers an offence for mixed snake case and camel case' do
       inspect_source(cop, ['def visit_Arel_Nodes_SelectStatement',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['visit_Arel_Nodes_SelectStatement'])
     end
 
     it 'registers an offence for capitalized camel case' do
       inspect_source(cop, ['def MyMethod',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['MyMethod'])
     end
   end
@@ -42,15 +42,26 @@ describe Rubocop::Cop::Style::MethodName, :config do
       inspect_source(cop, ['def myMethod',
                            '  # ...',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['myMethod'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'camelCase')
+    end
+
+    it 'registers an offence for opposite + correct' do
+      inspect_source(cop, ['def my_method',
+                           'end',
+                           'def myMethod',
+                           'end'])
+      expect(cop.highlights).to eq(['myMethod'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'registers an offence for camel case in singleton method name' do
       inspect_source(cop, ['def self.myMethod',
                            '  # ...',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['myMethod'])
     end
 
@@ -84,8 +95,19 @@ describe Rubocop::Cop::Style::MethodName, :config do
     it 'registers an offence for snake case in names' do
       inspect_source(cop, ['def my_method',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
+      expect(cop.highlights).to eq(['my_method'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'snake_case')
+    end
+
+    it 'registers an offence for correct + opposite' do
+      inspect_source(cop, ['def my_method',
+                           'end',
+                           'def myMethod',
+                           'end'])
       expect(cop.highlights).to eq(['my_method'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     include_examples 'always accepted'

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::MultilineBlockChain do
                            'end.c do',
                            '  d',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['end.c'])
     end
 
@@ -22,7 +22,7 @@ describe Rubocop::Cop::Style::MultilineBlockChain do
                            'end.c1.c2 do',
                            '  d',
                            'end'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['end.c1.c2'])
     end
 
@@ -34,7 +34,7 @@ describe Rubocop::Cop::Style::MultilineBlockChain do
                            'end.e do',
                            '  f',
                            'end'])
-      expect(cop.offences).to have(2).item
+      expect(cop.offences.size).to eq(2)
       expect(cop.highlights).to eq(['end.c', 'end.e'])
     end
 
@@ -43,7 +43,7 @@ describe Rubocop::Cop::Style::MultilineBlockChain do
       inspect_source(cop, ['Thread.list.find_all { |t|',
                            '  t.alive?',
                            '}.map { |thread| thread.object_id }'])
-      expect(cop.offences).to have(1).item
+      expect(cop.offences.size).to eq(1)
       expect(cop.highlights).to eq(['}.map'])
     end