rubocop 0.18.1 → 0.19.0

data/spec/rubocop/comment_config_spec.rb

@@ -0,0 +1,103 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::CommentConfig do
+  subject(:comment_config) { Rubocop::CommentConfig.new(parse_source(source)) }
+
+  describe '#cop_enabled_at_line?' do
+    let(:source) do
+      [
+        '# encoding: utf-8',
+        '',
+        '# rubocop:disable MethodLength',
+        'def some_method',
+        "  puts 'foo'",
+        'end',
+        '# rubocop:enable MethodLength',
+        '',
+        '# rubocop:disable all',
+        'some_method',
+        '# rubocop:enable all',
+        '',
+        "code = 'This is evil.'",
+        'eval(code) # rubocop:disable Eval',
+        "puts 'This is not evil.'",
+        '',
+        'def some_method',
+        "  puts 'Disabling indented single line' # rubocop:disable LineLength",
+        'end',
+        '',
+        'string = <<END',
+        'This is a string not a real comment # rubocop:disable Loop',
+        'END',
+        '',
+        'foo # rubocop:disable MethodCallParentheses',
+        '',
+        '# rubocop:enable Void',
+        '',
+        '# rubocop:disable For',
+        'foo'
+      ]
+    end
+
+    def disabled_lines_of_cop(cop)
+      (1..source.size).each_with_object([]) do |line_number, disabled_lines|
+        enabled = comment_config.cop_enabled_at_line?(cop, line_number)
+        disabled_lines << line_number unless enabled
+      end
+    end
+
+    it 'supports disabling multiple lines with a pair of directive' do
+      method_length_disabled_lines = disabled_lines_of_cop('MethodLength')
+      expected_part = (3..6).to_a
+      expect(method_length_disabled_lines & expected_part)
+        .to eq(expected_part)
+    end
+
+    it 'supports disabling all lines after a directive' do
+      for_disabled_lines = disabled_lines_of_cop('For')
+      expected_part = (29..source.size).to_a
+      expect(for_disabled_lines & expected_part)
+        .to eq(expected_part)
+    end
+
+    it 'just ignores unpaired enabling directives' do
+      void_disabled_lines = disabled_lines_of_cop('Void')
+      expected_part = (27..source.size).to_a
+      expect(void_disabled_lines & expected_part).to be_empty
+    end
+
+    it 'supports disabling single line with a direcive at end of line' do
+      eval_disabled_lines = disabled_lines_of_cop('Eval')
+      expect(eval_disabled_lines).to include(14)
+      expect(eval_disabled_lines).not_to include(15)
+    end
+
+    it 'handles indented single line' do
+      line_length_disabled_lines = disabled_lines_of_cop('LineLength')
+      expect(line_length_disabled_lines).to include(18)
+      expect(line_length_disabled_lines).not_to include(19)
+    end
+
+    it 'does not confuse a comment directive embedded in a string literal ' \
+       'with a real comment' do
+      loop_disabled_lines = disabled_lines_of_cop('Loop')
+      expect(loop_disabled_lines).not_to include(22)
+    end
+
+    it 'supports disabling all cops with keyword all' do
+      expected_part = (9..10).to_a
+
+      Rubocop::Cop::Cop.all.each do |cop|
+        disabled_lines = disabled_lines_of_cop(cop)
+        expect(disabled_lines & expected_part).to eq(expected_part)
+      end
+    end
+
+    it 'does not confuse a cop name including "all" with all cops' do
+      alias_disabled_lines = disabled_lines_of_cop('Alias')
+      expect(alias_disabled_lines).not_to include(25)
+    end
+  end
+end

data/spec/rubocop/config_loader_spec.rb

@@ -188,10 +188,10 @@ describe Rubocop::ConfigLoader do
       it 'returns the ancestor configuration plus local overrides' do
         config = default_config
                    .merge('LineLength' => {
-                          'Description' =>
-                             default_config['LineLength']['Description'],
-                          'Enabled' => true,
-                          'Max' => 77
+                            'Description' =>
+                               default_config['LineLength']['Description'],
+                            'Enabled' => true,
+                            'Max' => 77
                           },
                           'MethodLength' => {
                             'Description' =>

data/spec/rubocop/cop/commissioner_spec.rb

@@ -5,10 +5,10 @@ require 'spec_helper'
 
 describe Rubocop::Cop::Commissioner do
   describe '#investigate' do
-    let(:cop) { double(Rubocop::Cop, offences: []).as_null_object }
+    let(:cop) { double(Rubocop::Cop, offenses: []).as_null_object }
 
-    it 'returns all offences found by the cops' do
-      allow(cop).to receive(:offences).and_return([1])
+    it 'returns all offenses found by the cops' do
+      allow(cop).to receive(:offenses).and_return([1])
 
       commissioner = described_class.new([cop])
       source = []
@@ -18,11 +18,11 @@ describe Rubocop::Cop::Commissioner do
     end
 
     context 'when a cop has no interest in the file' do
-      it 'returns all offences except the ones of the cop' do
+      it 'returns all offenses except the ones of the cop' do
         cops = []
-        cops << double('cop A', offences: %w(foo), relevant_file?: true)
-        cops << double('cop B', offences: %w(bar), relevant_file?: false)
-        cops << double('cop C', offences: %w(baz), relevant_file?: true)
+        cops << double('cop A', offenses: %w(foo), relevant_file?: true)
+        cops << double('cop B', offenses: %w(bar), relevant_file?: false)
+        cops << double('cop C', offenses: %w(baz), relevant_file?: true)
         cops.each(&:as_null_object)
 
         commissioner = described_class.new(cops)

data/spec/rubocop/cop/cop_spec.rb

@@ -10,45 +10,45 @@ describe Rubocop::Cop::Cop do
     Parser::Source::Range.new(source_buffer, 0, 1)
   end
 
-  it 'initially has 0 offences' do
-    expect(cop.offences).to be_empty
+  it 'initially has 0 offenses' do
+    expect(cop.offenses).to be_empty
   end
 
-  it 'keeps track of offences' do
-    cop.add_offence(nil, location, 'message')
+  it 'keeps track of offenses' do
+    cop.add_offense(nil, location, 'message')
 
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'will report registered offences' do
-    cop.add_offence(nil, location, 'message')
+  it 'will report registered offenses' do
+    cop.add_offense(nil, location, 'message')
 
-    expect(cop.offences).not_to be_empty
+    expect(cop.offenses).not_to be_empty
   end
 
   it 'will set default severity' do
-    cop.add_offence(nil, location, 'message')
+    cop.add_offense(nil, location, 'message')
 
-    expect(cop.offences.first.severity).to eq(:convention)
+    expect(cop.offenses.first.severity).to eq(:convention)
   end
 
   it 'will set custom severity if present' do
     cop.config[cop.name] = { 'Severity' => 'warning' }
-    cop.add_offence(nil, location, 'message')
+    cop.add_offense(nil, location, 'message')
 
-    expect(cop.offences.first.severity).to eq(:warning)
+    expect(cop.offenses.first.severity).to eq(:warning)
   end
 
   it 'will warn if custom severity is invalid' do
     cop.config[cop.name] = { 'Severity' => 'superbad' }
     expect(cop).to receive(:warn)
-    cop.add_offence(nil, location, 'message')
+    cop.add_offense(nil, location, 'message')
   end
 
-  it 'registers offence with its name' do
+  it 'registers offense with its name' do
     cop = Rubocop::Cop::Style::For.new
-    cop.add_offence(nil, location, 'message')
-    expect(cop.offences.first.cop_name).to eq('For')
+    cop.add_offense(nil, location, 'message')
+    expect(cop.offenses.first.cop_name).to eq('For')
   end
 
   context 'with no submodule' do
@@ -101,7 +101,7 @@ describe Rubocop::Cop::Cop do
       it 'has each cop in exactly one type' do
         sum = 0
         types.each do |c|
-          sum = sum + described_class.all.with_type(c).length
+          sum += described_class.all.with_type(c).length
         end
         expect(sum).to be described_class.all.length
       end

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

@@ -19,13 +19,13 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
           ]
         end
 
-        it 'registers an offence' do
-          expect(cop.offences.size).to eq(1)
-          expect(cop.offences.first.message).to eq(
+        it 'registers an offense' do
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.offenses.first.message).to eq(
             'Ambiguous splat operator. ' \
-            "Parenthesize the method arguments if it's surely a splat " +
-            'operator, ' +
-            'or add a whitespace to the right of the * if it should be a ' +
+            "Parenthesize the method arguments if it's surely a splat " \
+            'operator, ' \
+            'or add a whitespace to the right of the * if it should be a ' \
             'multiplication.'
           )
           expect(cop.highlights).to eq(['*'])
@@ -41,7 +41,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
         end
 
         it 'accepts' do
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
       end
     end
@@ -55,7 +55,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
       end
 
       it 'accepts' do
-        expect(cop.offences).to be_empty
+        expect(cop.offenses).to be_empty
       end
     end
   end
@@ -70,13 +70,13 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
           ]
         end
 
-        it 'registers an offence' do
-          expect(cop.offences.size).to eq(1)
-          expect(cop.offences.first.message).to eq(
+        it 'registers an offense' do
+          expect(cop.offenses.size).to eq(1)
+          expect(cop.offenses.first.message).to eq(
             'Ambiguous block operator. ' \
-            "Parenthesize the method arguments if it's surely a block " +
-            'operator, ' +
-            'or add a whitespace to the right of the & if it should be a ' +
+            "Parenthesize the method arguments if it's surely a block " \
+            'operator, ' \
+            'or add a whitespace to the right of the & if it should be a ' \
             'binary AND.'
           )
           expect(cop.highlights).to eq(['&'])
@@ -92,7 +92,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
         end
 
         it 'accepts' do
-          expect(cop.offences).to be_empty
+          expect(cop.offenses).to be_empty
         end
       end
     end
@@ -106,7 +106,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
       end
 
       it 'accepts' do
-        expect(cop.offences).to be_empty
+        expect(cop.offenses).to be_empty
       end
     end
   end

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

@@ -13,11 +13,11 @@ describe Rubocop::Cop::Lint::AmbiguousRegexpLiteral do
     context 'without parentheses' do
       let(:source) { 'p /pattern/' }
 
-      it 'registers an offence' do
-        expect(cop.offences.size).to eq(1)
-        expect(cop.offences.first.message).to eq(
+      it 'registers an offense' do
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message).to eq(
           'Ambiguous regexp literal. Parenthesize the method arguments ' \
-          "if it's surely a regexp literal, or add a whitespace to the " +
+          "if it's surely a regexp literal, or add a whitespace to the " \
           'right of the / if it should be a division.'
         )
         expect(cop.highlights).to eq(['/'])
@@ -28,7 +28,7 @@ describe Rubocop::Cop::Lint::AmbiguousRegexpLiteral do
       let(:source) { 'p(/pattern/)' }
 
       it 'accepts' do
-        expect(cop.offences).to be_empty
+        expect(cop.offenses).to be_empty
       end
     end
   end

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

@@ -6,60 +6,60 @@ describe Rubocop::Cop::Lint::AssignmentInCondition, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'AllowSafeAssignment' => true } }
 
-  it 'registers an offence for lvar assignment in condition' do
+  it 'registers an offense for lvar assignment in condition' do
     inspect_source(cop,
                    ['if test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for lvar assignment in while condition' do
+  it 'registers an offense for lvar assignment in while condition' do
     inspect_source(cop,
                    ['while test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for lvar assignment in until condition' do
+  it 'registers an offense for lvar assignment in until condition' do
     inspect_source(cop,
                    ['until test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for ivar assignment in condition' do
+  it 'registers an offense for ivar assignment in condition' do
     inspect_source(cop,
                    ['if @test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for clvar assignment in condition' do
+  it 'registers an offense for clvar assignment in condition' do
     inspect_source(cop,
                    ['if @@test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for gvar assignment in condition' do
+  it 'registers an offense for gvar assignment in condition' do
     inspect_source(cop,
                    ['if $test = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for constant assignment in condition' do
+  it 'registers an offense for constant assignment in condition' do
     inspect_source(cop,
                    ['if TEST = 10',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts == in condition' do
@@ -67,19 +67,19 @@ describe Rubocop::Cop::Lint::AssignmentInCondition, :config do
                    ['if test == 10',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts = in a block that is called in a condition' do
     inspect_source(cop,
                    ['return 1 if any_errors? { o = inspect(file) }'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts ||= in condition' do
     inspect_source(cop,
                    ['raise StandardError unless foo ||= bar'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'safe assignment is allowed' do
@@ -88,7 +88,7 @@ describe Rubocop::Cop::Lint::AssignmentInCondition, :config do
                      ['if (test = 10)',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
   end
@@ -101,7 +101,7 @@ describe Rubocop::Cop::Lint::AssignmentInCondition, :config do
                      ['if (test = 10)',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 end

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

@@ -6,7 +6,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::BlockAlignment do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for mismatched block end' do
+  it 'registers an offense for mismatched block end' do
     inspect_source(cop,
                    ['test do |ala|',
                     '  end'
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       'a || b do',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -33,11 +33,11 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['variable = test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when there is an assignment chain' do
-    it 'registers an offence for an end aligned with the 2nd variable' do
+    it 'registers an offense for an end aligned with the 2nd variable' do
       inspect_source(cop,
                      ['a = b = c = test do |ala|',
                       '    end'
@@ -51,7 +51,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                      ['a = b = c = test do |ala|',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -62,11 +62,11 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       '  a + e.length + newline_length',
                       'end + 1'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
-  it 'registers an offence for mismatched block end with a variable' do
+  it 'registers an offense for mismatched block end with a variable' do
     inspect_source(cop,
                    ['variable = test do |ala|',
                     '  end'
@@ -83,10 +83,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       '    v.foo',
                       '  end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offences for mismatched end alignment' do
+    it 'registers an offenses for mismatched end alignment' do
       inspect_source(cop,
                      ['variable =',
                       '  a_long_method_that_dont_fit_on_the_line do |v|',
@@ -114,10 +114,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
              '      end',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers offences for misaligned ends' do
+    it 'registers offenses for misaligned ends' do
       src = ['def foo(bar)',
              '  bar.get_stuffs',
              '      .reject do |stuff|',
@@ -151,27 +151,27 @@ describe Rubocop::Cop::Lint::BlockAlignment do
              '  do_something',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     # Example from issue 447 of bbatsov/rubocop on github:
     it 'accepts two kinds of end alignment' do
       src = [
-             # Aligned with start of line where do is:
-             'params = default_options.merge(options)',
-             '          .delete_if { |k, v| v.nil? }',
-             '          .each_with_object({}) do |(k, v), new_hash|',
-             '            new_hash[k.to_s] = v.to_s',
-             '          end',
-             # Aligned with start of the whole expression:
-             'params = default_options.merge(options)',
-             '          .delete_if { |k, v| v.nil? }',
-             '          .each_with_object({}) do |(k, v), new_hash|',
-             '            new_hash[k.to_s] = v.to_s',
-             'end'
-            ]
+        # Aligned with start of line where do is:
+        'params = default_options.merge(options)',
+        '          .delete_if { |k, v| v.nil? }',
+        '          .each_with_object({}) do |(k, v), new_hash|',
+        '            new_hash[k.to_s] = v.to_s',
+        '          end',
+        # Aligned with start of the whole expression:
+        'params = default_options.merge(options)',
+        '          .delete_if { |k, v| v.nil? }',
+        '          .each_with_object({}) do |(k, v), new_hash|',
+        '            new_hash[k.to_s] = v.to_s',
+        'end'
+      ]
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -182,10 +182,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
              '  i - 5',
              'end']
       inspect_source(cop, src)
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for end aligned with the block' do
+    it 'registers an offense for end aligned with the block' do
       src = ['e,',
              'f = [5, 6].map do |i|',
              '  i - 5',
@@ -201,10 +201,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['@variable = test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with an instance variable' do
+  it 'registers an offense for mismatched block end with an instance variable' do
     inspect_source(cop,
                    ['@variable = test do |ala|',
                     '  end'
@@ -218,10 +218,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['@@variable = test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with a class variable' do
+  it 'registers an offense for mismatched block end with a class variable' do
     inspect_source(cop,
                    ['@@variable = test do |ala|',
                     '  end'
@@ -235,10 +235,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['$variable = test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with a global variable' do
+  it 'registers an offense for mismatched block end with a global variable' do
     inspect_source(cop,
                    ['$variable = test do |ala|',
                     '  end'
@@ -252,10 +252,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['CONSTANT = test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with a constant' do
+  it 'registers an offense for mismatched block end with a constant' do
     inspect_source(cop,
                    ['Module::CONSTANT = test do |ala|',
                     '  end'
@@ -270,10 +270,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  token << 1',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with a method call' do
+  it 'registers an offense for mismatched block end with a method call' do
     inspect_source(cop,
                    ['parser.childs << lambda do |token|',
                     '  token << 1',
@@ -289,10 +289,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  v = 1',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched end with a method call with arguments' do
+  it 'registers an offense for mismatched end with a method call with arguments' do
     inspect_source(cop,
                    ['@h[:f] = f.each_pair.map do |f, v|',
                     '  v = 1',
@@ -306,7 +306,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
     inspect_source(cop,
                    ['expect(arr.all? { |o| o.valid? })'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts end aligned with the block when the block is a method argument' do
@@ -315,10 +315,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '         o.valid?',
                     '       end)'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched end not aligned with the block that is an argument' do
+  it 'registers an offense for mismatched end not aligned with the block that is an argument' do
     inspect_source(cop,
                    ['expect(arr.all? do |o|',
                     '  o.valid?',
@@ -335,10 +335,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  file << something',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with an op-asgn (+=, -=)' do
+  it 'registers an offense for mismatched block end with an op-asgn (+=, -=)' do
     inspect_source(cop,
                    ['rb += files.select do |file|',
                     '  file << something',
@@ -353,10 +353,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['variable &&= test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with an and-asgn (&&=)' do
+  it 'registers an offense for mismatched block end with an and-asgn (&&=)' do
     inspect_source(cop,
                    ['variable &&= test do |ala|',
                     '  end'
@@ -370,10 +370,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['variable ||= test do |ala|',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with an or-asgn (||=)' do
+  it 'registers an offense for mismatched block end with an or-asgn (||=)' do
     inspect_source(cop,
                    ['variable ||= test do |ala|',
                     '  end'
@@ -388,7 +388,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  [1, 2]',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts end aligned with a call chain left hand side' do
@@ -396,10 +396,10 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                    ['parser.diagnostics.consumer = lambda do |diagnostic|',
                     '  diagnostics << diagnostic',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for mismatched block end with a mass assignment' do
+  it 'registers an offense for mismatched block end with a mass assignment' do
     inspect_source(cop,
                    ['var1, var2 = lambda do |test|',
                     '  [1, 2]',