rubocop 0.18.1 → 0.19.0

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

@@ -5,38 +5,38 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::WhileUntilDo do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for do in multiline while' do
+  it 'registers an offense for do in multiline while' do
     inspect_source(cop, ['while cond do',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for do in multiline until' do
+  it 'registers an offense for do in multiline until' do
     inspect_source(cop, ['until cond do',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts do in single-line while' do
     inspect_source(cop, ['while cond do something end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts do in single-line until' do
     inspect_source(cop, ['until cond do something end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'it accepts multi-line while without do' do
     inspect_source(cop, ['while cond',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'it accepts multi-line until without do' do
     inspect_source(cop, ['until cond',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects the usage of "do" in multiline while' do

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

@@ -19,7 +19,7 @@ describe Rubocop::Cop::Style::WhileUntilModifier do
     check_short_multiline(cop, 'unless')
   end
 
-  it 'registers an offence for multiline while that fits on one line' do
+  it 'registers an offense for multiline while that fits on one line' do
     check_really_short(cop, 'while')
   end
 
@@ -36,17 +36,17 @@ describe Rubocop::Cop::Style::WhileUntilModifier do
                          'while (line = lines.shift)',
                          '  puts line',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for oneline while when assignment is in body' do
+  it 'registers an offense for oneline while when assignment is in body' do
     inspect_source(cop, ['while true',
                          '  x = 0',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for multiline until that fits on one line' do
+  it 'registers an offense for multiline until that fits on one line' do
     check_really_short(cop, 'until')
   end
 
@@ -65,11 +65,29 @@ describe Rubocop::Cop::Style::WhileUntilModifier do
 
   it 'accepts modifier while' do
     inspect_source(cop, ['ala while bala'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts modifier until' do
     inspect_source(cop, ['ala until bala'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
+  end
+
+  context 'when the maximum line length is specified by the cop itself' do
+    let(:config) do
+      hash = {
+        'LineLength' => { 'Max' => 100 },
+        'WhileUntilModifier' => { 'MaxLineLength' => 79 }
+      }
+      Rubocop::Config.new(hash)
+    end
+
+    it "accepts multiline while that doesn't fit on one line" do
+      check_too_long(cop, 'while')
+    end
+
+    it "accepts multiline until that doesn't fit on one line" do
+      check_too_long(cop, 'until')
+    end
   end
 end

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

@@ -6,64 +6,64 @@ describe Rubocop::Cop::Style::WordArray, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'MinSize' => 0 } }
 
-  it 'registers an offence for arrays of single quoted strings' do
+  it 'registers an offense for arrays of single quoted strings' do
     inspect_source(cop,
                    ["['one', 'two', 'three']"])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.config_to_allow_offences).to eq('MinSize' => 3)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.config_to_allow_offenses).to eq('MinSize' => 3)
   end
 
-  it 'registers an offence for arrays of double quoted strings' do
+  it 'registers an offense for arrays of double quoted strings' do
     inspect_source(cop,
                    ['["one", "two", "three"]'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for arrays with character constants' do
+  it 'registers an offense for arrays with character constants' do
     inspect_source(cop,
                    ['["one", ?\n]'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for array of non-words' do
+  it 'does not register an offense for array of non-words' do
     inspect_source(cop,
                    ['["one space", "two", "three"]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for array containing non-string' do
+  it 'does not register an offense for array containing non-string' do
     inspect_source(cop,
                    ['["one", "two", 3]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for array starting with %w' do
+  it 'does not register an offense for array starting with %w' do
     inspect_source(cop,
                    ['%w(one two three)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for array with one element' do
+  it 'does not register an offense for array with one element' do
     inspect_source(cop,
                    ['["three"]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for array with empty strings' do
+  it 'does not register an offense for array with empty strings' do
     inspect_source(cop,
                    ['["", "two", "three"]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for array with allowed number of strings' do
+  it 'does not register an offense for array with allowed number of strings' do
     cop_config['MinSize'] = 3
 
     inspect_source(cop,
                    ['["one", "two", "three"]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for an array with comments in it' do
+  it 'does not register an offense for an array with comments in it' do
     inspect_source(cop,
                    ['[',
                     '"foo", # comment here',
@@ -71,10 +71,10 @@ describe Rubocop::Cop::Style::WordArray, :config do
                     '"baz" # do not delete this line',
                     ']'])
 
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for an array with comments outside of it' do
+  it 'registers an offense for an array with comments outside of it' do
     inspect_source(cop,
                    ['[',
                     '"foo",',
@@ -82,7 +82,7 @@ describe Rubocop::Cop::Style::WordArray, :config do
                     '"baz"',
                     '] # test'])
 
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'auto-corrects an array of words' do

data/spec/rubocop/cop/team_spec.rb

@@ -40,7 +40,7 @@ describe Rubocop::Cop::Team do
     include FileHelper
 
     let(:file_path) { 'example.rb' }
-    let(:offences) { team.inspect_file(file_path) }
+    let(:offenses) { team.inspect_file(file_path) }
 
     before do
       create_file(file_path, [
@@ -49,9 +49,9 @@ describe Rubocop::Cop::Team do
       ])
     end
 
-    it 'returns offences' do
-      expect(offences).not_to be_empty
-      expect(offences.all? { |o| o.is_a?(Rubocop::Cop::Offence) }).to be_true
+    it 'returns offenses' do
+      expect(offenses).not_to be_empty
+      expect(offenses.all? { |o| o.is_a?(Rubocop::Cop::Offense) }).to be_true
     end
 
     context 'when Parser cannot parse the file' do
@@ -62,11 +62,11 @@ describe Rubocop::Cop::Team do
         ])
       end
 
-      it 'returns only error offences' do
-        expect(offences.size).to eq(1)
-        offence = offences.first
-        expect(offence.cop_name).to eq('Syntax')
-        expect(offence.severity).to eq(:error)
+      it 'returns only error offenses' do
+        expect(offenses.size).to eq(1)
+        offense = offenses.first
+        expect(offense.cop_name).to eq('Syntax')
+        expect(offense.severity).to eq(:error)
       end
     end
 
@@ -79,13 +79,13 @@ describe Rubocop::Cop::Team do
         ])
       end
 
-      let(:cop_names) { offences.map(&:cop_name) }
+      let(:cop_names) { offenses.map(&:cop_name) }
 
-      it 'returns Parser warning offences' do
+      it 'returns Parser warning offenses' do
         expect(cop_names).to include('AmbiguousOperator')
       end
 
-      it 'returns offences from cops' do
+      it 'returns offenses from cops' do
         expect(cop_names).to include('LineLength')
       end
     end
@@ -110,8 +110,8 @@ describe Rubocop::Cop::Team do
         ].join("\n"))
       end
 
-      it 'still returns offences' do
-        expect(offences.first.cop_name).to eq('StringLiterals')
+      it 'still returns offenses' do
+        expect(offenses.first.cop_name).to eq('StringLiterals')
       end
     end
   end

data/spec/rubocop/file_inspector_spec.rb

@@ -2,14 +2,16 @@
 
 require 'spec_helper'
 
-class Rubocop::FileInspector
-  attr_writer :errors # Needed only for testing.
+module Rubocop
+  class FileInspector
+    attr_writer :errors # Needed only for testing.
+  end
 end
 
 describe Rubocop::FileInspector do
   subject(:inspector) { described_class.new(options) }
   let(:options) { {} }
-  let(:offences) { [] }
+  let(:offenses) { [] }
   let(:errors) { [] }
 
   before(:each) do
@@ -18,7 +20,7 @@ describe Rubocop::FileInspector do
 
     allow(inspector).to receive(:inspect_file) do
       inspector.errors = errors
-      offences
+      [offenses, !:updated_source_file]
     end
   end
 
@@ -41,16 +43,16 @@ describe Rubocop::FileInspector do
   end
 
   describe '#process_files' do
-    context 'if there are no offences in inspected files' do
+    context 'if there are no offenses in inspected files' do
       it 'returns false' do
         result = inspector.process_files(['file.rb'], nil) {}
         expect(result).to eq(false)
       end
     end
 
-    context 'if there is an offence in an inspected file' do
-      let(:offences) do
-        [Rubocop::Cop::Offence.new(:convention,
+    context 'if there is an offense in an inspected file' do
+      let(:offenses) do
+        [Rubocop::Cop::Offense.new(:convention,
                                    Struct.new(:line, :column,
                                               :source_line).new(1, 0, ''),
                                    'Use alias_method instead of alias.',
@@ -61,17 +63,17 @@ describe Rubocop::FileInspector do
         expect(inspector.process_files(['file.rb'], nil) {}).to eq(true)
       end
 
-      it 'sends the offence to a formatter' do
+      it 'sends the offense to a formatter' do
         inspector.process_files(['file.rb'], nil) {}
         expect($stdout.string.split("\n"))
           .to eq(['Inspecting 1 file',
                   'C',
                   '',
-                  'Offences:',
+                  'Offenses:',
                   '',
-                  "file.rb:1:1: C: #{offences.first.message}",
+                  "file.rb:1:1: C: #{offenses.first.message}",
                   '',
-                  '1 file inspected, 1 offence detected'])
+                  '1 file inspected, 1 offense detected'])
       end
     end
   end

data/spec/rubocop/formatter/base_formatter_spec.rb

@@ -13,12 +13,12 @@ module Rubocop
         let(:output) { $stdout.string }
 
         before do
-          create_file('1_offence.rb', [
+          create_file('1_offense.rb', [
             '# encoding: utf-8',
             '#' * 90
           ])
 
-          create_file('4_offences.rb', [
+          create_file('4_offenses.rb', [
             '# encoding: utf-8',
             'puts x ',
             'test;',
@@ -26,7 +26,7 @@ module Rubocop
             '#' * 90
           ])
 
-          create_file('no_offence.rb', [
+          create_file('no_offense.rb', [
             '# encoding: utf-8'
           ])
 
@@ -71,9 +71,9 @@ module Rubocop
         shared_examples 'receives all file paths' do |method_name|
           it 'receives all file paths' do
             expected_paths = [
-              '1_offence.rb',
-              '4_offences.rb',
-              'no_offence.rb'
+              '1_offense.rb',
+              '4_offenses.rb',
+              'no_offense.rb'
             ].map { |path| File.expand_path(path) }.sort
 
             expect(formatter).to receive(method_name) do |all_files|
@@ -109,7 +109,7 @@ module Rubocop
               class << formatter
                 attr_reader :processed_file_count
 
-                def file_finished(file, offences)
+                def file_finished(file, offenses)
                   @processed_file_count ||= 0
                   @processed_file_count += 1
                 end
@@ -131,13 +131,13 @@ module Rubocop
         shared_examples 'receives a file path' do |method_name|
           it 'receives a file path' do
             expect(formatter).to receive(method_name)
-              .with(File.expand_path('1_offence.rb'), anything)
+              .with(File.expand_path('1_offense.rb'), anything)
 
             expect(formatter).to receive(method_name)
-              .with(File.expand_path('4_offences.rb'), anything)
+              .with(File.expand_path('4_offenses.rb'), anything)
 
             expect(formatter).to receive(method_name)
-              .with(File.expand_path('no_offence.rb'), anything)
+              .with(File.expand_path('no_offense.rb'), anything)
 
             run
           end
@@ -166,20 +166,20 @@ module Rubocop
         describe '#file_finished' do
           include_examples 'receives a file path', :file_finished
 
-          it 'receives an array of detected offences for the file' do
+          it 'receives an array of detected offenses for the file' do
             expect(formatter).to receive(:file_finished)
-            .exactly(3).times do |file, offences|
+            .exactly(3).times do |file, offenses|
               case File.basename(file)
-              when '1_offence.rb'
-                expect(offences.size).to eq(1)
-              when '4_offences.rb'
-                expect(offences.size).to eq(4)
-              when 'no_offence.rb'
-                expect(offences).to be_empty
+              when '1_offense.rb'
+                expect(offenses.size).to eq(1)
+              when '4_offenses.rb'
+                expect(offenses.size).to eq(4)
+              when 'no_offense.rb'
+                expect(offenses).to be_empty
               else
                 fail
               end
-              expect(offences.all? { |o| o.is_a?(Rubocop::Cop::Offence) })
+              expect(offenses.all? { |o| o.is_a?(Rubocop::Cop::Offense) })
                 .to be_true
             end
             run

data/spec/rubocop/formatter/clang_style_formatter_spec.rb

@@ -14,14 +14,14 @@ module Rubocop
           cop = Cop::Cop.new
           source_buffer = Parser::Source::Buffer.new('test', 1)
           source_buffer.source = ('aa'..'az').to_a.join($RS)
-          cop.add_offence(nil,
+          cop.add_offense(nil,
                           Parser::Source::Range.new(source_buffer, 0, 2),
                           'message 1')
-          cop.add_offence(nil,
+          cop.add_offense(nil,
                           Parser::Source::Range.new(source_buffer, 30, 32),
                           'message 2')
 
-          formatter.report_file('test', cop.offences)
+          formatter.report_file('test', cop.offenses)
           expect(output.string).to eq ['test:1:1: C: message 1',
                                        'aa',
                                        '^^',
@@ -36,14 +36,14 @@ module Rubocop
             cop = Cop::Cop.new
             source_buffer = Parser::Source::Buffer.new('test', 1)
             source_buffer.source = (['     ', 'yaba']).to_a.join($RS)
-            cop.add_offence(nil,
+            cop.add_offense(nil,
                             Parser::Source::Range.new(source_buffer, 0, 2),
                             'message 1')
-            cop.add_offence(nil,
+            cop.add_offense(nil,
                             Parser::Source::Range.new(source_buffer, 6, 10),
                             'message 2')
 
-            formatter.report_file('test', cop.offences)
+            formatter.report_file('test', cop.offenses)
             expect(output.string).to eq ['test:1:1: C: message 1',
                                          'test:2:1: C: message 2',
                                          'yaba',
@@ -66,9 +66,9 @@ module Rubocop
                                                  source.index(']') + 1)
 
             cop = Cop::Cop.new
-            cop.add_offence(nil, location, 'message 1')
+            cop.add_offense(nil, location, 'message 1')
 
-            formatter.report_file('test', cop.offences)
+            formatter.report_file('test', cop.offenses)
             expect(output.string).to eq ['test:1:14: C: message 1',
                                          'do_something([this,',
                                          '             ^^^^^^',
@@ -78,8 +78,8 @@ module Rubocop
 
         let(:file) { '/path/to/file' }
 
-        let(:offence) do
-          Cop::Offence.new(:convention, location,
+        let(:offense) do
+          Cop::Offense.new(:convention, location,
                            'This is a message.', 'CopName', corrected)
         end
 
@@ -89,21 +89,21 @@ module Rubocop
           Parser::Source::Range.new(source_buffer, 0, 1)
         end
 
-        context 'when the offence is not corrected' do
+        context 'when the offense is not corrected' do
           let(:corrected) { false }
 
           it 'prints message as-is' do
-            formatter.report_file(file, [offence])
+            formatter.report_file(file, [offense])
             expect(output.string)
               .to include(': This is a message.')
           end
         end
 
-        context 'when the offence is automatically corrected' do
+        context 'when the offense is automatically corrected' do
           let(:corrected) { true }
 
           it 'prints [Corrected] along with message' do
-            formatter.report_file(file, [offence])
+            formatter.report_file(file, [offense])
             expect(output.string)
               .to include(': [Corrected] This is a message.')
           end