rubocop 0.13.1 → 0.14.0

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

@@ -2,18 +2,12 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Rails
-      describe HasAndBelongsToMany do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Rails::HasAndBelongsToMany do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for has_and_belongs_to_many' do
-          inspect_source(cop,
-                         ['has_and_belongs_to_many :groups'])
-          expect(cop.offences.size).to eq(1)
-        end
-      end
-    end
+  it 'registers an offence for has_and_belongs_to_many' do
+    inspect_source(cop,
+                   ['has_and_belongs_to_many :groups'])
+    expect(cop.offences.size).to eq(1)
   end
 end

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

@@ -2,18 +2,12 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Rails
-      describe ReadAttribute do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Rails::ReadAttribute do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for read_attribute' do
-          inspect_source(cop,
-                         ['res = read_attribute(:test)'])
-          expect(cop.offences.size).to eq(1)
-        end
-      end
-    end
+  it 'registers an offence for read_attribute' do
+    inspect_source(cop,
+                   ['res = read_attribute(:test)'])
+    expect(cop.offences.size).to eq(1)
   end
 end

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

@@ -2,26 +2,20 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Rails
-      describe Validation do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Rails::Validation do
+  subject(:cop) { described_class.new }
 
-        Validation::BLACKLIST.each do |validation|
-          it "registers an offence for #{validation}" do
-            inspect_source(cop,
-                           ["#{validation} :name"])
-            expect(cop.offences.size).to eq(1)
-          end
-        end
-
-        it 'accepts sexy validations' do
-          inspect_source(cop,
-                         ['validates :name'])
-          expect(cop.offences).to be_empty
-        end
-      end
+  described_class::BLACKLIST.each do |validation|
+    it "registers an offence for #{validation}" do
+      inspect_source(cop,
+                     ["#{validation} :name"])
+      expect(cop.offences.size).to eq(1)
     end
   end
+
+  it 'accepts sexy validations' do
+    inspect_source(cop,
+                   ['validates :name'])
+    expect(cop.offences).to be_empty
+  end
 end

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

@@ -2,169 +2,163 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe AccessControl do
-        subject(:a) { AccessControl.new }
+describe Rubocop::Cop::Style::AccessControl do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for misaligned private' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          'private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'registers an offence for misaligned private' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    'private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'registers an offence for misaligned private in module' do
-          inspect_source(a,
-                         ['module Test',
-                          '',
-                          'private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'registers an offence for misaligned private in module' do
+    inspect_source(cop,
+                   ['module Test',
+                    '',
+                    'private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'registers an offence for misaligned private in singleton class' do
-          inspect_source(a,
-                         ['class << self',
-                          '',
-                          'private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'registers an offence for misaligned private in singleton class' do
+    inspect_source(cop,
+                   ['class << self',
+                    '',
+                    'private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'registers an offence for misaligned private in class ' +
-           'defined with Class.new' do
-          inspect_source(a,
-                         ['Test = Class.new do',
-                          '',
-                          'private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'registers an offence for misaligned private in class ' +
+     'defined with Class.new' do
+    inspect_source(cop,
+                   ['Test = Class.new do',
+                    '',
+                    'private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'registers an offence for misaligned private in module ' +
-           'defined with Module.new' do
-          inspect_source(a,
-                         ['Test = Module.new do',
-                          '',
-                          'private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'registers an offence for misaligned private in module ' +
+     'defined with Module.new' do
+    inspect_source(cop,
+                   ['Test = Module.new do',
+                    '',
+                    'private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'registers an offence for misaligned protected' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          'protected',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'protected')])
-        end
+  it 'registers an offence for misaligned protected' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    'protected',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent protected as deep as method definitions.'])
+  end
 
-        it 'accepts properly indented private' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          '  private',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences).to be_empty
-        end
+  it 'accepts properly indented private' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    '  private',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'accepts properly indented protected' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          '  protected',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences).to be_empty
-        end
+  it 'accepts properly indented protected' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    '  protected',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'handles properly nested classes' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          '  class Nested',
-                          '',
-                          '  private',
-                          '',
-                          '    def a; end',
-                          '  end',
-                          '',
-                          '  protected',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::INDENT_MSG, 'private')])
-        end
+  it 'handles properly nested classes' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    '  class Nested',
+                    '',
+                    '  private',
+                    '',
+                    '    def a; end',
+                    '  end',
+                    '',
+                    '  protected',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Indent private as deep as method definitions.'])
+  end
 
-        it 'requires blank line before private/protected' do
-          inspect_source(a,
-                         ['class Test',
-                          '  protected',
-                          '',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::BLANK_MSG, 'protected')])
-        end
+  it 'requires blank line before private/protected' do
+    inspect_source(cop,
+                   ['class Test',
+                    '  protected',
+                    '',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Keep a blank line before and after protected.'])
+  end
 
-        it 'requires blank line after private/protected' do
-          inspect_source(a,
-                         ['class Test',
-                          '',
-                          '  protected',
-                          '  def test; end',
-                          'end'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([format(AccessControl::BLANK_MSG, 'protected')])
-        end
+  it 'requires blank line after private/protected' do
+    inspect_source(cop,
+                   ['class Test',
+                    '',
+                    '  protected',
+                    '  def test; end',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Keep a blank line before and after protected.'])
+  end
 
-        it 'recognizes blank lines with DOS style line endings' do
-          inspect_source(a,
-                         ["class Test\r",
-                          "\r",
-                          "  protected\r",
-                          "\r",
-                          "  def test; end\r",
-                          "end\r"])
-          expect(a.offences.size).to eq(0)
-        end
-      end
-    end
+  it 'recognizes blank lines with DOS style line endings' do
+    inspect_source(cop,
+                   ["class Test\r",
+                    "\r",
+                    "  protected\r",
+                    "\r",
+                    "  def test; end\r",
+                    "end\r"])
+    expect(cop.offences.size).to eq(0)
   end
 end

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

@@ -2,46 +2,40 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe Alias do
-        subject(:a) { Alias.new }
+describe Rubocop::Cop::Style::Alias do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for alias with symbol args' do
-          inspect_source(a,
-                         ['alias :ala :bala'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([Alias::MSG])
-        end
+  it 'registers an offence for alias with symbol args' do
+    inspect_source(cop,
+                   ['alias :ala :bala'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use alias_method instead of alias.'])
+  end
 
-        it 'registers an offence for alias with bareword args' do
-          inspect_source(a,
-                         ['alias ala bala'])
-          expect(a.offences.size).to eq(1)
-          expect(a.messages)
-            .to eq([Alias::MSG])
-        end
+  it 'registers an offence for alias with bareword args' do
+    inspect_source(cop,
+                   ['alias ala bala'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use alias_method instead of alias.'])
+  end
 
-        it 'does not register an offence for alias_method' do
-          inspect_source(a,
-                         ['alias_method :ala, :bala'])
-          expect(a.offences).to be_empty
-        end
+  it 'does not register an offence for alias_method' do
+    inspect_source(cop,
+                   ['alias_method :ala, :bala'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for :alias' do
-          inspect_source(a,
-                         ['[:alias, :ala, :bala]'])
-          expect(a.offences).to be_empty
-        end
+  it 'does not register an offence for :alias' do
+    inspect_source(cop,
+                   ['[:alias, :ala, :bala]'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for alias with gvars' do
-          inspect_source(a,
-                         ['alias $ala $bala'])
-          expect(a.offences).to be_empty
-        end
-      end
-    end
+  it 'does not register an offence for alias with gvars' do
+    inspect_source(cop,
+                   ['alias $ala $bala'])
+    expect(cop.offences).to be_empty
   end
 end