rubocop 0.18.1 → 0.19.0

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

@@ -8,24 +8,24 @@ describe Rubocop::Cop::Style::LambdaCall, :config do
   context 'when style is set to call' do
     let(:cop_config) { { 'EnforcedStyle' => 'call' } }
 
-    it 'registers an offence for x.()' do
+    it 'registers an offense for x.()' do
       inspect_source(cop,
                      ['x.(a, b)'])
-      expect(cop.offences.size).to eq(1)
-      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'braces')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'braces')
     end
 
-    it 'registers an offence for correct + opposite' do
+    it 'registers an offense 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)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'accepts x.call()' do
       inspect_source(cop, ['x.call(a, b)'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects x.() to x.call()' do
@@ -37,24 +37,24 @@ describe Rubocop::Cop::Style::LambdaCall, :config do
   context 'when style is set to braces' do
     let(:cop_config) { { 'EnforcedStyle' => 'braces' } }
 
-    it 'registers an offence for x.call()' do
+    it 'registers an offense for x.call()' 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')
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'call')
     end
 
-    it 'registers an offence for opposite + correct' do
+    it 'registers an offense 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)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'accepts x.()' do
       inspect_source(cop, ['x.(a, b)'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects x.call() to x.()' do

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

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::Lambda do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for an old single-line lambda call' do
+  it 'registers an offense for an old single-line lambda call' do
     inspect_source(cop, ['f = lambda { |x| x }'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Use the new lambda literal syntax ->(params) {...}.'])
   end
@@ -15,14 +15,14 @@ describe Rubocop::Cop::Style::Lambda do
   it 'accepts the new lambda literal with single-line body' do
     inspect_source(cop, ['lambda = ->(x) { x }',
                          'lambda.(1)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for a new multi-line lambda call' do
+  it 'registers an offense for a new multi-line lambda call' do
     inspect_source(cop, ['f = ->(x) do',
                          '  x',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Use the lambda method for multi-line lambdas.'])
   end
@@ -31,11 +31,11 @@ describe Rubocop::Cop::Style::Lambda do
     inspect_source(cop, ['l = lambda do |x|',
                          '  x',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts the lambda call outside of block' do
     inspect_source(cop, ['l = lambda.test'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,47 +5,47 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::LeadingCommentSpace do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for comment without leading space' do
+  it 'registers an offense for comment without leading space' do
     inspect_source(cop,
                    ['#missing space'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for # followed by no text' do
+  it 'does not register an offense for # followed by no text' do
     inspect_source(cop,
                    ['#'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for more than one space' do
+  it 'does not register an offense for more than one space' do
     inspect_source(cop,
                    ['#   heavily indented'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for more than one #' do
+  it 'does not register an offense for more than one #' do
     inspect_source(cop,
                    ['###### heavily indented'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for only #s' do
+  it 'does not register an offense for only #s' do
     inspect_source(cop,
                    ['######'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for #! on first line' do
+  it 'does not register an offense for #! on first line' do
     inspect_source(cop,
                    ['#!/usr/bin/ruby',
                     'test'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for #! after the first line' do
+  it 'registers an offense for #! after the first line' do
     inspect_source(cop,
                    ['test', '#!/usr/bin/ruby'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts rdoc syntax' do
@@ -54,7 +54,7 @@ describe Rubocop::Cop::Style::LeadingCommentSpace do
                     '#--',
                     '#:nodoc:'])
 
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects missing space' do

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

@@ -5,24 +5,31 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::LineEndConcatenation do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for string concat at line end' do
+  it 'registers an offense for string concat at line end' do
     inspect_source(cop,
                    ['top = "test" +',
                     '"top"'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'registers an offense for dynamic string concat at line end' do
+    inspect_source(cop,
+                   ['top = "test#{x}" +',
+                    '"top"'])
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts string concat on the same line' do
     inspect_source(cop,
                    ['top = "test" + "top"'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts string concat at line end when followed by comment' do
     inspect_source(cop,
                    ['top = "test" + # something',
                     '"top"'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'autocorrects by replacing + with \\' do

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

@@ -6,15 +6,15 @@ describe Rubocop::Cop::Style::LineLength, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 79 } }
 
-  it "registers an offence for a line that's 80 characters wide" do
+  it "registers an offense for a line that's 80 characters wide" do
     inspect_source(cop, ['#' * 80])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.first.message).to eq('Line is too long. [80/79]')
-    expect(cop.config_to_allow_offences).to eq('Max' => 80)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.first.message).to eq('Line is too long. [80/79]')
+    expect(cop.config_to_allow_offenses).to eq('Max' => 80)
   end
 
   it "accepts a line that's 79 characters wide" do
     inspect_source(cop, ['#' * 79])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -8,24 +8,24 @@ describe Rubocop::Cop::Style::MethodCallParentheses, :config do
     Rubocop::Config.new('EmptyLiteral' => { 'Enabled' => true })
   end
 
-  it 'registers an offence for parens in method call without args' do
+  it 'registers an offense for parens in method call without args' do
     inspect_source(cop, ['top.test()'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts parentheses for methods starting with an upcase letter' do
     inspect_source(cop, ['Test()'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts no parens in method call without args' do
     inspect_source(cop, ['top.test'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts parens in method call with args' do
     inspect_source(cop, ['top.test(a)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects by removing unneeded braces' do

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

@@ -6,11 +6,11 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
   subject(:cop) { described_class.new }
 
   context 'with a multi-line do..end block' do
-    it 'registers an offence for a chained call' do
+    it 'registers an offense for a chained call' do
       inspect_source(cop, ['a do',
                            '  b',
                            'end.c'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.highlights).to eq(['end.c'])
     end
 
@@ -18,7 +18,7 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
       inspect_source(cop, ['a do',
                            '  b',
                            'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts a chained block' do
@@ -27,20 +27,20 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
                            'end.c do',
                            '  d',
                            'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   context 'with a single-line do..end block' do
-    it 'registers an offence for a chained call' do
+    it 'registers an offense for a chained call' do
       inspect_source(cop, ['a do b end.c'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.highlights).to eq(['end.c'])
     end
 
     it 'accepts a single-line do..end block with a chained block' do
       inspect_source(cop, ['a do b end.c do d end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -49,12 +49,12 @@ describe Rubocop::Cop::Style::MethodCalledOnDoEndBlock do
       inspect_source(cop, ['a {',
                            '  b',
                            '}.c'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts a single-line block with a chained call' do
       inspect_source(cop, ['a { b }.c'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end

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

@@ -8,37 +8,37 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
   context 'require_parentheses' do
     let(:cop_config) { { 'EnforcedStyle' => 'require_parentheses' } }
 
-    it 'reports an offence for def with parameters but no parens' do
+    it 'reports an offense for def with parameters but no parens' do
       src = ['def func a, b',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' =>
                                                  'require_no_parentheses')
     end
 
-    it 'reports an offence for correct + opposite' do
+    it 'reports an offense 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)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
-    it 'reports an offence for class def with parameters but no parens' do
+    it 'reports an offense for class def with parameters but no parens' do
       src = ['def Test.func a, b',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it 'accepts def with no args and no parens' do
       src = ['def func',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-adds required parens for a def' do
@@ -60,37 +60,37 @@ describe Rubocop::Cop::Style::MethodDefParentheses, :config do
   context 'require_no_parentheses' do
     let(:cop_config) { { 'EnforcedStyle' => 'require_no_parentheses' } }
 
-    it 'reports an offence for def with parameters with parens' do
+    it 'reports an offense for def with parameters with parens' do
       src = ['def func(a, b)',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' =>
                                                  'require_parentheses')
     end
 
-    it 'reports an offence for opposite + correct' do
+    it 'reports an offense 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)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
-    it 'reports an offence for class def with parameters with parens' do
+    it 'reports an offense for class def with parameters with parens' do
       src = ['def Test.func(a, b)',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
-    it 'reports an offence for def with no args and parens' do
+    it 'reports an offense for def with no args and parens' do
       src = ['def func()',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it 'auto-removes the parens' do

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

@@ -15,9 +15,9 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 5',
                          '  a = 6',
                          '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)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([1])
+    expect(cop.config_to_allow_offenses).to eq('Max' => 6)
   end
 
   it 'accepts a method with less than 5 lines' do
@@ -27,7 +27,7 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 3',
                          '  a = 4',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not count blank lines' do
@@ -40,13 +40,13 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '',
                          '  a = 7',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts empty methods' do
     inspect_source(cop, ['def m()',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'is not fooled by one-liner methods, syntax #1' do
@@ -58,7 +58,7 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 5',
                          '  a = 6',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'is not fooled by one-liner methods, syntax #2' do
@@ -70,7 +70,7 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 5',
                          '  a = 6',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'checks class methods, syntax #1' do
@@ -82,8 +82,8 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 5',
                          '  a = 6',
                          'end'])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.map(&:line).sort).to eq([1])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([1])
   end
 
   it 'checks class methods, syntax #2' do
@@ -99,8 +99,8 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '    end',
                          '  end',
                          'end'])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.map(&:line).sort).to eq([3])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([3])
   end
 
   it 'properly counts lines when method ends with block' do
@@ -112,8 +112,8 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '    a = 5',
                          '  end',
                          'end'])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.offences.map(&:line).sort).to eq([1])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([1])
   end
 
   it 'does not count commented lines by default' do
@@ -125,7 +125,7 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                          '  a = 5',
                          '  a = 6',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when CountComments is enabled' do
@@ -140,8 +140,8 @@ describe Rubocop::Cop::Style::MethodLength, :config do
                            '  a = 5',
                            '  a = 6',
                            'end'])
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.map(&:line).sort).to eq([1])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.map(&:line).sort).to eq([1])
     end
   end
 end