rubocop 0.18.1 → 0.19.0

data/spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb

@@ -18,12 +18,12 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to include('Shadowing outer local variable - foo')
-      expect(cop.offences.first.line).to eq(4)
+      expect(cop.offenses.first.line).to eq(4)
     end
 
     include_examples 'mimics MRI 2.1'
@@ -42,12 +42,12 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to include('Shadowing outer local variable - foo')
-      expect(cop.offences.first.line).to eq(4)
+      expect(cop.offenses.first.line).to eq(4)
     end
 
     include_examples 'mimics MRI 2.1'
@@ -68,12 +68,12 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to include('Shadowing outer local variable - foo')
-      expect(cop.offences.first.line).to eq(4)
+      expect(cop.offenses.first.line).to eq(4)
     end
 
     include_examples 'mimics MRI 2.1'
@@ -93,12 +93,12 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to include('Shadowing outer local variable - foo')
-      expect(cop.offences.first.line).to eq(4)
+      expect(cop.offenses.first.line).to eq(4)
     end
 
     include_examples 'mimics MRI 2.1', 'shadowing'

data/spec/rubocop/cop/lint/string_conversion_in_interpolation_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::StringConversionInInterpolation do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for #to_s in interpolation' do
+    inspect_source(cop, '"this is the #{result.to_s}"')
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'detects #to_s in an interpolation with several expressions' do
+    inspect_source(cop, '"this is the #{top; result.to_s}"')
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'accepts #to_s with arguments in an interpolation' do
+    inspect_source(cop, '"this is a #{result.to_s(8)}"')
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts interpolation without #to_s' do
+    inspect_source(cop, '"this is the #{result}"')
+    expect(cop.offenses).to be_empty
+  end
+end

data/spec/rubocop/cop/lint/syntax_spec.rb

@@ -3,32 +3,32 @@
 require 'spec_helper'
 
 describe Rubocop::Cop::Lint::Syntax do
-  describe '.offence_from_diagnostic' do
-    subject(:offence) { described_class.offence_from_diagnostic(diagnostic) }
+  describe '.offense_from_diagnostic' do
+    subject(:offense) { described_class.offense_from_diagnostic(diagnostic) }
     let(:diagnostic) { Parser::Diagnostic.new(level, reason, args, location) }
     let(:level) { :warning }
     let(:reason) { :odd_hash }
     let(:args) { [] }
     let(:location) { double('location').as_null_object }
 
-    it 'returns an offence' do
-      expect(offence).to be_a(Rubocop::Cop::Offence)
+    it 'returns an offense' do
+      expect(offense).to be_a(Rubocop::Cop::Offense)
     end
 
-    it "sets diagnostic's level to offence's severity" do
-      expect(offence.severity).to eq(level)
+    it "sets diagnostic's level to offense's severity" do
+      expect(offense.severity).to eq(level)
     end
 
-    it "sets diagnostic's message to offence's message" do
-      expect(offence.message).to eq('odd number of entries for a hash')
+    it "sets diagnostic's message to offense's message" do
+      expect(offense.message).to eq('odd number of entries for a hash')
     end
 
-    it "sets diagnostic's location to offence's location" do
-      expect(offence.location).to eq(location)
+    it "sets diagnostic's location to offense's location" do
+      expect(offense.location).to eq(location)
     end
 
     it 'sets Syntax as a cop name' do
-      expect(offence.cop_name).to eq('Syntax')
+      expect(offense.cop_name).to eq('Syntax')
     end
   end
 end

data/spec/rubocop/cop/lint/unreachable_code_spec.rb

@@ -6,13 +6,13 @@ describe Rubocop::Cop::Lint::UnreachableCode do
   subject(:cop) { described_class.new }
 
   described_class::NODE_TYPES.each do |t|
-    it "registers an offence for #{t} before other statements" do
+    it "registers an offense for #{t} before other statements" do
       inspect_source(cop,
                      ['foo = 5',
                       "#{t}",
                       'bar'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it "accepts code with conditional #{t}" do
@@ -21,7 +21,7 @@ describe Rubocop::Cop::Lint::UnreachableCode do
                       "#{t} if test",
                       'bar'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it "accepts #{t} as the final expression" do
@@ -29,18 +29,18 @@ describe Rubocop::Cop::Lint::UnreachableCode do
                      ['foo = 5',
                       "#{t} if test"
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   described_class::FLOW_COMMANDS.each do |t|
-    it "registers an offence for #{t} before other statements" do
+    it "registers an offense for #{t} before other statements" do
       inspect_source(cop,
                      ['foo = 5',
                       "#{t} something",
                       'bar'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it "accepts code with conditional #{t}" do
@@ -49,7 +49,7 @@ describe Rubocop::Cop::Lint::UnreachableCode do
                       "#{t} something if test",
                       'bar'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it "accepts #{t} as the final expression" do
@@ -57,7 +57,7 @@ describe Rubocop::Cop::Lint::UnreachableCode do
                      ['foo = 5',
                       "#{t} something if test"
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end

data/spec/rubocop/cop/lint/useless_assignment_spec.rb

@@ -20,12 +20,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(5)
+      expect(cop.offenses.first.line).to eq(5)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -48,12 +48,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(5)
+      expect(cop.offenses.first.line).to eq(5)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -77,12 +77,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -104,12 +104,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(5)
+      expect(cop.offenses.first.line).to eq(5)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -133,12 +133,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -162,12 +162,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -189,12 +189,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(5)
+      expect(cop.offenses.first.line).to eq(5)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -210,12 +210,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(1)
+      expect(cop.offenses.first.line).to eq(1)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -230,12 +230,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo. Use just operator ||.')
-      expect(cop.offences.first.line).to eq(1)
+      expect(cop.offenses.first.line).to eq(1)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -253,17 +253,17 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers offences for each asignment' do
+    it 'registers offenses for each asignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(2)
+      expect(cop.offenses.size).to eq(2)
 
-      expect(cop.offences[0].message)
+      expect(cop.offenses[0].message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences[0].line).to eq(2)
+      expect(cop.offenses[0].line).to eq(2)
 
-      expect(cop.offences[1].message)
+      expect(cop.offenses[1].message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences[1].line).to eq(4)
+      expect(cop.offenses[1].line).to eq(4)
 
       expect(cop.highlights).to eq(%w(foo foo))
     end
@@ -281,12 +281,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the non-re-referenced assignment' do
+    it 'registers an offense for the non-re-referenced assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(4)
+      expect(cop.offenses.first.line).to eq(4)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -303,12 +303,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the unreferenced assignment' do
+    it 'registers an offense for the unreferenced assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -362,12 +362,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the declaration' do
+    it 'registers an offense for the declaration' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(1)
+      expect(cop.offenses.first.line).to eq(1)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -383,12 +383,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers offences for the assignment' do
+    it 'registers offenses for the assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -404,12 +404,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -460,6 +460,23 @@ describe Rubocop::Cop::Lint::UselessAssignment do
     include_examples 'mimics MRI 2.1'
   end
 
+  context 'when a setter is invoked with operator assignment in loop body' do
+    let(:source) do
+      [
+        'def some_method',
+        '  obj = {}',
+        '',
+        '  while obj[:count] < 100',
+        '    obj[:count] += 1',
+        '  end',
+        'end'
+      ]
+    end
+
+    include_examples 'accepts'
+    include_examples 'mimics MRI 2.1'
+  end
+
   context "when a variable is reassigned in loop body but won't " \
           'be referenced either next iteration or loop condition' do
     let(:source) do
@@ -478,12 +495,14 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
+      pending 'Requires an advanced logic that checks whether the return ' \
+              'value of an operator assignment is used or not.'
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(7)
+      expect(cop.offenses.first.line).to eq(7)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -502,12 +521,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(5)
+      expect(cop.offenses.first.line).to eq(5)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -527,12 +546,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -549,12 +568,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -576,12 +595,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the unreferenced assignment' do
+    it 'registers an offense for the unreferenced assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -641,12 +660,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the unreferenced assignment' do
+    it 'registers an offense for the unreferenced assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -666,18 +685,18 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the assignment in the if branch' do
+    it 'registers an offense for the assignment in the if branch' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
   end
 
   context 'when a variable is assigned in branch of modifier if ' \
-          'that references the variable in its conditional clause' +
+          'that references the variable in its conditional clause' \
           'and referenced after the branching' do
     let(:source) do
       [
@@ -693,7 +712,7 @@ describe Rubocop::Cop::Lint::UselessAssignment do
   end
 
   context 'when a variable is assigned in branch of modifier if ' \
-          'that references the variable in its conditional clause' +
+          'that references the variable in its conditional clause' \
           'and unreferenced' do
     let(:source) do
       [
@@ -703,12 +722,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -740,12 +759,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the unreferenced assignment' do
+    it 'registers an offense for the unreferenced assignment' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -815,7 +834,7 @@ describe Rubocop::Cop::Lint::UselessAssignment do
   end
 
   context 'when a variable is reassigned with binary operator ' \
-           'assignment while assigning to itself in rhs ' +
+           'assignment while assigning to itself in rhs ' \
            'then referenced' do
     let(:source) do
       [
@@ -827,12 +846,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence for the assignment in rhs' do
+    it 'registers an offense for the assignment in rhs' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -862,13 +881,13 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message).to eq(
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message).to eq(
         'Useless assignment to variable - foo. Use just operator ||.'
       )
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -885,12 +904,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -906,15 +925,15 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message).to eq(
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message).to eq(
         'Useless assignment to variable - bar. ' \
-        'Use _ or _bar as a variable name ' +
+        'Use _ or _bar as a variable name ' \
         "to indicate that it won't be used."
       )
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['bar'])
     end
 
@@ -980,12 +999,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(3)
+      expect(cop.offenses.first.line).to eq(3)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -1094,12 +1113,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -1123,12 +1142,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -1150,12 +1169,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(6)
+      expect(cop.offenses.first.line).to eq(6)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -1180,8 +1199,27 @@ describe Rubocop::Cop::Lint::UselessAssignment do
     include_examples 'mimics MRI 2.1'
   end
 
+  context 'when a variable is assigned with operator assignment ' \
+          'in rescue and would be referenced with retry' do
+    let(:source) do
+      [
+        'retry_count = 0',
+        '',
+        'begin',
+        '  do_something',
+        'rescue',
+        '  fail if (retry_count += 1) > 3',
+        '  retry',
+        'end'
+      ]
+    end
+
+    include_examples 'accepts'
+    include_examples 'mimics MRI 2.1'
+  end
+
   context 'when a variable is assigned ' \
-          'in main body of begin, rescue and else ' +
+          'in main body of begin, rescue and else ' \
           'and reassigned in ensure then referenced after the begin' do
     let(:source) do
       [
@@ -1202,14 +1240,14 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers offences for each assignment before ensure' do
+    it 'registers offenses for each assignment before ensure' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(4)
+      expect(cop.offenses.size).to eq(4)
 
-      expect(cop.offences[0].line).to eq(3)
-      expect(cop.offences[1].line).to eq(5)
-      expect(cop.offences[2].line).to eq(7)
-      expect(cop.offences[3].line).to eq(9)
+      expect(cop.offenses[0].line).to eq(3)
+      expect(cop.offenses[1].line).to eq(5)
+      expect(cop.offenses[2].line).to eq(7)
+      expect(cop.offenses[3].line).to eq(9)
     end
   end
 
@@ -1239,12 +1277,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -1262,12 +1300,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
   end
@@ -1279,12 +1317,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(1)
+      expect(cop.offenses.first.line).to eq(1)
     end
 
     include_examples 'mimics MRI 2.1'
@@ -1300,12 +1338,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(["/(?<foo>\w+)/"])
     end
 
@@ -1374,12 +1412,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(2)
+      expect(cop.offenses.first.line).to eq(2)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -1505,12 +1543,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, source)
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Useless assignment to variable - foo')
-      expect(cop.offences.first.line).to eq(1)
+      expect(cop.offenses.first.line).to eq(1)
       expect(cop.highlights).to eq(['foo'])
     end
 
@@ -1541,12 +1579,12 @@ describe Rubocop::Cop::Lint::UselessAssignment do
         ]
       end
 
-      it 'registers an offence' do
+      it 'registers an offense' do
         inspect_source(cop, source)
-        expect(cop.offences.size).to eq(1)
-        expect(cop.offences.first.message)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message)
           .to eq('Useless assignment to variable - foo')
-        expect(cop.offences.first.line).to eq(1)
+        expect(cop.offenses.first.line).to eq(1)
         expect(cop.highlights).to eq(['foo'])
       end