rubocop 0.13.1 → 0.14.0

data/spec/rubocop/config_spec.rb

@@ -7,13 +7,13 @@ DEFAULT_CONFIG = Rubocop::Config.load_file('config/default.yml')
 describe Rubocop::Config do
   include FileHelper
 
-  subject(:configuration) { Rubocop::Config.new(hash, loaded_path) }
+  subject(:configuration) { described_class.new(hash, loaded_path) }
   let(:hash) { {} }
   let(:loaded_path) { 'example/.rubocop.yml' }
 
   describe '.configuration_file_for', :isolated_environment do
     subject(:configuration_file_for) do
-      Rubocop::Config.configuration_file_for(dir_path)
+      described_class.configuration_file_for(dir_path)
     end
 
     context 'when no config file exists in ancestor directories' do
@@ -65,7 +65,7 @@ describe Rubocop::Config do
 
   describe '.configuration_from_file', :isolated_environment do
     subject(:configuration_from_file) do
-      Rubocop::Config.configuration_from_file(file_path)
+      described_class.configuration_from_file(file_path)
     end
 
     context 'with any config file' do
@@ -233,7 +233,7 @@ describe Rubocop::Config do
 
   describe '.load_file', :isolated_environment do
     subject(:load_file) do
-      Rubocop::Config.load_file(configuration_path)
+      described_class.load_file(configuration_path)
     end
 
     let(:configuration_path) { '.rubocop.yml' }
@@ -251,7 +251,7 @@ describe Rubocop::Config do
   end
 
   describe '.merge' do
-    subject(:merge) { Rubocop::Config.merge(base, derived) }
+    subject(:merge) { described_class.merge(base, derived) }
 
     let(:base) do
       {
@@ -281,7 +281,7 @@ describe Rubocop::Config do
     after(:each) { $stdout = STDOUT }
 
     subject(:configuration) do
-      Rubocop::Config.load_file(configuration_path)
+      described_class.load_file(configuration_path)
     end
 
     let(:configuration_path) { '.rubocop.yml' }
@@ -296,7 +296,7 @@ describe Rubocop::Config do
       end
 
       it 'raises validation error' do
-        e = Rubocop::Config::ValidationError
+        e = described_class::ValidationError
         expect { configuration.validate }.to raise_error(e) do |error|
           expect(error.message).to start_with('unrecognized cop LyneLenth')
         end
@@ -313,7 +313,7 @@ describe Rubocop::Config do
       end
 
       it 'raises validation error' do
-        e = Rubocop::Config::ValidationError
+        e = described_class::ValidationError
         expect { configuration.validate }.to raise_error(e) do |error|
           expect(error.message).to
             start_with('unrecognized parameter LineLength:Min')
@@ -376,7 +376,7 @@ describe Rubocop::Config do
 
   describe '#patterns_to_include' do
     subject(:patterns_to_include) do
-      configuration = Rubocop::Config.new(hash, loaded_path)
+      configuration = described_class.new(hash, loaded_path)
       configuration.patterns_to_include
     end
 
@@ -403,7 +403,7 @@ describe Rubocop::Config do
 
   describe '#patterns_to_exclude' do
     subject(:patterns_to_exclude) do
-      configuration = Rubocop::Config.new(hash, loaded_path)
+      configuration = described_class.new(hash, loaded_path)
       configuration.patterns_to_exclude
     end
 
@@ -427,8 +427,8 @@ describe Rubocop::Config do
 
   describe 'configuration for SymbolArray', :isolated_environment do
     let(:config) do
-      config_path = Rubocop::Config.configuration_file_for('.')
-      Rubocop::Config.configuration_from_file(config_path)
+      config_path = described_class.configuration_file_for('.')
+      described_class.configuration_from_file(config_path)
     end
 
     context 'when no config file exists for the target file' do
@@ -461,7 +461,7 @@ describe Rubocop::Config do
   describe 'configuration for SymbolName' do
     describe 'AllowCamelCase' do
       it 'is enabled by default' do
-        default_config = Rubocop::Config.default_configuration
+        default_config = described_class.default_configuration
         symbol_name_config = default_config.for_cop('SymbolName')
         expect(symbol_name_config['AllowCamelCase']).to be_true
       end

data/spec/rubocop/config_store_spec.rb

@@ -2,49 +2,50 @@
 
 require 'spec_helper'
 
-module Rubocop
-  describe ConfigStore do
-    subject(:config_store) { ConfigStore.new }
+describe Rubocop::ConfigStore do
+  subject(:config_store) { described_class.new }
 
-    before do
-      Config.stub(:configuration_file_for) do |arg|
-        # File tree:
-        # file1
-        # dir/.rubocop.yml
-        # dir/file2
-        # dir/subdir/file3
-        (arg =~ /dir/ ? 'dir' : '.') + '/.rubocop.yml'
-      end
-      Config.stub(:configuration_from_file) { |arg| arg }
-      Config.stub(:load_file) { |arg| "#{arg} loaded" }
-      Config.stub(:merge_with_default) { |config, file| "merged #{config}" }
+  before do
+    Rubocop::Config.stub(:configuration_file_for) do |arg|
+      # File tree:
+      # file1
+      # dir/.rubocop.yml
+      # dir/file2
+      # dir/subdir/file3
+      (arg =~ /dir/ ? 'dir' : '.') + '/.rubocop.yml'
+    end
+    Rubocop::Config.stub(:configuration_from_file) { |arg| arg }
+    Rubocop::Config.stub(:load_file) { |arg| "#{arg} loaded" }
+    Rubocop::Config.stub(:merge_with_default) do |config, file|
+      "merged #{config}"
     end
+  end
 
-    describe '.for' do
-      it 'always uses config specified in command line' do
-        config_store.set_options_config(:options_config)
-        expect(config_store.for('file1')).to eq('merged options_config loaded')
-      end
+  describe '.for' do
+    it 'always uses config specified in command line' do
+      config_store.set_options_config(:options_config)
+      expect(config_store.for('file1')).to eq('merged options_config loaded')
+    end
 
-      context 'when no config specified in command line' do
-        it 'gets config path and config from cache if available' do
-          Config.should_receive(:configuration_file_for).once.with('dir')
-          Config.should_receive(:configuration_file_for).once.with('dir/' +
-                                                                   'subdir')
-          # The stub returns the same config path for dir and dir/subdir.
-          Config.should_receive(:configuration_from_file).once
-            .with('dir/.rubocop.yml')
+    context 'when no config specified in command line' do
+      it 'gets config path and config from cache if available' do
+        Rubocop::Config.should_receive(:configuration_file_for).once
+          .with('dir')
+        Rubocop::Config.should_receive(:configuration_file_for).once
+          .with('dir/subdir')
+        # The stub returns the same config path for dir and dir/subdir.
+        Rubocop::Config.should_receive(:configuration_from_file).once
+          .with('dir/.rubocop.yml')
 
-          config_store.for('dir/file2')
-          config_store.for('dir/file2')
-          config_store.for('dir/subdir/file3')
-        end
+        config_store.for('dir/file2')
+        config_store.for('dir/file2')
+        config_store.for('dir/subdir/file3')
+      end
 
-        it 'searches for config path if not available in cache' do
-          Config.should_receive(:configuration_file_for).once
-          Config.should_receive(:configuration_from_file).once
-          config_store.for('file1')
-        end
+      it 'searches for config path if not available in cache' do
+        Rubocop::Config.should_receive(:configuration_file_for).once
+        Rubocop::Config.should_receive(:configuration_from_file).once
+        config_store.for('file1')
       end
     end
   end

data/spec/rubocop/cop/commissioner_spec.rb

@@ -3,68 +3,64 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    describe Commissioner do
-      describe '#investigate' do
-        let(:cop) { double(Cop, offences: []).as_null_object }
+describe Rubocop::Cop::Commissioner do
+  describe '#investigate' do
+    let(:cop) { double(Rubocop::Cop, offences: []).as_null_object }
 
-        it 'returns all offences found by the cops' do
-          cop.stub(:offences).and_return([1])
+    it 'returns all offences found by the cops' do
+      cop.stub(:offences).and_return([1])
 
-          commissioner = Commissioner.new([cop])
-          source = []
-          processed_source = parse_source(source)
+      commissioner = described_class.new([cop])
+      source = []
+      processed_source = parse_source(source)
 
-          expect(commissioner.investigate(processed_source)).to eq [1]
-        end
+      expect(commissioner.investigate(processed_source)).to eq [1]
+    end
 
-        it 'traverses the AST and invoke cops specific callbacks' do
-          cop.should_receive(:on_def)
+    it 'traverses the AST and invoke cops specific callbacks' do
+      cop.should_receive(:on_def)
 
-          commissioner = Commissioner.new([cop])
-          source = ['def method', '1', 'end']
-          processed_source = parse_source(source)
+      commissioner = described_class.new([cop])
+      source = ['def method', '1', 'end']
+      processed_source = parse_source(source)
 
-          commissioner.investigate(processed_source)
-        end
+      commissioner.investigate(processed_source)
+    end
 
-        it 'passes the input params to all cops that implement their own #investigate method' do
-          source = []
-          processed_source = parse_source(source)
-          cop.should_receive(:investigate).with(processed_source)
+    it 'passes the input params to all cops that implement their own #investigate method' do
+      source = []
+      processed_source = parse_source(source)
+      cop.should_receive(:investigate).with(processed_source)
 
-          commissioner = Commissioner.new([cop])
+      commissioner = described_class.new([cop])
 
-          commissioner.investigate(processed_source)
-        end
+      commissioner.investigate(processed_source)
+    end
 
-        it 'stores all errors raised by the cops' do
-          cop.stub(:on_def) { raise RuntimeError }
+    it 'stores all errors raised by the cops' do
+      cop.stub(:on_def) { fail RuntimeError }
 
-          commissioner = Commissioner.new([cop])
-          source = ['def method', '1', 'end']
-          processed_source = parse_source(source)
+      commissioner = described_class.new([cop])
+      source = ['def method', '1', 'end']
+      processed_source = parse_source(source)
 
-          commissioner.investigate(processed_source)
+      commissioner.investigate(processed_source)
 
-          expect(commissioner.errors[cop].size).to eq(1)
-          expect(commissioner.errors[cop][0]).to be_instance_of(RuntimeError)
-        end
+      expect(commissioner.errors[cop].size).to eq(1)
+      expect(commissioner.errors[cop][0]).to be_instance_of(RuntimeError)
+    end
 
-        context 'when passed :raise_error option' do
-          it 're-raises the exception received while processing' do
-            cop.stub(:on_def) { raise RuntimeError }
+    context 'when passed :raise_error option' do
+      it 're-raises the exception received while processing' do
+        cop.stub(:on_def) { fail RuntimeError }
 
-            commissioner = Commissioner.new([cop], raise_error: true)
-            source = ['def method', '1', 'end']
-            processed_source = parse_source(source)
+        commissioner = described_class.new([cop], raise_error: true)
+        source = ['def method', '1', 'end']
+        processed_source = parse_source(source)
 
-            expect do
-              commissioner.investigate(processed_source)
-            end.to raise_error(RuntimeError)
-          end
-        end
+        expect do
+          commissioner.investigate(processed_source)
+        end.to raise_error(RuntimeError)
       end
     end
   end

data/spec/rubocop/cop/cop_spec.rb

@@ -2,99 +2,94 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    describe Cop do
-      subject(:cop) { Cop.new }
-      let(:location) do
-        source_buffer = Parser::Source::Buffer.new('test', 1)
-        source_buffer.source = "a\n"
-        Parser::Source::Range.new(source_buffer, 0, 1)
-      end
+describe Rubocop::Cop::Cop do
+  subject(:cop) { described_class.new }
+  let(:location) do
+    source_buffer = Parser::Source::Buffer.new('test', 1)
+    source_buffer.source = "a\n"
+    Parser::Source::Range.new(source_buffer, 0, 1)
+  end
 
-      it 'initially has 0 offences' do
-        expect(cop.offences).to be_empty
-      end
+  it 'initially has 0 offences' do
+    expect(cop.offences).to be_empty
+  end
 
-      it 'keeps track of offences' do
-        cop.convention(nil, location, 'message')
+  it 'keeps track of offences' do
+    cop.convention(nil, location, 'message')
 
-        expect(cop.offences.size).to eq(1)
-      end
+    expect(cop.offences.size).to eq(1)
+  end
 
-      it 'will report registered offences' do
-        cop.convention(nil, location, 'message')
+  it 'will report registered offences' do
+    cop.convention(nil, location, 'message')
 
-        expect(cop.offences).not_to be_empty
-      end
+    expect(cop.offences).not_to be_empty
+  end
 
-      it 'registers offence with its name' do
-        cop = Style::For.new
-        cop.convention(nil, location, 'message')
-        expect(cop.offences.first.cop_name).to eq('For')
-      end
+  it 'registers offence with its name' do
+    cop = Rubocop::Cop::Style::For.new
+    cop.convention(nil, location, 'message')
+    expect(cop.offences.first.cop_name).to eq('For')
+  end
 
-      context 'with no submodule' do
-        subject(:cop) { Cop }
-        it('has right name') { expect(cop.cop_name).to eq('Cop') }
-        it('has right type') { expect(cop.cop_type).to eq(:cop) }
-      end
+  context 'with no submodule' do
+    subject(:cop) { described_class }
+    it('has right name') { expect(cop.cop_name).to eq('Cop') }
+    it('has right type') { expect(cop.cop_type).to eq(:cop) }
+  end
 
-      context 'with style cops' do
-        subject(:cop) { Style::For }
-        it('has right name') { expect(cop.cop_name).to eq('For') }
-        it('has right type') { expect(cop.cop_type).to eq(:style) }
-      end
+  context 'with style cops' do
+    subject(:cop) { Rubocop::Cop::Style::For }
+    it('has right name') { expect(cop.cop_name).to eq('For') }
+    it('has right type') { expect(cop.cop_type).to eq(:style) }
+  end
 
-      context 'with lint cops' do
-        subject(:cop) { Lint::Loop }
-        it('has right name') { expect(cop.cop_name).to eq('Loop') }
-        it('has right type') { expect(cop.cop_type).to eq(:lint) }
-      end
+  context 'with lint cops' do
+    subject(:cop) { Rubocop::Cop::Lint::Loop }
+    it('has right name') { expect(cop.cop_name).to eq('Loop') }
+    it('has right type') { expect(cop.cop_type).to eq(:lint) }
+  end
 
-      context 'with rails cops' do
-        subject(:cop) { Rails::Validation }
-        it('has right name') { expect(cop.cop_name).to eq('Validation') }
-        it('has right type') { expect(cop.cop_type).to eq(:rails) }
-      end
+  context 'with rails cops' do
+    subject(:cop) { Rubocop::Cop::Rails::Validation }
+    it('has right name') { expect(cop.cop_name).to eq('Validation') }
+    it('has right type') { expect(cop.cop_type).to eq(:rails) }
+  end
 
-      describe 'CopStore' do
-        context '#types' do
-          subject { Rubocop::Cop::Cop.all.types }
-          it('has types') { expect(subject.length).not_to eq(0) }
-          it { should include :lint }
-          it do
-            pending 'Rails cops are usually removed after CLI start, ' +
-                    'so CLI spec impacts this one'
-            should include :rails
-          end
-          it { should include :style }
-          it 'contains every value only once' do
-            expect(subject.length).to eq(subject.uniq.length)
-          end
+  describe 'CopStore' do
+    context '#types' do
+      subject { described_class.all.types }
+      it('has types') { expect(subject.length).not_to eq(0) }
+      it { should include :lint }
+      it do
+        pending 'Rails cops are usually removed after CLI start, ' +
+                'so CLI spec impacts this one'
+        should include :rails
+      end
+      it { should include :style }
+      it 'contains every value only once' do
+        expect(subject.length).to eq(subject.uniq.length)
+      end
+    end
+    context '#with_type' do
+      let(:types) { described_class.all.types }
+      it 'has at least one cop per type' do
+        types.each do |c|
+          expect(described_class.all.with_type(c).length).to be > 0
         end
-        context '#with_type' do
-          let(:types) { Rubocop::Cop::Cop.all.types }
-          it 'has at least one cop per type' do
-            types.each do |c|
-              expect(Rubocop::Cop::Cop.all.with_type(c).length).to be > 0
-            end
-          end
-
-          it 'has each cop in exactly one type' do
-            sum = 0
-            types.each do |c|
-              sum = sum + Rubocop::Cop::Cop.all.with_type(c).length
-            end
-            expect(sum).to be Rubocop::Cop::Cop.all.length
-          end
+      end
 
-          it 'returns 0 for an invalid type' do
-            expect(Rubocop::Cop::Cop.all.with_type('x').length).to be 0
-          end
+      it 'has each cop in exactly one type' do
+        sum = 0
+        types.each do |c|
+          sum = sum + described_class.all.with_type(c).length
         end
+        expect(sum).to be described_class.all.length
       end
 
+      it 'returns 0 for an invalid type' do
+        expect(described_class.all.with_type('x').length).to be 0
+      end
     end
   end
 end