rubocop 0.20.1 → 0.21.0

data/spec/rubocop/config_spec.rb

@@ -78,7 +78,7 @@ describe Rubocop::Config do
     let(:hash) do
       {
         'AllCops' => {
-          'Include' => ['Gemfile', 'config/unicorn.rb.example']
+          'Include' => ['**/Gemfile', 'config/unicorn.rb.example']
         }
       }
     end
@@ -101,6 +101,9 @@ describe Rubocop::Config do
   end
 
   describe '#file_to_exclude?' do
+    before { $stderr = StringIO.new }
+    after { $stderr = STDERR }
+
     let(:hash) do
       {
         'AllCops' => {
@@ -139,14 +142,14 @@ describe Rubocop::Config do
       let(:hash) do
         {
           'AllCops' => {
-            'Include' => ['Gemfile', 'config/unicorn.rb.example']
+            'Include' => ['**/Gemfile', 'config/unicorn.rb.example']
           }
         }
       end
 
       it 'returns the Include value' do
         expect(patterns_to_include).to eq([
-          'Gemfile',
+          '**/Gemfile',
           'config/unicorn.rb.example'
         ])
       end
@@ -176,4 +179,46 @@ describe Rubocop::Config do
       end
     end
   end
+
+  describe '#deprecation_check' do
+    context 'when there is no AllCops configuration' do
+      let(:hash) { {} }
+
+      it 'does not yield' do
+        expect { |b| configuration.deprecation_check(&b) }.not_to yield_control
+      end
+    end
+
+    context 'when there is AllCops configuration' do
+      context 'if there are no Excludes or Includes keys' do
+        let(:hash) { { 'AllCops' => { 'Exclude' => [], 'Include' => [] } } }
+
+        it 'does not yield' do
+          expect do |b|
+            configuration.deprecation_check(&b)
+          end.not_to yield_control
+        end
+      end
+
+      context 'if there are is an Includes key' do
+        let(:hash) { { 'AllCops' => { 'Includes' => [] } } }
+
+        it 'yields' do
+          expect do |b|
+            configuration.deprecation_check(&b)
+          end.to yield_with_args(String)
+        end
+      end
+
+      context 'if there are is an Excludes key' do
+        let(:hash) { { 'AllCops' => { 'Excludes' => [] } } }
+
+        it 'yields' do
+          expect do |b|
+            configuration.deprecation_check(&b)
+          end.to yield_with_args(String)
+        end
+      end
+    end
+  end
 end

data/spec/rubocop/config_store_spec.rb

@@ -17,15 +17,15 @@ describe Rubocop::ConfigStore do
     allow(Rubocop::ConfigLoader)
       .to receive(:configuration_from_file) { |arg| arg }
     allow(Rubocop::ConfigLoader)
-      .to receive(:load_file) { |arg| "#{arg} loaded" }
+      .to receive(:load_file) { |arg| Rubocop::Config.new(arg) }
     allow(Rubocop::ConfigLoader)
-      .to receive(:merge_with_default) { |config, file| "merged #{config}" }
+      .to receive(:merge_with_default) { |config| "merged #{config}" }
   end
 
   describe '.for' do
     it 'always uses config specified in command line' do
       config_store.options_config = :options_config
-      expect(config_store.for('file1')).to eq('merged options_config loaded')
+      expect(config_store.for('file1')).to eq('merged options_config')
     end
 
     context 'when no config specified in command line' do

data/spec/rubocop/cop/commissioner_spec.rb

@@ -6,11 +6,12 @@ require 'spec_helper'
 describe Rubocop::Cop::Commissioner do
   describe '#investigate' do
     let(:cop) { double(Rubocop::Cop, offenses: []).as_null_object }
+    let(:force) { double(Rubocop::Cop::Force).as_null_object }
 
     it 'returns all offenses found by the cops' do
       allow(cop).to receive(:offenses).and_return([1])
 
-      commissioner = described_class.new([cop])
+      commissioner = described_class.new([cop], [])
       source = []
       processed_source = parse_source(source)
 
@@ -25,7 +26,7 @@ describe Rubocop::Cop::Commissioner do
         cops << double('cop C', offenses: %w(baz), relevant_file?: true)
         cops.each(&:as_null_object)
 
-        commissioner = described_class.new(cops)
+        commissioner = described_class.new(cops, [])
         source = []
         processed_source = parse_source(source)
 
@@ -36,19 +37,20 @@ describe Rubocop::Cop::Commissioner do
     it 'traverses the AST and invoke cops specific callbacks' do
       expect(cop).to receive(:on_def)
 
-      commissioner = described_class.new([cop])
+      commissioner = described_class.new([cop], [])
       source = ['def method', '1', 'end']
       processed_source = parse_source(source)
 
       commissioner.investigate(processed_source)
     end
 
-    it 'passes the input params to all cops that implement their own #investigate method' do
+    it 'passes the input params to all cops/forces that implement their own #investigate method' do
       source = []
       processed_source = parse_source(source)
       expect(cop).to receive(:investigate).with(processed_source)
+      expect(force).to receive(:investigate).with(processed_source)
 
-      commissioner = described_class.new([cop])
+      commissioner = described_class.new([cop], [force])
 
       commissioner.investigate(processed_source)
     end
@@ -56,7 +58,7 @@ describe Rubocop::Cop::Commissioner do
     it 'stores all errors raised by the cops' do
       allow(cop).to receive(:on_def) { fail RuntimeError }
 
-      commissioner = described_class.new([cop])
+      commissioner = described_class.new([cop], [])
       source = ['def method', '1', 'end']
       processed_source = parse_source(source)
 
@@ -70,7 +72,7 @@ describe Rubocop::Cop::Commissioner do
       it 're-raises the exception received while processing' do
         allow(cop).to receive(:on_def) { fail RuntimeError }
 
-        commissioner = described_class.new([cop], raise_error: true)
+        commissioner = described_class.new([cop], [], raise_error: true)
         source = ['def method', '1', 'end']
         processed_source = parse_source(source)
 

data/spec/rubocop/cop/cop_spec.rb

@@ -81,8 +81,6 @@ describe Rubocop::Cop::Cop do
       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 }

data/spec/rubocop/cop/force_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Force do
+  subject(:force) { Rubocop::Cop::Force.new(cops) }
+  let(:cops) { [double('cop1'), double('cop2')] }
+
+  describe '.force_name' do
+    it 'returns the class name without namespace' do
+      expect(Rubocop::Cop::VariableForce.force_name).to eq('VariableForce')
+    end
+  end
+
+  describe '#run_hook' do
+    it 'invokes a hook in all cops' do
+      cops.each do |cop|
+        expect(cop).to receive(:some_hook).with(:foo, :bar)
+      end
+
+      force.run_hook(:some_hook, :foo, :bar)
+    end
+
+    it 'does not invoke a hook if the cop does not respond to the hook' do
+      expect(cops.last).to receive(:some_hook).with(:foo, :bar)
+      force.run_hook(:some_hook, :foo, :bar)
+    end
+  end
+end

data/spec/rubocop/cop/lint/ambiguous_operator_spec.rb

@@ -25,7 +25,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
             'Ambiguous splat operator. ' \
             "Parenthesize the method arguments if it's surely a splat " \
             'operator, ' \
-            'or add a whitespace to the right of the * if it should be a ' \
+            'or add a whitespace to the right of the `*` if it should be a ' \
             'multiplication.'
           )
           expect(cop.highlights).to eq(['*'])
@@ -76,7 +76,7 @@ describe Rubocop::Cop::Lint::AmbiguousOperator do
             'Ambiguous block operator. ' \
             "Parenthesize the method arguments if it's surely a block " \
             'operator, ' \
-            'or add a whitespace to the right of the & if it should be a ' \
+            'or add a whitespace to the right of the `&` if it should be a ' \
             'binary AND.'
           )
           expect(cop.highlights).to eq(['&'])

data/spec/rubocop/cop/lint/ambiguous_regexp_literal_spec.rb

@@ -18,7 +18,7 @@ describe Rubocop::Cop::Lint::AmbiguousRegexpLiteral do
         expect(cop.offenses.first.message).to eq(
           'Ambiguous regexp literal. Parenthesize the method arguments ' \
           "if it's surely a regexp literal, or add a whitespace to the " \
-          'right of the / if it should be a division.'
+          'right of the `/` if it should be a division.'
         )
         expect(cop.highlights).to eq(['/'])
       end

data/spec/rubocop/cop/lint/block_alignment_spec.rb

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `test do |ala|` at 1, 0'])
   end
 
   context 'when the block is a logical operand' do
@@ -43,7 +43,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       '    end'
                      ])
       expect(cop.messages)
-        .to eq(['end at 2, 4 is not aligned with a = b = c = test do |ala| at 1, 0'])
+        .to eq(['`end` at 2, 4 is not aligned with `a = b = c = test do |ala|` at 1, 0'])
     end
 
     it 'accepts end aligned with the first variable' do
@@ -72,7 +72,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with variable = test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable = test do |ala|` at 1, 0'])
   end
 
   context 'when the block is defined on the next line' do
@@ -94,8 +94,8 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                       'end'
                      ])
       expect(cop.messages)
-        .to eq(['end at 4, 0 is not aligned with a_long_method_that_dont_fit_on_the_line ' \
-                'do |v| at 2, 2'])
+        .to eq(['`end` at 4, 0 is not aligned with `a_long_method_that_dont_fit_on_the_line ' \
+                'do |v|` at 2, 2'])
     end
   end
 
@@ -131,12 +131,12 @@ describe Rubocop::Cop::Lint::BlockAlignment do
              'end']
       inspect_source(cop, src)
       expect(cop.messages)
-        .to eq(['end at 5, 8 is not aligned with bar.get_stuffs at 2, 2 or' \
-                ' .reject do |stuff| at 3, 6',
-                'end at 7, 4 is not aligned with bar.get_stuffs at 2, 2 or' \
-                ' end.select do |stuff| at 5, 8',
-                'end at 10, 8 is not aligned with bar.get_stuffs at 2, 2 or' \
-                ' .select do |stuff| at 8, 6'])
+        .to eq(['`end` at 5, 8 is not aligned with `bar.get_stuffs` at 2, 2 or' \
+                ' `.reject do |stuff|` at 3, 6',
+                '`end` at 7, 4 is not aligned with `bar.get_stuffs` at 2, 2 or' \
+                ' `end.select do |stuff|` at 5, 8',
+                '`end` at 10, 8 is not aligned with `bar.get_stuffs` at 2, 2 or' \
+                ' `.select do |stuff|` at 8, 6'])
     end
 
     # Example from issue 393 of bbatsov/rubocop on github:
@@ -192,7 +192,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
              '    end']
       inspect_source(cop, src)
       expect(cop.messages)
-        .to eq(['end at 4, 4 is not aligned with e, at 1, 0 or f = [5, 6].map do |i| at 2, 0'])
+        .to eq(['`end` at 4, 4 is not aligned with `e,` at 1, 0 or `f = [5, 6].map do |i|` at 2, 0'])
     end
   end
 
@@ -210,7 +210,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with @variable = test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `@variable = test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a class variable' do
@@ -227,7 +227,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with @@variable = test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `@@variable = test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a global variable' do
@@ -244,7 +244,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with $variable = test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `$variable = test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a constant' do
@@ -261,7 +261,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with Module::CONSTANT = test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `Module::CONSTANT = test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a method call' do
@@ -280,7 +280,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 3, 2 is not aligned with parser.childs << lambda do |token| at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `parser.childs << lambda do |token|` at 1, 0'])
   end
 
   it 'accepts end aligned with a method call with arguments' do
@@ -299,7 +299,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 3, 2 is not aligned with @h[:f] = f.each_pair.map do |f, v| at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `@h[:f] = f.each_pair.map do |f, v|` at 1, 0'])
   end
 
   it 'does not raise an error for nested block in a method call' do
@@ -325,8 +325,8 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end)'
                    ])
     expect(cop.messages)
-      .to eq(['end at 3, 2 is not aligned with arr.all? do |o| at 1, 7 or ' \
-              'expect(arr.all? do |o| at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `arr.all? do |o|` at 1, 7 or ' \
+              '`expect(arr.all? do |o|` at 1, 0'])
   end
 
   it 'accepts end aligned with an op-asgn (+=, -=)' do
@@ -345,7 +345,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 3, 2 is not aligned with rb at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `rb` at 1, 0'])
   end
 
   it 'accepts end aligned with an and-asgn (&&=)' do
@@ -362,7 +362,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with variable &&= test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable &&= test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with an or-asgn (||=)' do
@@ -379,7 +379,7 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 2, 2 is not aligned with variable ||= test do |ala| at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable ||= test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a mass assignment' do
@@ -406,6 +406,6 @@ describe Rubocop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['end at 3, 2 is not aligned with var1, var2 at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `var1, var2` at 1, 0'])
   end
 end

data/spec/rubocop/cop/lint/condition_position_spec.rb

@@ -23,6 +23,13 @@ describe Rubocop::Cop::Lint::ConditionPosition do
                     ])
       expect(cop.offenses).to be_empty
     end
+
+    it 'accepts condition on a different line for modifiers' do
+      inspect_source(cop,
+                     ["do_something #{keyword}",
+                      '  something && something_else'])
+      expect(cop.offenses).to be_empty
+    end
   end
 
   it 'registers an offense for elsif condition on the next line' do
@@ -41,9 +48,4 @@ describe Rubocop::Cop::Lint::ConditionPosition do
     inspect_source(cop, ['x ? a : b'])
     expect(cop.offenses).to be_empty
   end
-
-  it 'handles modifier forms' do
-    inspect_source(cop, ['x if something'])
-    expect(cop.offenses).to be_empty
-  end
 end

data/spec/rubocop/cop/lint/debugger_spec.rb

@@ -9,6 +9,16 @@ describe Rubocop::Cop::Lint::Debugger do
     src = ['debugger']
     inspect_source(cop, src)
     expect(cop.offenses.size).to eq(1)
+    expect(cop.messages).to eq(['Remove debugger entry point `debugger`.'])
+    expect(cop.highlights).to eq(['debugger'])
+  end
+
+  it 'reports an offense for a byebug call' do
+    src = ['byebug']
+    inspect_source(cop, src)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages).to eq(['Remove debugger entry point `byebug`.'])
+    expect(cop.highlights).to eq(['byebug'])
   end
 
   it 'reports an offense for pry bindings' do
@@ -16,6 +26,10 @@ describe Rubocop::Cop::Lint::Debugger do
            'binding.remote_pry']
     inspect_source(cop, src)
     expect(cop.offenses.size).to eq(2)
+    expect(cop.messages)
+      .to eq(['Remove debugger entry point `binding.pry`.',
+              'Remove debugger entry point `binding.remote_pry`.'])
+    expect(cop.highlights).to eq(['binding.pry', 'binding.remote_pry'])
   end
 
   it 'does not report an offense for non-pry binding' do
@@ -24,16 +38,19 @@ describe Rubocop::Cop::Lint::Debugger do
     expect(cop.offenses).to be_empty
   end
 
-  it 'does not report an offense for debugger in comments' do
-    src = ['# debugger']
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
+  %w(debugger byebug).each do |comment|
+    it "does not report an offense for #{comment} in comments" do
+      src = ["# #{comment}"]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
   end
 
-  it 'does not report an offense for a debugger or pry method' do
-    src = ['code.debugger',
-           'door.pry']
-    inspect_source(cop, src)
-    expect(cop.offenses).to be_empty
+  %w(debugger byebug pry).each do |method_name|
+    it "does not report an offense for a #{method_name} method" do
+      src = ["code.#{method_name}"]
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
   end
 end