rubocop 0.18.1 → 0.19.0

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

@@ -5,40 +5,40 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::ConstantName do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for camel case in const name' do
+  it 'registers an offense for camel case in const name' do
     inspect_source(cop,
                    ['TopCase = 5'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers offences for camel case in multiple const assignment' do
+  it 'registers offenses for camel case in multiple const assignment' do
     inspect_source(cop,
                    ['TopCase, Test2, TEST_3 = 5, 6, 7'])
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 
-  it 'registers an offence for snake case in const name' do
+  it 'registers an offense for snake case in const name' do
     inspect_source(cop,
                    ['TOP_test = 5'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'allows screaming snake case in const name' do
     inspect_source(cop,
                    ['TOP_TEST = 5'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'allows screaming snake case in multiple const assignment' do
     inspect_source(cop,
                    ['TOP_TEST, TEST_2 = 5, 6'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not check names if rhs is a method call' do
     inspect_source(cop,
                    ['AnythingGoes = test'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not check names if rhs is a method call with block' do
@@ -47,19 +47,19 @@ describe Rubocop::Cop::Style::ConstantName do
                     '  do_something',
                     'end'
                     ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not check if rhs is another constant' do
     inspect_source(cop,
                    ['Parser::CurrentRuby = Parser::Ruby20'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'checks qualified const names' do
     inspect_source(cop,
                    ['::AnythingGoes = 30',
                     'a::Bar_foo = 10'])
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 end

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

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
       inspect_source(cop, ['def method_name',
                            '  call_foo',
                            'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts complex code outside of methods' do
@@ -25,20 +25,20 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
                       '  call_foo if second_condition && third_condition',
                       '  call_bar if fourth_condition || fifth_condition',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
-    it 'registers an offence for an if modifier' do
+    it 'registers an offense for an if modifier' do
       inspect_source(cop, ['def self.method_name',
                            '  call_foo if some_condition',
                            'end'])
       expect(cop.messages)
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
       expect(cop.highlights).to eq(['def'])
-      expect(cop.config_to_allow_offences).to eq('Max' => 2)
+      expect(cop.config_to_allow_offenses).to eq('Max' => 2)
     end
 
-    it 'registers an offence for an unless modifier' do
+    it 'registers an offense for an unless modifier' do
       inspect_source(cop, ['def method_name',
                            '  call_foo unless some_condition',
                            'end'])
@@ -46,7 +46,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for an elsif block' do
+    it 'registers an offense for an elsif block' do
       inspect_source(cop, ['def method_name',
                            '  if first_condition then',
                            '    call_foo',
@@ -60,7 +60,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [3/1]'])
     end
 
-    it 'registers an offence for a ternary operator' do
+    it 'registers an offense for a ternary operator' do
       inspect_source(cop, ['def method_name',
                            '  value = some_condition ? 1 : 2',
                            'end'])
@@ -68,7 +68,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for a while block' do
+    it 'registers an offense for a while block' do
       inspect_source(cop, ['def method_name',
                            '  while some_condition do',
                            '    call_foo',
@@ -78,7 +78,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for an until block' do
+    it 'registers an offense for an until block' do
       inspect_source(cop, ['def method_name',
                            '  until some_condition do',
                            '    call_foo',
@@ -88,7 +88,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for a for block' do
+    it 'registers an offense for a for block' do
       inspect_source(cop, ['def method_name',
                            '  for i in 1..2 do',
                            '    call_method',
@@ -98,7 +98,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for a rescue block' do
+    it 'registers an offense for a rescue block' do
       inspect_source(cop, ['def method_name',
                            '  begin',
                            '    call_foo',
@@ -110,7 +110,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for a case/when block' do
+    it 'registers an offense for a case/when block' do
       inspect_source(cop, ['def method_name',
                            '  case value',
                            '  when 1',
@@ -123,7 +123,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [3/1]'])
     end
 
-    it 'registers an offence for &&' do
+    it 'registers an offense for &&' do
       inspect_source(cop, ['def method_name',
                            '  call_foo && call_bar',
                            'end'])
@@ -131,7 +131,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for and' do
+    it 'registers an offense for and' do
       inspect_source(cop, ['def method_name',
                            '  call_foo and call_bar',
                            'end'])
@@ -139,7 +139,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for ||' do
+    it 'registers an offense for ||' do
       inspect_source(cop, ['def method_name',
                            '  call_foo || call_bar',
                            'end'])
@@ -147,7 +147,7 @@ describe Rubocop::Cop::Style::CyclomaticComplexity, :config do
         .to eq(['Cyclomatic complexity for method_name is too high. [2/1]'])
     end
 
-    it 'registers an offence for or' do
+    it 'registers an offense for or' do
       inspect_source(cop, ['def method_name',
                            '  call_foo or call_bar',
                            'end'])

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

@@ -5,31 +5,31 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::DefWithParentheses do
   subject(:cop) { described_class.new }
 
-  it 'reports an offence for def with empty parens' do
+  it 'reports an offense for def with empty 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 'reports an offence for class def with empty parens' do
+  it 'reports an offense for class def with empty parens' do
     src = ['def Test.func()',
            'end']
     inspect_source(cop, src)
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts def with arg and parens' do
     src = ['def func(a)',
            'end']
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts empty parentheses in one liners' do
     src = ["def to_s() join '/' end"]
     inspect_source(cop, src)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-removes unneeded parens' do

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

@@ -11,13 +11,13 @@ describe Rubocop::Cop::Style::Documentation do
                         })
   end
 
-  it 'registers an offence for non-empty class' do
+  it 'registers an offense for non-empty class' do
     inspect_source(cop,
                    ['class My_Class',
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not consider comment followed by empty line to be class ' \
@@ -30,26 +30,26 @@ describe Rubocop::Cop::Style::Documentation do
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for non-namespace' do
+  it 'registers an offense for non-namespace' do
     inspect_source(cop,
                    ['module My_Class',
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for empty module without documentation' do
+  it 'registers an offense for empty module without documentation' do
     # Because why would you have an empty module? It requires some
     # explanation.
     inspect_source(cop,
                    ['module Test',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts non-empty class with documentation' do
@@ -59,17 +59,17 @@ describe Rubocop::Cop::Style::Documentation do
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for non-empty class with annotation comment' do
+  it 'registers an offense for non-empty class with annotation comment' do
     inspect_source(cop,
                    ['# OPTIMIZE: Make this faster.',
                     'class My_Class',
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts non-empty module with documentation' do
@@ -79,7 +79,7 @@ describe Rubocop::Cop::Style::Documentation do
                     '  TEST = 20',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts empty class without documentation' do
@@ -87,7 +87,7 @@ describe Rubocop::Cop::Style::Documentation do
                    ['class My_Class',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts namespace module without documentation' do
@@ -97,7 +97,7 @@ describe Rubocop::Cop::Style::Documentation do
                     '  class B; end',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts namespace class without documentation' do
@@ -107,7 +107,7 @@ describe Rubocop::Cop::Style::Documentation do
                     '  class B; end',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not raise an error for an implicit match conditional' do

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

@@ -6,89 +6,86 @@ describe Rubocop::Cop::Style::DotPosition, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'Leading dots style' do
-    let(:cop_config) { { 'Style' => 'leading' } }
+    let(:cop_config) { { 'EnforcedStyle' => 'leading' } }
 
-    it 'registers an offence for trailing dot in multi-line call' do
+    it 'registers an offense for trailing dot in multi-line call' do
       inspect_source(cop, ['something.',
                            '  method_name'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.highlights).to eq(['.'])
-      expect(cop.config_to_allow_offences).to eq('Style' => 'trailing')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'trailing')
     end
 
-    it 'registers an offence for correct + opposite' do
+    it 'registers an offense for correct + opposite' do
       inspect_source(cop, ['something',
                            '  .method_name',
                            'something.',
                            '  method_name'])
-      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 leading do in multi-line method call' do
       inspect_source(cop, ['something',
                            '  .method_name'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call with no dots' do
       inspect_source(cop, ['puts something'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call without a method name' do
       inspect_source(cop, ['l.', '(1)'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it 'does not err on method call on same line' do
       inspect_source(cop, ['something.method_name'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   context 'Trailing dots style' do
-    let(:cop_config) { { 'Style' => 'trailing' } }
+    let(:cop_config) { { 'EnforcedStyle' => 'trailing' } }
 
-    it 'registers an offence for leading dot in multi-line call' do
+    it 'registers an offense for leading dot in multi-line call' do
       inspect_source(cop, ['something',
                            '  .method_name'])
       expect(cop.messages)
         .to eq(['Place the . on the previous line, together with the method ' \
                 'call receiver.'])
       expect(cop.highlights).to eq(['.'])
-      expect(cop.config_to_allow_offences).to eq('Style' => 'leading')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'leading')
     end
 
     it 'accepts trailing dot in multi-line method call' do
       inspect_source(cop, ['something.',
                            '  method_name'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call with no dots' do
       inspect_source(cop, ['puts something'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call without a method name' do
       inspect_source(cop, ['l', '.(1)'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it 'does not err on method call on same line' do
       inspect_source(cop, ['something.method_name'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
-  end
-
-  context 'Unknown style' do
-    let(:cop_config) { { 'Style' => 'test' } }
 
-    it 'raises an exception' do
-      expect do
-        inspect_source(cop, ['something.top'])
-      end.to raise_error(RuntimeError)
+    it 'does not get confused by several lines of chained methods' do
+      inspect_source(cop, ['File.new(something).',
+                           'readlines.map.',
+                           'compact.join("\n")'])
+      expect(cop.offenses).to be_empty
     end
   end
 end