rubocop 0.18.1 → 0.19.0

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

@@ -5,24 +5,24 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::CharacterLiteral do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for character literals' do
+  it 'registers an offense for character literals' do
     inspect_source(cop, ['x = ?x'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for literals like \n' do
+  it 'registers an offense for literals like \n' do
     inspect_source(cop, ['x = ?\n'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts literals like ?\C-\M-d' do
     inspect_source(cop, ['x = ?\C-\M-d'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts ? in a %w literal' do
     inspect_source(cop, ['%w{? A}'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it "auto-corrects ?x to 'x'" do

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for underscore in class and module name' do
+  it 'registers an offense for underscore in class and module name' do
     inspect_source(cop,
                    ['class My_Class',
                     'end',
@@ -13,7 +13,7 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'module My_Module',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 
   it 'is not fooled by qualified names' do
@@ -24,7 +24,7 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'module My_Module::Ala',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(2)
+    expect(cop.offenses.size).to eq(2)
   end
 
   it 'accepts CamelCase names' do
@@ -35,6 +35,6 @@ describe Rubocop::Cop::Style::ClassAndModuleCamelCase do
                     'module Mine',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -0,0 +1,129 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::ClassAndModuleChildren, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'nested style' do
+    let(:cop_config) do
+      {
+        'EnforcedStyle' => 'nested'
+      }
+    end
+
+    it 'registers an offense for not nested classes' do
+      inspect_source(cop, ['class FooClass::BarClass', 'end'])
+
+      expect(cop.offenses.size).to eq 1
+      expect(cop.messages).to eq [
+        'Use nested module/class definitions instead of compact style.'
+      ]
+      expect(cop.highlights).to eq ['FooClass::BarClass']
+    end
+
+    it 'registers an offense for not nested modules' do
+      inspect_source(cop, ['module FooModule::BarModule', 'end'])
+
+      expect(cop.offenses.size).to eq 1
+      expect(cop.messages).to eq [
+        'Use nested module/class definitions instead of compact style.'
+      ]
+      expect(cop.highlights).to eq ['FooModule::BarModule']
+    end
+
+    it 'accepts nested children' do
+      inspect_source(cop,
+                     ['class FooClass',
+                      '  class BarClass',
+                      '  end',
+                      'end',
+                      '',
+                      'module FooModule',
+                      '  module BarModule',
+                      '  end',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts :: in parent class on inheritance' do
+      inspect_source(cop,
+                     ['class FooClass',
+                      '  class BarClass',
+                      '  end',
+                      'end',
+                      '',
+                      'class BazClass < FooClass::BarClass',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'compact style' do
+    let(:cop_config) do
+      {
+        'EnforcedStyle' => 'compact'
+      }
+    end
+
+    it 'registers a offense for classes with nested children' do
+      inspect_source(cop,
+                     ['class FooClass',
+                      '  class BarClass',
+                      '  end',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq 1
+      expect(cop.messages).to eq [
+        'Use compact module/class definition instead of nested style.'
+      ]
+      expect(cop.highlights).to eq ['FooClass']
+    end
+
+    it 'registers a offense for modules with nested children' do
+      inspect_source(cop,
+                     ['module FooModule',
+                      '  module BarModule',
+                      '  end',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq 1
+      expect(cop.messages).to eq [
+        'Use compact module/class definition instead of nested style.'
+      ]
+      expect(cop.highlights).to eq ['FooModule']
+    end
+
+    it 'accepts compact style for classes / modules' do
+      inspect_source(cop,
+                     ['class FooClass::BarClass',
+                      'end',
+                      '',
+                      'module FooClass::BarModule',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts nesting for classes / modules with more than one child' do
+      inspect_source(cop,
+                     ['class FooClass',
+                      '  class BarClass',
+                      '  end',
+                      '  class BazClass',
+                      '  end',
+                      'end',
+                      '',
+                      'module FooModule',
+                      '  module BarModule',
+                      '  end',
+                      '  class BazModule',
+                      '  end',
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+  end
+end

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

@@ -15,9 +15,9 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                          '  a = 5',
                          '  a = 6',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Class definition is too long. [6/5]'])
-    expect(cop.config_to_allow_offences).to eq('Max' => 6)
+    expect(cop.config_to_allow_offenses).to eq('Max' => 6)
   end
 
   it 'accepts a class with 5 lines' do
@@ -28,7 +28,7 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                          '  a = 4',
                          '  a = 5',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a class with less than 5 lines' do
@@ -38,7 +38,7 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                          '  a = 3',
                          '  a = 4',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not count blank lines' do
@@ -51,13 +51,13 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                          '',
                          '  a = 7',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts empty classes' do
     inspect_source(cop, ['class Test',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when a class has inner classes' do
@@ -83,7 +83,7 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                            '  a = 4',
                            '  a = 5',
                            'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'rejects a class with 6 lines that belong to the class directly' do
@@ -109,7 +109,7 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                            '  a = 5',
                            '  a = 6',
                            'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
@@ -125,7 +125,7 @@ describe Rubocop::Cop::Style::ClassLength, :config do
                            '  a = 5',
                            '  a = 6',
                            'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 end

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

@@ -5,41 +5,41 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::ClassMethods do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for methods using a class name' do
+  it 'registers an offense for methods using a class name' do
     inspect_source(cop,
                    ['class Test',
                     '  def Test.some_method',
                     '    do_something',
                     '  end',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for methods using a module name' do
+  it 'registers an offense for methods using a module name' do
     inspect_source(cop,
                    ['module Test',
                     '  def Test.some_method',
                     '    do_something',
                     '  end',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for methods using self' do
+  it 'does not register an offense for methods using self' do
     inspect_source(cop,
                    ['module Test',
                     '  def self.some_method',
                     '    do_something',
                     '  end',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence outside class/module bodies' do
+  it 'does not register an offense outside class/module bodies' do
     inspect_source(cop,
                    ['def self.some_method',
                     '  do_something',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,15 +5,15 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::ClassVars do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for class variable declaration' do
+  it 'registers an offense for class variable declaration' do
     inspect_source(cop, ['class TestClass; @@test = 10; end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Replace class var @@test with a class instance var.'])
   end
 
-  it 'does not register an offence for class variable usage' do
+  it 'does not register an offense for class variable usage' do
     inspect_source(cop, ['@@test.test(20)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -16,28 +16,28 @@ describe Rubocop::Cop::Style::CollectionMethods, :config do
   let(:cop_config) { cop_config }
 
   cop_config['PreferredMethods'].each do |method, preferred_method|
-    it "registers an offence for #{method} with block" do
+    it "registers an offense for #{method} with block" do
       inspect_source(cop, ["[1, 2, 3].#{method} { |e| e + 1 }"])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Prefer #{preferred_method} over #{method}."])
     end
 
-    it "registers an offence for #{method} with proc param" do
+    it "registers an offense for #{method} with proc param" do
       inspect_source(cop, ["[1, 2, 3].#{method}(&:test)"])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Prefer #{preferred_method} over #{method}."])
     end
 
     it "accepts #{method} with more than 1 param" do
       inspect_source(cop, ["[1, 2, 3].#{method}(other, &:test)"])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it "accepts #{method} without a block" do
       inspect_source(cop, ["[1, 2, 3].#{method}"])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects to preferred method' do

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

@@ -5,52 +5,52 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::ColonMethodCall do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for instance method call' do
+  it 'registers an offense for instance method call' do
     inspect_source(cop,
                    ['test::method_name'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for instance method call with arg' do
+  it 'registers an offense for instance method call with arg' do
     inspect_source(cop,
                    ['test::method_name(arg)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for class method call' do
+  it 'registers an offense for class method call' do
     inspect_source(cop,
                    ['Class::method_name'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for class method call with arg' do
+  it 'registers an offense for class method call with arg' do
     inspect_source(cop,
                    ['Class::method_name(arg, arg2)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'does not register an offence for constant access' do
+  it 'does not register an offense for constant access' do
     inspect_source(cop,
                    ['Tip::Top::SOME_CONST'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for nested class' do
+  it 'does not register an offense for nested class' do
     inspect_source(cop,
                    ['Tip::Top.some_method'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for op methods' do
+  it 'does not register an offense for op methods' do
     inspect_source(cop,
                    ['Tip::Top.some_method[3]'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence when for constructor methods' do
+  it 'does not register an offense when for constructor methods' do
     inspect_source(cop,
                    ['Tip::Top(some_arg)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects "::" with "."' do

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

@@ -8,17 +8,17 @@ describe Rubocop::Cop::Style::CommentAnnotation, :config do
     { 'Keywords' => %w(TODO FIXME OPTIMIZE HACK REVIEW) }
   end
 
-  it 'registers an offence for a missing colon' do
+  it 'registers an offense for a missing colon' do
     inspect_source(cop, ['# TODO make better'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   context 'with configured keyword' do
     let(:cop_config) { { 'Keywords' => %w(ISSUE) } }
 
-    it 'registers an offence for a missing colon after the word' do
+    it 'registers an offense for a missing colon after the word' do
       inspect_source(cop, ['# ISSUE wrong order'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
@@ -28,7 +28,7 @@ describe Rubocop::Cop::Style::CommentAnnotation, :config do
 
     it 'marks the annotation keyword' do
       inspect_source(cop, ['# TODO:make better'])
-      formatter.report_file('t', cop.offences)
+      formatter.report_file('t', cop.offenses)
       expect(output.string).to eq(["t:1:3: C: #{described_class::MSG}",
                                    '# TODO:make better',
                                    '  ^^^^^',
@@ -36,41 +36,41 @@ describe Rubocop::Cop::Style::CommentAnnotation, :config do
     end
   end
 
-  it 'registers an offence for lower case' do
+  it 'registers an offense for lower case' do
     inspect_source(cop, ['# fixme: does not work'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for capitalized annotation keyword' do
+  it 'registers an offense for capitalized annotation keyword' do
     inspect_source(cop, ['# Optimize: does not work'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for upper case with colon but no note' do
+  it 'registers an offense for upper case with colon but no note' do
     inspect_source(cop, ['# HACK:'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts upper case keyword with colon, space and note' do
     inspect_source(cop, ['# REVIEW: not sure about this'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts upper case keyword alone' do
     inspect_source(cop, ['# OPTIMIZE'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a comment that is obviously a code example' do
     inspect_source(cop, ['# Todo.destroy(1)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a keyword that is just the beginning of a sentence' do
     inspect_source(cop,
                    ["# Optimize if you want. I wouldn't recommend it.",
                     '# Hack is a fun game.'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when a keyword is not in the configuration' do
@@ -80,7 +80,7 @@ describe Rubocop::Cop::Style::CommentAnnotation, :config do
 
     it 'accepts the word without colon' do
       inspect_source(cop, ['# TODO make better'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end