rubocop 0.18.1 → 0.19.0

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

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::DoubleNegation do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for !!' do
+    inspect_source(cop, '!!test.something')
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'does not register an offense for !' do
+    inspect_source(cop, '!test.something')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'does not register an offense for not not' do
+    inspect_source(cop, 'not not test.something')
+    expect(cop.offenses).to be_empty
+  end
+end

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

@@ -6,7 +6,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'AllowAdjacentOneLineDefs' => false } }
 
-  it 'finds offences in inner classes' do
+  it 'finds offenses in inner classes' do
     source = ['class K',
               '  def m',
               '  end',
@@ -21,8 +21,8 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '  end',
               'end']
     inspect_source(cop, source)
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.map(&:line).sort).to eq([7])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([7])
   end
 
   # Only one def, so rule about empty line *between* defs does not
@@ -32,7 +32,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               'def m',
               'end']
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   # Only one def, so rule about empty line *between* defs does not
@@ -43,7 +43,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '  def m',
               '  end']
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts the first def without leading empty line in a class' do
@@ -52,7 +52,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               '  end',
               'end']
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a def that follows an empty line and then a comment' do
@@ -68,7 +68,7 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
               'end'
              ]
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a def that is the first of a module' do
@@ -95,11 +95,19 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
     expect(cop.messages).to be_empty
   end
 
-  it 'registers an offence for adjacent one-liners by default' do
+  it 'registers an offense for adjacent one-liners by default' do
     source = ['def a; end',
               'def b; end']
     inspect_source(cop, source)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'auto-corrects adjacent one-liners by default' do
+    corrected = autocorrect_source(cop, ['  def a; end',
+                                         '  def b; end'])
+    expect(corrected).to eq(['  def a; end',
+                             '',
+                             '  def b; end'].join("\n"))
   end
 
   context 'when AllowAdjacentOneLineDefs is enabled' do
@@ -109,19 +117,19 @@ describe Rubocop::Cop::Style::EmptyLineBetweenDefs, :config do
       source = ['def a; end',
                 'def b; end']
       inspect_source(cop, source)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for adjacent defs if some are multi-line' do
+    it 'registers an offense for adjacent defs if some are multi-line' do
       source = ['def a; end',
                 'def b; end',
-                'def c', # Not a one-liner, so this is an offence.
+                'def c', # Not a one-liner, so this is an offense.
                 'end',
-                # Also an offence since previous was multi-line:
+                # Also an offense since previous was multi-line:
                 'def d; end'
                ]
       inspect_source(cop, source)
-      expect(cop.offences.map(&:line)).to eq([3, 5])
+      expect(cop.offenses.map(&:line)).to eq([3, 5])
     end
   end
 end

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

@@ -14,7 +14,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Keep a blank line before and after #{access_modifier}."])
     end
@@ -27,7 +27,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       "  #{access_modifier}",
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Keep a blank line before and after #{access_modifier}."])
     end
@@ -39,7 +39,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'recognizes blank lines with DOS style line endings' do
@@ -50,7 +50,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
                       "\r",
                       "  def test; end\r",
                       "end\r"])
-      expect(cop.offences.size).to eq(0)
+      expect(cop.offenses.size).to eq(0)
     end
   end
 end

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

@@ -5,18 +5,18 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::EmptyLinesAroundBody do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for method body starting with a blank' do
+  it 'registers an offense for method body starting with a blank' do
     inspect_source(cop,
                    ['def some_method',
                     '',
                     '  do_something',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  # The cop only registers an offence if the extra line is completely emtpy. If
+  # The cop only registers an offense if the extra line is completely emtpy. If
   # there is trailing whitespace, then that must be dealt with first. Having
-  # two cops registering offence for the line with only spaces would cause
+  # two cops registering offense for the line with only spaces would cause
   # havoc in auto-correction.
   it 'accepts method body starting with a line with spaces' do
     inspect_source(cop,
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
                     '  ',
                     '  do_something',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'autocorrects method body starting with a blank' do
@@ -38,13 +38,13 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
                              'end'].join("\n")
   end
 
-  it 'registers an offence for class method body starting with a blank' do
+  it 'registers an offense for class method body starting with a blank' do
     inspect_source(cop,
                    ['def Test.some_method',
                     '',
                     '  do_something',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'autocorrects class method body starting with a blank' do
@@ -58,31 +58,31 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
                              'end'].join("\n")
   end
 
-  it 'registers an offence for method body ending with a blank' do
+  it 'registers an offense for method body ending with a blank' do
     inspect_source(cop,
                    ['def some_method',
                     '  do_something',
                     '',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for class method body ending with a blank' do
+  it 'registers an offense for class method body ending with a blank' do
     inspect_source(cop,
                    ['def Test.some_method',
                     '  do_something',
                     '',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for class body starting with a blank' do
+  it 'registers an offense for class body starting with a blank' do
     inspect_source(cop,
                    ['class SomeClass',
                     '',
                     '  do_something',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'autocorrects class body containing only a blank' do
@@ -94,31 +94,31 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
                              'end'].join("\n")
   end
 
-  it 'registers an offence for module body starting with a blank' do
+  it 'registers an offense for module body starting with a blank' do
     inspect_source(cop,
                    ['module SomeModule',
                     '',
                     '  do_something',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for class body ending with a blank' do
+  it 'registers an offense for class body ending with a blank' do
     inspect_source(cop,
                    ['class SomeClass',
                     '  do_something',
                     '',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for module body ending with a blank' do
+  it 'registers an offense for module body ending with a blank' do
     inspect_source(cop,
                    ['module SomeModule',
                     '  do_something',
                     '',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'is not fooled by single line methods' do
@@ -126,6 +126,6 @@ describe Rubocop::Cop::Style::EmptyLinesAroundBody do
                    ['def some_method; do_something; end',
                     '',
                     'something_else'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,10 +5,10 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::EmptyLines do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for consecutive empty lines' do
+  it 'registers an offense for consecutive empty lines' do
     inspect_source(cop,
                    ['test = 5', '', '', '', 'top'])
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 
   it 'auto-corrects consecutive empty lines' do
@@ -20,21 +20,32 @@ describe Rubocop::Cop::Style::EmptyLines do
   it 'works when there are no tokens' do
     inspect_source(cop,
                    ['#comment'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'handles comments' do
     inspect_source(cop,
                    ['test', '', '#comment', 'top'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for empty lines in a string' do
+  it 'does not register an offense for empty lines in a string' do
     inspect_source(cop, ['result = "test
 
 
 
                                   string"'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'does not register an offense for heredocs with empty lines inside' do
+    inspect_source(cop, ['str = <<-TEXT',
+                         'line 1',
+                         '',
+                         '',
+                         'line 2',
+                         'TEXT',
+                         'puts str'])
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -6,26 +6,26 @@ describe Rubocop::Cop::Style::EmptyLiteral do
   subject(:cop) { described_class.new }
 
   describe 'Empty Array' do
-    it 'registers an offence for Array.new()' do
+    it 'registers an offense for Array.new()' do
       inspect_source(cop,
                      ['test = Array.new()'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use array literal [] instead of Array.new.'])
     end
 
-    it 'registers an offence for Array.new' do
+    it 'registers an offense for Array.new' do
       inspect_source(cop,
                      ['test = Array.new'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use array literal [] instead of Array.new.'])
     end
 
-    it 'does not register an offence for Array.new(3)' do
+    it 'does not register an offense for Array.new(3)' do
       inspect_source(cop,
                      ['test = Array.new(3)'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects Array.new to []' do
@@ -35,32 +35,32 @@ describe Rubocop::Cop::Style::EmptyLiteral do
   end
 
   describe 'Empty Hash' do
-    it 'registers an offence for Hash.new()' do
+    it 'registers an offense for Hash.new()' do
       inspect_source(cop,
                      ['test = Hash.new()'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use hash literal {} instead of Hash.new.'])
     end
 
-    it 'registers an offence for Hash.new' do
+    it 'registers an offense for Hash.new' do
       inspect_source(cop,
                      ['test = Hash.new'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use hash literal {} instead of Hash.new.'])
     end
 
-    it 'does not register an offence for Hash.new(3)' do
+    it 'does not register an offense for Hash.new(3)' do
       inspect_source(cop,
                      ['test = Hash.new(3)'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'does not register an offence for Hash.new { block }' do
+    it 'does not register an offense for Hash.new { block }' do
       inspect_source(cop,
                      ['test = Hash.new { block }'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects Hash.new to {}' do
@@ -70,26 +70,26 @@ describe Rubocop::Cop::Style::EmptyLiteral do
   end
 
   describe 'Empty String' do
-    it 'registers an offence for String.new()' do
+    it 'registers an offense for String.new()' do
       inspect_source(cop,
                      ['test = String.new()'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use string literal '' instead of String.new."])
     end
 
-    it 'registers an offence for String.new' do
+    it 'registers an offense for String.new' do
       inspect_source(cop,
                      ['test = String.new'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use string literal '' instead of String.new."])
     end
 
-    it 'does not register an offence for String.new("top")' do
+    it 'does not register an offense for String.new("top")' do
       inspect_source(cop,
                      ['test = String.new("top")'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects String.new to empty string literal' do

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::Encoding do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence when no encoding present', ruby: 1.9 do
+  it 'registers an offense when no encoding present', ruby: 1.9 do
     inspect_source(cop, ['def foo() end'])
 
     expect(cop.messages).to eq(
@@ -16,7 +16,7 @@ describe Rubocop::Cop::Style::Encoding do
     inspect_source(cop, ['# encoding: utf-8',
                          'def foo() end'])
 
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts encoding on second line when shebang present', ruby: 1.9 do
@@ -27,7 +27,7 @@ describe Rubocop::Cop::Style::Encoding do
     expect(cop.messages).to be_empty
   end
 
-  it 'books an offence when encoding is in the wrong place', ruby: 1.9 do
+  it 'books an offense when encoding is in the wrong place', ruby: 1.9 do
     inspect_source(cop, ['def foo() end',
                          '# encoding: utf-8'])
 
@@ -35,10 +35,10 @@ describe Rubocop::Cop::Style::Encoding do
       ['Missing utf-8 encoding comment.'])
   end
 
-  it 'does not register an offence on Ruby 2.0', ruby: 2.0 do
+  it 'does not register an offense on Ruby 2.0', ruby: 2.0 do
     inspect_source(cop, ['def foo() end'])
 
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts encoding inserted by magic_encoding gem', ruby: 1.9 do