rubocop 0.18.1 → 0.19.0

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

@@ -5,30 +5,30 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::AndOr do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for OR' do
+  it 'registers an offense for OR' do
     inspect_source(cop,
                    ['test if a or b'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Use || instead of or.'])
   end
 
-  it 'registers an offence for AND' do
+  it 'registers an offense for AND' do
     inspect_source(cop,
                    ['test if a and b'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Use && instead of and.'])
   end
 
   it 'accepts ||' do
     inspect_source(cop,
                    ['test if a || b'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts &&' do
     inspect_source(cop,
                    ['test if a && b'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects "and" with &&' do

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

@@ -5,11 +5,11 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::AsciiComments do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for a comment with non-ascii chars' do
+  it 'registers an offense for a comment with non-ascii chars' do
     inspect_source(cop,
                    ['# encoding: utf-8',
                     '# 这是什么？'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Use only ascii symbols in comments.'])
   end
@@ -17,6 +17,6 @@ describe Rubocop::Cop::Style::AsciiComments do
   it 'accepts comments with only ascii chars' do
     inspect_source(cop,
                    ['# AZaz1@$%~,;*_`|'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,11 +5,11 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::AsciiIdentifiers do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for a variable name with non-ascii chars' do
+  it 'registers an offense for a variable name with non-ascii chars' do
     inspect_source(cop,
                    ['# encoding: utf-8',
                     'älg = 1'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Use only ascii symbols in identifiers.'])
   end
@@ -17,7 +17,7 @@ describe Rubocop::Cop::Style::AsciiIdentifiers do
   it 'accepts identifiers with only ascii chars' do
     inspect_source(cop,
                    ['x.empty?'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not get confused by a byte order mark' do
@@ -25,12 +25,12 @@ describe Rubocop::Cop::Style::AsciiIdentifiers do
     inspect_source(cop,
                    [bom + '# encoding: utf-8',
                     "puts 'foo'"])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not get confused by an empty file' do
     inspect_source(cop,
                    [''])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,11 +5,11 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::Attr do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence attr' do
+  it 'registers an offense attr' do
     inspect_source(cop, ['class SomeClass',
                          '  attr :name',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'auto-corrects attr to attr_reader' do

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

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::BeginBlock do
   subject(:cop) { described_class.new }
 
-  it 'reports an offence for a BEGIN block' do
+  it 'reports an offense for a BEGIN block' do
     src = ['BEGIN { test }']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 end

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

@@ -5,17 +5,17 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::BlockComments do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for block comments' do
+  it 'registers an offense for block comments' do
     inspect_source(cop,
                    ['=begin',
                     'comment',
                     '=end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts regular comments' do
     inspect_source(cop,
                    ['# comment'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -12,10 +12,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    puts b',
               '  end',
               'end']
-    expect_nesting_offences(source, [])
+    expect_nesting_offenses(source, [])
   end
 
-  it 'registers an offence for `Max + 1` levels of `if` nesting' do
+  it 'registers an offense for `Max + 1` levels of `if` nesting' do
     source = ['if a',
               '  if b',
               '    if c',
@@ -23,10 +23,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers a single offence for `Max + 2` levels of `if` nesting' do
+  it 'registers a single offense for `Max + 2` levels of `if` nesting' do
     source = ['if a',
               '  if b',
               '    if c',
@@ -36,10 +36,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers 2 offences' do
+  it 'registers 2 offenses' do
     source = ['if a',
               '  if b',
               '    if c',
@@ -52,10 +52,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3, 8])
+    expect_nesting_offenses(source, [3, 8])
   end
 
-  it 'registers an offence for nested `case`' do
+  it 'registers an offense for nested `case`' do
     source = ['if a',
               '  if b',
               '    case c',
@@ -64,10 +64,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested `while`' do
+  it 'registers an offense for nested `while`' do
     source = ['if a',
               '  if b',
               '    while c',
@@ -75,10 +75,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested modifier `while`' do
+  it 'registers an offense for nested modifier `while`' do
     source = ['if a',
               '  if b',
               '    begin',
@@ -86,10 +86,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end while c',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested `until`' do
+  it 'registers an offense for nested `until`' do
     source = ['if a',
               '  if b',
               '    until c',
@@ -97,10 +97,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested modifier `until`' do
+  it 'registers an offense for nested modifier `until`' do
     source = ['if a',
               '  if b',
               '    begin',
@@ -108,10 +108,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end until c',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested `for`' do
+  it 'registers an offense for nested `for`' do
     source = ['if a',
               '  if b',
               '    for c in [1,2] do',
@@ -119,10 +119,10 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [3])
+    expect_nesting_offenses(source, [3])
   end
 
-  it 'registers an offence for nested `rescue`' do
+  it 'registers an offense for nested `rescue`' do
     source = ['if a',
               '  if b',
               '    begin',
@@ -132,7 +132,7 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offences(source, [5])
+    expect_nesting_offenses(source, [5])
   end
 
   it 'accepts if/elsif' do
@@ -141,16 +141,16 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               'elsif c',
               'elsif d',
               'end']
-    expect_nesting_offences(source, [])
+    expect_nesting_offenses(source, [])
   end
 
-  def expect_nesting_offences(source, lines, used_nesting_level = 3)
+  def expect_nesting_offenses(source, lines, used_nesting_level = 3)
     inspect_source(cop, source)
-    expect(cop.offences.map(&:line)).to eq(lines)
+    expect(cop.offenses.map(&:line)).to eq(lines)
     expect(cop.messages).to eq(
       ['Avoid more than 2 levels of block nesting.'] * lines.length)
-    if cop.offences.size > 0
-      expect(cop.config_to_allow_offences['Max']).to eq(used_nesting_level)
+    if cop.offenses.size > 0
+      expect(cop.config_to_allow_offenses['Max']).to eq(used_nesting_level)
     end
   end
 end

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

@@ -8,10 +8,10 @@ describe Rubocop::Cop::Style::Blocks do
   it 'accepts a multiline block with do-end' do
     inspect_source(cop, ['each do |x|',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for a single line block with do-end' do
+  it 'registers an offense for a single line block with do-end' do
     inspect_source(cop, ['each do |x| end'])
     expect(cop.messages)
       .to eq(['Prefer {...} over do...end for single-line blocks.'])
@@ -19,7 +19,7 @@ describe Rubocop::Cop::Style::Blocks do
 
   it 'accepts a single line block with braces' do
     inspect_source(cop, ['each { |x| }'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects do and end for single line blocks to { and }' do
@@ -28,7 +28,7 @@ describe Rubocop::Cop::Style::Blocks do
   end
 
   context 'when there are braces around a multi-line block' do
-    it 'registers an offence in the simple case' do
+    it 'registers an offense in the simple case' do
       inspect_source(cop, ['each { |x|',
                            '}'])
       expect(cop.messages)
@@ -48,11 +48,11 @@ describe Rubocop::Cop::Style::Blocks do
              '  Counter.count',
              '}.from(0).to(1)']
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for braces if do-end would not change ' \
-      'the meaning' do
+    it 'registers an offense for braces if do-end would not change ' \
+       'the meaning' do
       src = ['scope :foo, (lambda { |f|',
              '  where(condition: "value")',
              '})',
@@ -61,7 +61,7 @@ describe Rubocop::Cop::Style::Blocks do
              '  # ...',
              '})']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(2)
+      expect(cop.offenses.size).to eq(2)
     end
 
     it 'can handle special method names such as []= and done?' do

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

@@ -73,14 +73,14 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
 
     end
 
-    describe 'registers an offence for' do
+    describe 'registers an offense for' do
       it 'one non-hash parameter followed by a hash parameter with braces' do
         inspect_source(cop, ['where(1, { y: 2 })'])
         expect(cop.messages).to eq([
           'Redundant curly braces around a hash parameter.'
         ])
         expect(cop.highlights).to eq(['{ y: 2 }'])
-        expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'braces')
+        expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'braces')
       end
 
       it 'correct + opposite style' do
@@ -89,7 +89,7 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
         expect(cop.messages).to eq([
           'Redundant curly braces around a hash parameter.'
         ])
-        expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+        expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
       end
 
       it 'opposite + correct style' do
@@ -98,7 +98,7 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
         expect(cop.messages).to eq([
           'Redundant curly braces around a hash parameter.'
         ])
-        expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+        expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
       end
 
       it 'one object method hash parameter with braces' do
@@ -218,14 +218,14 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
       end
     end
 
-    describe 'registers an offence for' do
+    describe 'registers an offense for' do
       it 'one hash parameter without braces' do
         inspect_source(cop, ['where(x: "y")'])
         expect(cop.messages).to eq([
           'Missing curly braces around a hash parameter.'
         ])
         expect(cop.highlights).to eq(['x: "y"'])
-        expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+        expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' =>
                                                    'no_braces')
       end
 
@@ -235,7 +235,7 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
         expect(cop.messages).to eq([
           'Missing curly braces around a hash parameter.'
         ])
-        expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+        expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
       end
 
       it 'correct + opposite style' do
@@ -244,7 +244,7 @@ describe Rubocop::Cop::Style::BracesAroundHashParameters, :config do
         expect(cop.messages).to eq([
           'Missing curly braces around a hash parameter.'
         ])
-        expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+        expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
       end
 
       it 'one hash parameter with multiple keys and without braces' do

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

@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::CaseEquality do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for ===' do
+  it 'registers an offense for ===' do
     inspect_source(cop, ['Array === var'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 end

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

@@ -25,10 +25,10 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "           'output2'",
                     '         end']
           inspect_source(cop, source)
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offence for an assignment indented as end' do
+        it 'registers on offense for an assignment indented as end' do
           source = ['output = case variable',
                     "when 'value1'",
                     "  'output1'",
@@ -37,11 +37,11 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     'end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when as deep as case.'])
-          expect(cop.config_to_allow_offences).to eq('IndentWhenRelativeTo' =>
+          expect(cop.config_to_allow_offenses).to eq('IndentWhenRelativeTo' =>
                                                      'end')
         end
 
-        it 'registers on offence for an assignment indented some other way' do
+        it 'registers on offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "  when 'value1'",
                     "    'output1'",
@@ -50,10 +50,10 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     'end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when as deep as case.'])
-          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+          expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
 
-        it 'registers on offence for correct + opposite' do
+        it 'registers on offense for correct + opposite' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -68,11 +68,11 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     'end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when as deep as case.'])
-          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+          expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
       end
 
-      it "registers an offence for a when clause that's deeper than case" do
+      it "registers an offense for a when clause that's deeper than case" do
         source = ['case a',
                   '    when 0 then return',
                   '    else',
@@ -99,7 +99,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                   'end',
                   '']
         inspect_source(cop, source)
-        expect(cop.offences).to be_empty
+        expect(cop.offenses).to be_empty
       end
 
       it "doesn't get confused by strings with case in them" do
@@ -163,10 +163,10 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "             'output2'",
                     '         end']
           inspect_source(cop, source)
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offence for an assignment indented some other way' do
+        it 'registers on offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -187,11 +187,11 @@ describe Rubocop::Cop::Style::CaseIndentation do
                   '        end',
                   'end']
         inspect_source(cop, source)
-        expect(cop.offences).to be_empty
+        expect(cop.offenses).to be_empty
       end
 
-      it "registers an offence for  a when clause that's equally indented " \
-        'with case' do
+      it "registers an offense for  a when clause that's equally indented " \
+         'with case' do
         source = ['y = case a',
                   '    when 0 then break',
                   '    when 0 then return',
@@ -226,10 +226,10 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "  'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offence for an assignment indented some other way' do
+        it 'registers on offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "  when 'value1'",
                     "    'output1'",
@@ -256,10 +256,10 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "    'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
 
-        it 'registers on offence for an assignment indented as case' do
+        it 'registers on offense for an assignment indented as case' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -268,11 +268,11 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     '         end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when one step more than end.'])
-          expect(cop.config_to_allow_offences).to eq('IndentWhenRelativeTo' =>
+          expect(cop.config_to_allow_offenses).to eq('IndentWhenRelativeTo' =>
                                                      'case')
         end
 
-        it 'registers on offence for an assignment indented some other way' do
+        it 'registers on offense for an assignment indented some other way' do
           source = ['output = case variable',
                     "       when 'value1'",
                     "         'output1'",
@@ -281,7 +281,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     '       end']
           inspect_source(cop, source)
           expect(cop.messages).to eq(['Indent when one step more than end.'])
-          expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+          expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
       end
     end