rubocop 0.18.1 → 0.19.0

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

@@ -22,8 +22,8 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                     '  [0, 1].reduce(5) { |c, d| c + d }',
                     '  ala.test { |x, z| bala }',
                     'end'])
-    expect(cop.offences.size).to eq(7)
-    expect(cop.offences.map(&:line).sort).to eq((2..8).to_a)
+    expect(cop.offenses.size).to eq(7)
+    expect(cop.offenses.map(&:line).sort).to eq((2..8).to_a)
   end
 
   it 'allows calls with proper argument names' do
@@ -37,7 +37,7 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                     '  [0, 1].reduce(5) { |a, e| a + e }',
                     '  ala.test { |x, y| bala }',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'ignores do..end blocks' do
@@ -47,7 +47,7 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                     '    c + d',
                     '  end',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'ignores :reduce symbols' do
@@ -55,7 +55,7 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                    ['def m',
                     '  call_method(:reduce) { |a, b| a + b}',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not report when destructuring is used' do
@@ -63,6 +63,6 @@ describe Rubocop::Cop::Style::SingleLineBlockParams, :config do
                    ['def m',
                     '  test.reduce { |a, (id, _)| a + id}',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -6,7 +6,7 @@ describe Rubocop::Cop::Style::SingleLineMethods, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'AllowIfMethodIsEmpty' => true } }
 
-  it 'registers an offence for a single-line method' do
+  it 'registers an offense for a single-line method' do
     inspect_source(cop,
                    ['def some_method; body end',
                     'def link_to(name, url); {:name => name}; end',
@@ -18,11 +18,11 @@ describe Rubocop::Cop::Style::SingleLineMethods, :config do
   context 'when AllowIfMethodIsEmpty is disabled' do
     let(:cop_config) { { 'AllowIfMethodIsEmpty' => false } }
 
-    it 'registers an offence for an empty method' do
+    it 'registers an offense for an empty method' do
       inspect_source(cop, ['def no_op; end',
                            'def self.resource_class=(klass); end',
                            'def @table.columns; end'])
-      expect(cop.offences.size).to eq(3)
+      expect(cop.offenses.size).to eq(3)
     end
   end
 
@@ -33,7 +33,7 @@ describe Rubocop::Cop::Style::SingleLineMethods, :config do
       inspect_source(cop, ['def no_op; end',
                            'def self.resource_class=(klass); end',
                            'def @table.columns; end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -41,12 +41,50 @@ describe Rubocop::Cop::Style::SingleLineMethods, :config do
     inspect_source(cop, ['def some_method',
                          '  body',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not crash on an method with a capitalized name' do
     inspect_source(cop, ['def NoSnakeCase',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'auto-corrects def with semicolon after method name' do
+    corrected = autocorrect_source(cop,
+                                   ['  def some_method; body end # Cmnt'])
+    expect(corrected).to eq ['  # Cmnt',
+                             '  def some_method; ',
+                             '    body ',
+                             '  end '].join("\n")
+  end
+
+  it 'auto-corrects defs with parentheses after method name' do
+    corrected = autocorrect_source(cop, ['  def self.some_method() body end'])
+    expect(corrected).to eq ['  def self.some_method() ',
+                             '    body ',
+                             '  end'].join("\n")
+  end
+
+  it 'auto-corrects def with argument in parentheses' do
+    corrected = autocorrect_source(cop, ['  def some_method(arg) body end'])
+    expect(corrected).to eq ['  def some_method(arg) ',
+                             '    body ',
+                             '  end'].join("\n")
+  end
+
+  it 'auto-corrects def with argument and no parentheses' do
+    corrected = autocorrect_source(cop, ['  def some_method arg; body end'])
+    expect(corrected).to eq ['  def some_method arg; ',
+                             '    body ',
+                             '  end'].join("\n")
+  end
+
+  it 'auto-corrects def with semicolon before end' do
+    corrected = autocorrect_source(cop, ['  def some_method; b1; b2; end'])
+    expect(corrected).to eq ['  def some_method; ',
+                             '    b1; ',
+                             '    b2; ',
+                             '  end'].join("\n")
   end
 end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterColon do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for colon without space after it' do
+  it 'registers an offense for colon without space after it' do
     # TODO: There is double reporting of the last colon (also from
     # SpaceAroundOperators).
     inspect_source(cop, ['x = w ? {a:3}:4'])

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

@@ -5,19 +5,19 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterComma do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for block argument commas without space' do
+  it 'registers an offense for block argument commas without space' do
     inspect_source(cop, ['each { |s,t| }'])
     expect(cop.messages).to eq(
       ['Space missing after comma.'])
   end
 
-  it 'registers an offence for array index commas without space' do
+  it 'registers an offense for array index commas without space' do
     inspect_source(cop, ['formats[0,1]'])
     expect(cop.messages).to eq(
       ['Space missing after comma.'])
   end
 
-  it 'registers an offence for method call arg commas without space' do
+  it 'registers an offense for method call arg commas without space' do
     inspect_source(cop, ['a(1,2)'])
     expect(cop.messages).to eq(
       ['Space missing after comma.'])

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

@@ -5,52 +5,52 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterControlKeyword do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for normal if' do
+  it 'registers an offense for normal if' do
     inspect_source(cop,
                    ['if(test) then result end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for modifier unless' do
+  it 'registers an offense for modifier unless' do
     inspect_source(cop, ['action unless(test)'])
 
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not get confused by keywords' do
     inspect_source(cop, ['[:if, :unless].action'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not get confused by the ternary operator' do
     inspect_source(cop, ['a ? b : c'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for if, elsif, and unless' do
+  it 'registers an offense for if, elsif, and unless' do
     inspect_source(cop,
                    ['if(a)',
                     'elsif(b)',
                     '  unless(c)',
                     '  end',
                     'end'])
-    expect(cop.offences.map(&:line)).to eq([1, 2, 3])
+    expect(cop.offenses.map(&:line)).to eq([1, 2, 3])
   end
 
-  it 'registers an offence for case and when' do
+  it 'registers an offense for case and when' do
     inspect_source(cop,
                    ['case(a)',
                     'when(0) then 1',
                     'end'])
-    expect(cop.offences.map(&:line)).to eq([1, 2])
+    expect(cop.offenses.map(&:line)).to eq([1, 2])
   end
 
-  it 'registers an offence for while and until' do
+  it 'registers an offense for while and until' do
     inspect_source(cop,
                    ['while(a)',
                     '  b until(c)',
                     'end'])
-    expect(cop.offences.map(&:line)).to eq([1, 2])
+    expect(cop.offenses.map(&:line)).to eq([1, 2])
   end
 
   it 'auto-corrects missing space' do

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

@@ -5,20 +5,20 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterMethodName do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for def with space before the parenthesis' do
+  it 'registers an offense for def with space before the parenthesis' do
     inspect_source(cop,
                    ['def func (x)',
                     '  a',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for defs with space before the parenthesis' do
+  it 'registers an offense for defs with space before the parenthesis' do
     inspect_source(cop,
                    ['def self.func (x)',
                     '  a',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a def without arguments' do
@@ -26,7 +26,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def func',
                     '  a',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a defs without arguments' do
@@ -34,7 +34,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def self.func',
                     '  a',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a def with arguments but no parentheses' do
@@ -42,7 +42,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def func x',
                     '  a',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a defs with arguments but no parentheses' do
@@ -50,7 +50,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def self.func x',
                     '  a',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects unwanted space' do

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

@@ -5,14 +5,14 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterNot do
   subject(:cop) { described_class.new }
 
-  it 'reports an offence for space after !' do
+  it 'reports an offense for space after !' do
     inspect_source(cop, ['! something'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts no space after !' do
     inspect_source(cop, ['!something'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects by removing redundant space' do

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAfterSemicolon do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for semicolon without space after it' do
+  it 'registers an offense for semicolon without space after it' do
     inspect_source(cop, ['x = 1;y = 2'])
     expect(cop.messages).to eq(
       ['Space missing after semicolon.'])

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

@@ -2,32 +2,74 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAroundEqualsInParameterDefault do
-  subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::SpaceAroundEqualsInParameterDefault, :config do
+  subject(:cop) { described_class.new(config) }
 
-  it 'registers an offence for default value assignment without space' do
-    inspect_source(cop, ['def f(x, y=0, z=1)', 'end'])
-    expect(cop.messages).to eq(
-      ['Surrounding space missing in default value assignment.'] * 2)
-  end
+  context 'when EnforcedStyle is space' do
+    let(:cop_config) { { 'EnforcedStyle' => 'space' } }
 
-  it 'registers an offence for assignment empty string without space' do
-    inspect_source(cop, ['def f(x, y="", z=1)', 'end'])
-    expect(cop.offences.size).to eq(2)
-  end
+    it 'registers an offense for default value assignment without space' do
+      inspect_source(cop, ['def f(x, y=0, z= 1)', 'end'])
+      expect(cop.messages)
+        .to eq(['Surrounding space missing in default value assignment.'] * 2)
+      expect(cop.highlights).to eq(['=', '= '])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
 
-  it 'registers an offence for assignment of empty list without space' do
-    inspect_source(cop, ['def f(x, y=[])', 'end'])
-    expect(cop.offences.size).to eq(1)
-  end
+    it 'registers an offense for assignment empty string without space' do
+      inspect_source(cop, ['def f(x, y="", z=1)', 'end'])
+      expect(cop.offenses.size).to eq(2)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'no_space')
+    end
+
+    it 'registers an offense for assignment of empty list without space' do
+      inspect_source(cop, ['def f(x, y=[])', 'end'])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it 'accepts default value assignment with space' do
+      inspect_source(cop, ['def f(x, y = 0, z = {})', 'end'])
+      expect(cop.messages).to be_empty
+    end
 
-  it 'accepts default value assignment with space' do
-    inspect_source(cop, ['def f(x, y = 0, z = {})', 'end'])
-    expect(cop.messages).to be_empty
+    it 'auto-corrects missing space' 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
   end
 
-  it 'auto-corrects missing space' 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"))
+  context 'when EnforcedStyle is no_space' do
+    let(:cop_config) { { 'EnforcedStyle' => 'no_space' } }
+
+    it 'registers an offense for default value assignment with space' do
+      inspect_source(cop, ['def f(x, y = 0, z =1, w= 2)', 'end'])
+      expect(cop.messages)
+        .to eq(['Surrounding space detected in default value assignment.'] * 3)
+      expect(cop.highlights).to eq([' = ', ' =', '= '])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'registers an offense for assignment empty string with space' do
+      inspect_source(cop, ['def f(x, y = "", z = 1)', 'end'])
+      expect(cop.offenses.size).to eq(2)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'space')
+    end
+
+    it 'registers an offense for assignment of empty list with space' do
+      inspect_source(cop, ['def f(x, y = [])', 'end'])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it 'accepts default value assignment without space' do
+      inspect_source(cop, ['def f(x, y=0, z={})', 'end'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'auto-corrects unwanted space' do
+      new_source = autocorrect_source(cop, ['def f(x, y = 0, z= 1, w= 2)',
+                                            'end'])
+      expect(new_source).to eq(['def f(x, y=0, z=1, w=2)',
+                                'end'].join("\n"))
+    end
   end
 end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceAroundOperators do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for assignment without space on both sides' do
+  it 'registers an offense for assignment without space on both sides' do
     inspect_source(cop, ['x=0', 'y= 0', 'z =0'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '='."] * 3)
@@ -16,7 +16,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     expect(new_source).to eq(['x = 0', 'y = 0', 'z = 0'].join("\n"))
   end
 
-  it 'registers an offence for ternary operator without space' do
+  it 'registers an offense for ternary operator without space' do
     inspect_source(cop, ['x == 0?1:2'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '?'.",
@@ -28,19 +28,19 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     expect(new_source).to eq('x == 0 ? 1 : 2')
   end
 
-  it 'registers an offence in presence of modifier if statement' do
+  it 'registers an offense in presence of modifier if statement' do
     check_modifier('if')
   end
 
-  it 'registers an offence in presence of modifier unless statement' do
+  it 'registers an offense in presence of modifier unless statement' do
     check_modifier('unless')
   end
 
-  it 'registers an offence in presence of modifier while statement' do
+  it 'registers an offense in presence of modifier while statement' do
     check_modifier('unless')
   end
 
-  it 'registers an offence in presence of modifier until statement' do
+  it 'registers an offense in presence of modifier until statement' do
     check_modifier('unless')
   end
 
@@ -48,7 +48,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     src = ["a=1 #{keyword} condition",
            'c=2']
     inspect_source(cop, src)
-    expect(cop.offences.map(&:line)).to eq([1, 2])
+    expect(cop.offenses.map(&:line)).to eq([1, 2])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '='."] * 2)
 
@@ -57,7 +57,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
       .to eq(src.map { |line| line.sub(/=/, ' = ') }.join("\n"))
   end
 
-  it 'registers an offence for binary operators that could be unary' do
+  it 'registers an offense for binary operators that could be unary' do
     inspect_source(cop, ['a-3', 'x&0xff', 'z+0'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '-'.",
@@ -70,7 +70,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     expect(new_source).to eq(['a - 3', 'x & 0xff', 'z + 0'].join("\n"))
   end
 
-  it 'registers an offence for arguments to a method' do
+  it 'registers an offense for arguments to a method' do
     inspect_source(cop, ['puts 1+2'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '+'."])
@@ -118,7 +118,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     inspect_source(cop, ['  def !',
                          '    !__getobj__',
                          '  end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
     expect(cop.messages).to be_empty
   end
 
@@ -161,15 +161,15 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
 
   it 'accepts an assignment with spaces' do
     inspect_source(cop, ['x = 0'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts an operator called with method syntax' do
     inspect_source(cop, ['Date.today.+(1).to_s'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for operators without spaces' do
+  it 'registers an offense for operators without spaces' do
     inspect_source(cop,
                    ['x+= a+b-c*d/e%f^g|h&i||j',
                     'y -=k&&l'])
@@ -211,10 +211,10 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
 
   it 'accepts an assignment followed by newline' do
     inspect_source(cop, ['x =', '0'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offences for exponent operator with spaces' do
+  it 'registers an offenses for exponent operator with spaces' do
     inspect_source(cop, ['x = a * b ** 2'])
     expect(cop.messages).to eq(
       ['Space around operator ** detected.'])
@@ -229,16 +229,16 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
 
   it 'accepts exponent operator without spaces' do
     inspect_source(cop, ['x = a * b**2'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for a setter call without spaces' do
+  it 'registers an offense for a setter call without spaces' do
     inspect_source(cop, ['x.y=2'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '='."])
   end
 
-  it 'registers an offence for a hash rocket without spaces' do
+  it 'registers an offense for a hash rocket without spaces' do
     inspect_source(cop, ['{ 1=>2, a: b }'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '=>'."])
@@ -272,14 +272,14 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     expect(cop.messages).to be_empty
   end
 
-  it 'registers an offence for match operators without space' do
+  it 'registers an offense for match operators without space' do
     inspect_source(cop, ['x=~/abc/', 'y !~/abc/'])
     expect(cop.messages)
       .to eq(["Surrounding space missing for operator '=~'.",
               "Surrounding space missing for operator '!~'."])
   end
 
-  it 'registers an offence for various assignments without space' do
+  it 'registers an offense for various assignments without space' do
     inspect_source(cop, ['x||=0', 'y&&=0', 'z*=2',
                          '@a=0', '@@a=0', 'a,b=0', 'A=0', 'x[3]=0', '$A=0'])
     expect(cop.messages)
@@ -294,7 +294,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
               "Surrounding space missing for operator '='."])
   end
 
-  it 'registers an offence for equality operators without space' do
+  it 'registers an offense for equality operators without space' do
     inspect_source(cop, ['x==0', 'y!=0', 'Hash===z'])
     expect(cop.messages)
       .to eq(["Surrounding space missing for operator '=='.",
@@ -302,20 +302,20 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
               "Surrounding space missing for operator '==='."])
   end
 
-  it 'registers an offence for - without space with negative lhs operand' do
+  it 'registers an offense for - without space with negative lhs operand' do
     inspect_source(cop, ['-1-arg'])
     expect(cop.messages)
       .to eq(["Surrounding space missing for operator '-'."])
   end
 
-  it 'registers an offence for inheritance < without space' do
+  it 'registers an offense for inheritance < without space' do
     inspect_source(cop, ['class ShowSourceTestClass<ShowSourceTestSuperClass',
                          'end'])
     expect(cop.messages)
       .to eq(["Surrounding space missing for operator '<'."])
   end
 
-  it 'registers an offence for hash rocket without space at rescue' do
+  it 'registers an offense for hash rocket without space at rescue' do
     inspect_source(cop, ['begin',
                          'rescue Exception=>e',
                          'end'])