rubocop 0.19.1 → 0.20.0

data/spec/rubocop/cop/offense_spec.rb

@@ -61,7 +61,7 @@ describe Rubocop::Cop::Offense do
   describe '#severity_level' do
     subject(:severity_level) do
       described_class.new(severity, location, 'message', 'CopName')
-        .severity_level
+        .severity.level
     end
 
     context 'when severity is :refactor' do

data/spec/rubocop/cop/rails/read_write_attribute_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Rails::ReadWriteAttribute do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for read_attribute' do
+    inspect_source(cop, 'res = read_attribute(:test)')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['read_attribute'])
+  end
+
+  it 'registers an offense for write_attribute' do
+    inspect_source(cop, 'write_attribute(:test, val)')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['write_attribute'])
+  end
+end

data/spec/rubocop/cop/severity_spec.rb

@@ -0,0 +1,113 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Severity do
+  let(:refactor) { described_class.new(:refactor) }
+  let(:convention) { described_class.new(:convention) }
+  let(:warning) { described_class.new(:warning) }
+  let(:error) { described_class.new(:error) }
+  let(:fatal) { described_class.new(:fatal) }
+
+  it 'has a few required attributes' do
+    expect(convention.name).to eq(:convention)
+  end
+
+  it 'overrides #to_s' do
+    expect(convention.to_s).to eq('convention')
+  end
+
+  it 'redefines == to compare severities' do
+    expect(convention).to eq(:convention)
+    expect(convention).to eq(described_class.new(:convention))
+    expect(convention).not_to eq(:warning)
+  end
+
+  it 'is frozen' do
+    expect(convention).to be_frozen
+  end
+
+  describe '#code' do
+    describe 'refactor' do
+      it { expect(refactor.code).to eq('R') }
+    end
+
+    describe 'convention' do
+      it { expect(convention.code).to eq('C') }
+    end
+
+    describe 'warning' do
+      it { expect(warning.code).to eq('W') }
+    end
+
+    describe 'error' do
+      it { expect(error.code).to eq('E') }
+    end
+
+    describe 'fatal' do
+      it { expect(fatal.code).to eq('F') }
+    end
+  end
+
+  describe '#level' do
+    describe 'refactor' do
+      it { expect(refactor.level).to eq(1) }
+    end
+
+    describe 'convention' do
+      it { expect(convention.level).to eq(2) }
+    end
+
+    describe 'warning' do
+      it { expect(warning.level).to eq(3) }
+    end
+
+    describe 'error' do
+      it { expect(error.level).to eq(4) }
+    end
+
+    describe 'fatal' do
+      it { expect(fatal.level).to eq(5) }
+    end
+  end
+
+  describe 'constructs from code' do
+    describe 'R' do
+      it { expect(Rubocop::Cop::Severity.new('R')).to eq(refactor) }
+    end
+
+    describe 'C' do
+      it { expect(Rubocop::Cop::Severity.new('C')).to eq(convention) }
+    end
+
+    describe 'W' do
+      it { expect(Rubocop::Cop::Severity.new('W')).to eq(warning) }
+    end
+
+    describe 'E' do
+      it { expect(Rubocop::Cop::Severity.new('E')).to eq(error) }
+    end
+
+    describe 'F' do
+      it { expect(Rubocop::Cop::Severity.new('F')).to eq(fatal) }
+    end
+  end
+
+  describe 'Comparable' do
+    describe 'refactor' do
+      it { expect(refactor).to be < convention }
+    end
+
+    describe 'convention' do
+      it { expect(convention).to be < warning }
+    end
+
+    describe 'warning' do
+      it { expect(warning).to be < error }
+    end
+
+    describe 'error' do
+      it { expect(error).to be < fatal }
+    end
+  end
+end

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

@@ -18,7 +18,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like private.'])
+        .to eq(['Indent access modifiers like `private`.'])
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'outdent')
     end
 
@@ -31,7 +31,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '  def test; end',
                       'end'])
       expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Indent access modifiers like private.'])
+      expect(cop.messages).to eq(['Indent access modifiers like `private`.'])
       # Not aligned according to `indent` or `outdent` style:
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
@@ -47,7 +47,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '  def test; end',
                       'end'])
       expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Indent access modifiers like private.'])
+      expect(cop.messages).to eq(['Indent access modifiers like `private`.'])
       # No EnforcedStyle can allow both aligments:
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
@@ -63,7 +63,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '  def test; end',
                       'end'])
       expect(cop.offenses.size).to eq(1)
-      expect(cop.messages).to eq(['Indent access modifiers like public.'])
+      expect(cop.messages).to eq(['Indent access modifiers like `public`.'])
       # No EnforcedStyle can allow both aligments:
       expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
@@ -78,7 +78,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like private.'])
+        .to eq(['Indent access modifiers like `private`.'])
     end
 
     it 'registers an offense for misaligned private in class ' \
@@ -92,7 +92,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like private.'])
+        .to eq(['Indent access modifiers like `private`.'])
     end
 
     it 'registers an offense for misaligned private in module ' \
@@ -106,7 +106,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like private.'])
+        .to eq(['Indent access modifiers like `private`.'])
     end
 
     it 'registers an offense for misaligned protected' do
@@ -119,7 +119,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like protected.'])
+        .to eq(['Indent access modifiers like `protected`.'])
     end
 
     it 'accepts properly indented private' do
@@ -168,7 +168,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       'end'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Indent access modifiers like private.'])
+        .to eq(['Indent access modifiers like `private`.'])
     end
 
     it 'auto-corrects incorrectly indented access modifiers' do
@@ -193,7 +193,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
 
   context 'when EnforcedStyle is set to outdent' do
     let(:cop_config) { { 'EnforcedStyle' => 'outdent' } }
-    let(:indent_msg) { 'Outdent access modifiers like private.' }
+    let(:indent_msg) { 'Outdent access modifiers like `private`.' }
 
     it 'registers offense for private indented to method depth in a class' do
       inspect_source(cop,

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

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::Alias do
                    ['alias :ala :bala'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Use alias_method instead of alias.'])
+      .to eq(['Use `alias_method` instead of `alias`.'])
   end
 
   it 'autocorrects alias with symbol args' do
@@ -23,7 +23,7 @@ describe Rubocop::Cop::Style::Alias do
                    ['alias ala bala'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Use alias_method instead of alias.'])
+      .to eq(['Use `alias_method` instead of `alias`.'])
   end
 
   it 'autocorrects alias with bareword args' do

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

@@ -9,14 +9,14 @@ describe Rubocop::Cop::Style::AndOr do
     inspect_source(cop,
                    ['test if a or b'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use || instead of or.'])
+    expect(cop.messages).to eq(['Use `||` instead of `or`.'])
   end
 
   it 'registers an offense for AND' do
     inspect_source(cop,
                    ['test if a and b'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages).to eq(['Use && instead of and.'])
+    expect(cop.messages).to eq(['Use `&&` instead of `and`.'])
   end
 
   it 'accepts ||' do

data/spec/rubocop/cop/style/{favor_join_spec.rb → array_join_spec.rb}

@@ -2,15 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::FavorJoin do
+describe Rubocop::Cop::Style::ArrayJoin do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for an array followed by string' do
     inspect_source(cop,
                    ['%w(one two three) * ", "'])
     expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['Favor Array#join over Array#*.'])
   end
 
   it 'does not register an offense for numbers' do

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

@@ -26,7 +26,7 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
     expect_nesting_offenses(source, [3])
   end
 
-  it 'registers a single offense for `Max + 2` levels of `if` nesting' do
+  it 'registers one offense for `Max + 2` levels of `if` nesting' do
     source = ['if a',
               '  if b',
               '    if c',
@@ -36,7 +36,7 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
               '    end',
               '  end',
               'end']
-    expect_nesting_offenses(source, [3])
+    expect_nesting_offenses(source, [3], 4)
   end
 
   it 'registers 2 offenses' do
@@ -144,13 +144,13 @@ describe Rubocop::Cop::Style::BlockNesting, :config do
     expect_nesting_offenses(source, [])
   end
 
-  def expect_nesting_offenses(source, lines, used_nesting_level = 3)
+  def expect_nesting_offenses(source, lines, max_to_allow = 3)
     inspect_source(cop, source)
     expect(cop.offenses.map(&:line)).to eq(lines)
     expect(cop.messages).to eq(
       ['Avoid more than 2 levels of block nesting.'] * lines.length)
     if cop.offenses.size > 0
-      expect(cop.config_to_allow_offenses['Max']).to eq(used_nesting_level)
+      expect(cop.config_to_allow_offenses['Max']).to eq(max_to_allow)
     end
   end
 end

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

@@ -8,5 +8,6 @@ describe Rubocop::Cop::Style::CaseEquality do
   it 'registers an offense for ===' do
     inspect_source(cop, ['Array === var'])
     expect(cop.offenses.size).to eq(1)
+    expect(cop.highlights).to eq(['==='])
   end
 end

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

@@ -36,7 +36,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "  'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.messages).to eq(['Indent `when` as deep as `case`.'])
           expect(cop.config_to_allow_offenses).to eq('IndentWhenRelativeTo' =>
                                                      'end')
         end
@@ -49,7 +49,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "    'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.messages).to eq(['Indent `when` as deep as `case`.'])
           expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
 
@@ -67,7 +67,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "  'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when as deep as case.'])
+          expect(cop.messages).to eq(['Indent `when` as deep as `case`.'])
           expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
       end
@@ -81,7 +81,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                   '        end',
                   'end']
         inspect_source(cop, source)
-        expect(cop.messages).to eq(['Indent when as deep as case.'] * 2)
+        expect(cop.messages).to eq(['Indent `when` as deep as `case`.'] * 2)
       end
 
       it "accepts a when clause that's equally indented with case" do
@@ -174,7 +174,8 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "           'output2'",
                     '         end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when one step more than case.'])
+          expect(cop.messages)
+            .to eq(['Indent `when` one step more than `case`.'])
         end
       end
 
@@ -206,7 +207,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                   '']
         inspect_source(cop, source)
         expect(cop.messages)
-          .to eq(['Indent when one step more than case.'] * 5)
+          .to eq(['Indent `when` one step more than `case`.'] * 5)
       end
     end
   end
@@ -237,7 +238,7 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "    'output2'",
                     'end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when as deep as end.'])
+          expect(cop.messages).to eq(['Indent `when` as deep as `end`.'])
         end
       end
     end
@@ -267,7 +268,8 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "           'output2'",
                     '         end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when one step more than end.'])
+          expect(cop.messages)
+            .to eq(['Indent `when` one step more than `end`.'])
           expect(cop.config_to_allow_offenses).to eq('IndentWhenRelativeTo' =>
                                                      'case')
         end
@@ -280,7 +282,8 @@ describe Rubocop::Cop::Style::CaseIndentation do
                     "         'output2'",
                     '       end']
           inspect_source(cop, source)
-          expect(cop.messages).to eq(['Indent when one step more than end.'])
+          expect(cop.messages)
+            .to eq(['Indent `when` one step more than `end`.'])
           expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
         end
       end

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

@@ -13,6 +13,9 @@ describe Rubocop::Cop::Style::ClassMethods do
                     '  end',
                     'end'])
     expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use `self.some_method` instead of `Test.some_method`.'])
+    expect(cop.highlights).to eq(['Test'])
   end
 
   it 'registers an offense for methods using a module name' do
@@ -23,6 +26,9 @@ describe Rubocop::Cop::Style::ClassMethods do
                     '  end',
                     'end'])
     expect(cop.offenses.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use `self.some_method` instead of `Test.some_method`.'])
+    expect(cop.highlights).to eq(['Test'])
   end
 
   it 'does not register an offense for methods using self' do
@@ -42,4 +48,21 @@ describe Rubocop::Cop::Style::ClassMethods do
                     'end'])
     expect(cop.offenses).to be_empty
   end
+
+  it 'autocorrects class name to self' do
+    src = ['class Test',
+           '  def Test.some_method',
+           '    do_something',
+           '  end',
+           'end']
+
+    correct_source = ['class Test',
+                      '  def self.some_method',
+                      '    do_something',
+                      '  end',
+                      'end'].join("\n")
+
+    new_source = autocorrect_source(cop, src)
+    expect(new_source).to eq(correct_source)
+  end
 end

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

@@ -20,14 +20,14 @@ describe Rubocop::Cop::Style::CollectionMethods, :config do
       inspect_source(cop, ["[1, 2, 3].#{method} { |e| e + 1 }"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Prefer #{preferred_method} over #{method}."])
+        .to eq(["Prefer `#{preferred_method}` over `#{method}`."])
     end
 
     it "registers an offense for #{method} with proc param" do
       inspect_source(cop, ["[1, 2, 3].#{method}(&:test)"])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Prefer #{preferred_method} over #{method}."])
+        .to eq(["Prefer `#{preferred_method}` over `#{method}`."])
     end
 
     it "accepts #{method} with more than 1 param" do