rubocop 0.23.0 → 0.24.0

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

@@ -19,6 +19,12 @@ describe RuboCop::Cop::Style::WordArray, :config do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'registers an offense for arrays of unicode word characters' do
+    inspect_source(cop,
+                   ['["ВУЗ", "вуз", "中文网"]'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'registers an offense for arrays with character constants' do
     inspect_source(cop,
                    ['["one", ?\n]'])

data/spec/rubocop/cop/team_spec.rb

@@ -13,12 +13,12 @@ describe RuboCop::Cop::Team do
 
     context 'when the option argument of .new is omitted' do
       subject { described_class.new(cop_classes, config).autocorrect? }
-      it { should be_false }
+      it { should be_falsey }
     end
 
     context 'when { auto_correct: true } is passed to .new' do
       let(:options) { { auto_correct: true } }
-      it { should be_true }
+      it { should be_truthy }
     end
   end
 
@@ -27,12 +27,12 @@ describe RuboCop::Cop::Team do
 
     context 'when the option argument of .new is omitted' do
       subject { described_class.new(cop_classes, config).debug? }
-      it { should be_false }
+      it { should be_falsey }
     end
 
     context 'when { debug: true } is passed to .new' do
       let(:options) { { debug: true } }
-      it { should be_true }
+      it { should be_truthy }
     end
   end
 
@@ -41,7 +41,7 @@ describe RuboCop::Cop::Team do
 
     let(:file_path) { '/tmp/example.rb' }
     let(:offenses) do
-      team.inspect_file(RuboCop::SourceParser.parse_file(file_path))
+      team.inspect_file(RuboCop::ProcessedSource.from_file(file_path))
     end
 
     before do
@@ -53,7 +53,7 @@ describe RuboCop::Cop::Team do
 
     it 'returns offenses' do
       expect(offenses).not_to be_empty
-      expect(offenses.all? { |o| o.is_a?(RuboCop::Cop::Offense) }).to be_true
+      expect(offenses.all? { |o| o.is_a?(RuboCop::Cop::Offense) }).to be_truthy
     end
 
     context 'when Parser reports non-fatal warning for the file' do
@@ -87,7 +87,7 @@ describe RuboCop::Cop::Team do
       end
 
       it 'does autocorrection' do
-        team.inspect_file(RuboCop::SourceParser.parse_file(file_path))
+        team.inspect_file(RuboCop::ProcessedSource.from_file(file_path))
         corrected_source = File.read(file_path)
         expect(corrected_source).to eq([
           '# encoding: utf-8',
@@ -107,7 +107,7 @@ describe RuboCop::Cop::Team do
 
     it 'returns cop instances' do
       expect(cops).not_to be_empty
-      expect(cops.all? { |c| c.is_a?(RuboCop::Cop::Cop) }).to be_true
+      expect(cops.all? { |c| c.is_a?(RuboCop::Cop::Cop) }).to be_truthy
     end
 
     context 'when only some cop classes are passed to .new' do

data/spec/rubocop/cop/util_spec.rb

@@ -46,4 +46,14 @@ describe RuboCop::Cop::Util do
       end
     end
   end
+
+  # Test compatibility with Range#size in Ruby 2.0.
+  describe '#numeric_range_size', ruby: 2 do
+    [1..1, 1...1, 1..2, 1...2, 1..3, 1...3, 1..-1, 1...-1].each do |range|
+      context "with range #{range}" do
+        subject { described_class.numeric_range_size(range) }
+        it { should eq(range.size) }
+      end
+    end
+  end
 end

data/spec/rubocop/cop/variable_force/assignment_spec.rb

@@ -7,7 +7,7 @@ describe RuboCop::Cop::VariableForce::Assignment do
   include AST::Sexp
 
   let(:ast) do
-    processed_source = RuboCop::SourceParser.parse(source)
+    processed_source = RuboCop::ProcessedSource.new(source)
     processed_source.ast
   end
 

data/spec/rubocop/cop/variable_force/locatable_spec.rb

@@ -18,7 +18,7 @@ describe RuboCop::Cop::VariableForce::Locatable do
   end
 
   let(:ast) do
-    processed_source = RuboCop::SourceParser.parse(source)
+    processed_source = RuboCop::ProcessedSource.new(source)
     processed_source.ast
   end
 

data/spec/rubocop/cop/variable_force/scope_spec.rb

@@ -23,7 +23,7 @@ describe RuboCop::Cop::VariableForce::Scope do
   end
 
   let(:ast) do
-    ast = RuboCop::SourceParser.parse(source).ast
+    ast = RuboCop::ProcessedSource.new(source).ast
     RuboCop::Cop::VariableForce.wrap_with_top_level_node(ast)
   end
 

data/spec/rubocop/cop/variable_force/variable_spec.rb

@@ -26,14 +26,14 @@ describe RuboCop::Cop::VariableForce::Variable do
     subject { variable.referenced? }
 
     context 'when the variable is not assigned' do
-      it { should be_false }
+      it { should be_falsey }
 
       context 'and the variable is referenced' do
         before do
           variable.reference!(s(:lvar, name))
         end
 
-        it { should be_true }
+        it { should be_truthy }
       end
     end
 
@@ -43,7 +43,7 @@ describe RuboCop::Cop::VariableForce::Variable do
       end
 
       context 'and the variable is not yet referenced' do
-        it { should be_false }
+        it { should be_falsey }
       end
 
       context 'and the variable is referenced' do
@@ -51,7 +51,7 @@ describe RuboCop::Cop::VariableForce::Variable do
           variable.reference!(s(:lvar, name))
         end
 
-        it { should be_true }
+        it { should be_truthy }
       end
     end
   end

data/spec/rubocop/formatter/base_formatter_spec.rb

@@ -9,7 +9,7 @@ module RuboCop
 
       describe 'how the API methods are invoked', :isolated_environment do
         subject(:formatter) { double('formatter').as_null_object }
-        let(:cli) { CLI.new }
+        let(:runner) { Runner.new({}, ConfigStore.new) }
         let(:output) { $stdout.string }
 
         before do
@@ -39,7 +39,7 @@ module RuboCop
         end
 
         def run
-          cli.run([])
+          runner.run([])
         end
 
         describe 'invocation order' do
@@ -105,7 +105,7 @@ module RuboCop
           end
 
           context 'when RuboCop is interrupted by user' do
-            it 'received processed file paths' do
+            it 'receives only processed file paths' do
               class << formatter
                 attr_reader :processed_file_count
 
@@ -115,7 +115,7 @@ module RuboCop
                 end
               end
 
-              allow(cli).to receive(:wants_to_quit?) do
+              allow(runner).to receive(:aborting?) do
                 formatter.processed_file_count == 2
               end
 
@@ -180,7 +180,7 @@ module RuboCop
                 fail
               end
               expect(offenses.all? { |o| o.is_a?(RuboCop::Cop::Offense) })
-                .to be_true
+                .to be_truthy
             end
             run
           end

data/spec/rubocop/formatter/colorizable_spec.rb

@@ -34,7 +34,7 @@ module RuboCop
 
         shared_examples 'does nothing' do
           it 'does nothing' do
-            should == 'foo'
+            should eq('foo')
           end
         end
 
@@ -49,7 +49,7 @@ module RuboCop
             end
 
             it 'colorize the passed string' do
-              should == "\e[31mfoo\e[0m"
+              should eq("\e[31mfoo\e[0m")
             end
           end
 

data/spec/rubocop/formatter/json_formatter_spec.rb

@@ -118,7 +118,7 @@ module RuboCop
       end
 
       it 'sets Offense#corrected? value for :corrected key' do
-        expect(hash[:corrected]).to be_true
+        expect(hash[:corrected]).to be_truthy
       end
 
       before do

data/spec/rubocop/path_util_spec.rb

@@ -31,7 +31,7 @@ describe RuboCop::PathUtil do
     context 'with deprecated patterns' do
       it 'matches dir/** and prints warning' do
         expect(subject.match_path?('dir/**', 'dir/sub/file', '.rubocop.yml'))
-          .to be_true
+          .to be_truthy
         expect($stderr.string)
           .to eq("Warning: Deprecated pattern style 'dir/**' in " \
                  ".rubocop.yml. Change to 'dir/**/*'.\n")
@@ -39,37 +39,37 @@ describe RuboCop::PathUtil do
 
       it 'matches strings to the basename and prints warning' do
         expect(subject.match_path?('file', 'dir/file', '.rubocop.yml'))
-          .to be_true
+          .to be_truthy
         expect($stderr.string)
           .to eq("Warning: Deprecated pattern style 'file' in .rubocop.yml. " \
                  "Change to '**/file'.\n")
 
-        expect(subject.match_path?('file', 'dir/files', '')).to be_false
-        expect(subject.match_path?('dir', 'dir/file', '')).to be_false
+        expect(subject.match_path?('file', 'dir/files', '')).to be_falsey
+        expect(subject.match_path?('dir', 'dir/file', '')).to be_falsey
       end
     end
 
     it 'matches strings to the full path' do
       expect(subject.match_path?("#{Dir.pwd}/dir/file",
-                                 "#{Dir.pwd}/dir/file", '')).to be_true
+                                 "#{Dir.pwd}/dir/file", '')).to be_truthy
       expect(subject.match_path?("#{Dir.pwd}/dir/file",
-                                 "#{Dir.pwd}/dir/dir/file", '')).to be_false
+                                 "#{Dir.pwd}/dir/dir/file", '')).to be_falsey
     end
 
     it 'matches glob expressions' do
-      expect(subject.match_path?('dir/*',    'dir/file', '')).to be_true
-      expect(subject.match_path?('dir/*/*',  'dir/sub/file', '')).to be_true
-      expect(subject.match_path?('dir/**/*', 'dir/sub/file', '')).to be_true
-      expect(subject.match_path?('dir/**/*', 'dir/file', '')).to be_true
-      expect(subject.match_path?('**/*',     'dir/sub/file', '')).to be_true
-      expect(subject.match_path?('**/file',  'file', '')).to be_true
+      expect(subject.match_path?('dir/*',    'dir/file', '')).to be_truthy
+      expect(subject.match_path?('dir/*/*',  'dir/sub/file', '')).to be_truthy
+      expect(subject.match_path?('dir/**/*', 'dir/sub/file', '')).to be_truthy
+      expect(subject.match_path?('dir/**/*', 'dir/file', '')).to be_truthy
+      expect(subject.match_path?('**/*',     'dir/sub/file', '')).to be_truthy
+      expect(subject.match_path?('**/file',  'file', '')).to be_truthy
 
-      expect(subject.match_path?('sub/*',    'dir/sub/file', '')).to be_false
+      expect(subject.match_path?('sub/*',    'dir/sub/file', '')).to be_falsey
     end
 
     it 'matches regexps' do
-      expect(subject.match_path?(/^d.*e$/, 'dir/file', '')).to be_true
-      expect(subject.match_path?(/^d.*e$/, 'dir/filez', '')).to be_false
+      expect(subject.match_path?(/^d.*e$/, 'dir/file', '')).to be_truthy
+      expect(subject.match_path?(/^d.*e$/, 'dir/filez', '')).to be_falsey
     end
   end
 end

data/spec/rubocop/processed_source_spec.rb

@@ -3,31 +3,93 @@
 require 'spec_helper'
 
 describe RuboCop::ProcessedSource do
-  subject(:processed_source) do
-    described_class.new(
-      buffer,
-      double('ast'),
-      double('comments'),
-      double('tokens'),
-      diagnostics
-    )
+  include FileHelper
+
+  subject(:processed_source) { described_class.new(source, path) }
+
+  let(:source) { <<-END.strip_indent }
+    # encoding: utf-8
+    def some_method
+      puts 'foo'
+    end
+    some_method
+  END
+
+  let(:path) { 'path/to/file.rb' }
+
+  describe '.from_file', :isolated_environment do
+    before do
+      create_file(path, 'foo')
+    end
+
+    let(:processed_source) { described_class.from_file(path) }
+
+    it 'returns an instance of ProcessedSource' do
+      expect(processed_source).to be_a(described_class)
+    end
+
+    it "sets the file path to the instance's #path" do
+      expect(processed_source.path).to eq(path)
+    end
+  end
+
+  describe '#path' do
+    it 'is the path passed to .new' do
+      expect(processed_source.path).to eq(path)
+    end
+  end
+
+  describe '#buffer' do
+    it 'is a source buffer' do
+      expect(processed_source.buffer).to be_a(Parser::Source::Buffer)
+    end
+  end
+
+  describe '#ast' do
+    it 'is the root node of AST' do
+      expect(processed_source.ast).to be_a(Parser::AST::Node)
+    end
   end
 
-  let(:diagnostics) { double('diagnostics') }
+  describe '#comments' do
+    it 'is an array of comments' do
+      expect(processed_source.comments).to be_a(Array)
+      expect(processed_source.comments.first).to be_a(Parser::Source::Comment)
+    end
+  end
 
-  let(:source) do
-    [
-      'def some_method',
-      "  puts 'foo'",
-      'end',
-      'some_method'
-    ].join("\n")
+  describe '#tokens' do
+    it 'has an array of tokens' do
+      expect(processed_source.tokens).to be_a(Array)
+      expect(processed_source.tokens.first).to be_a(RuboCop::Token)
+    end
   end
 
-  let(:buffer) do
-    buffer = Parser::Source::Buffer.new('(string)', 1)
-    buffer.source = source
-    buffer
+  shared_context 'invalid encoding source' do
+    let(:source) do
+      [
+        '# encoding: utf-8',
+        "# \xf9"
+      ].join("\n")
+    end
+  end
+
+  describe '#parser_error' do
+    context 'when the source was properly parsed' do
+      it 'is nil' do
+        expect(processed_source.parser_error).to be_nil
+      end
+    end
+
+    context 'when the source could not be parsed due to encoding error' do
+      include_context 'invalid encoding source'
+
+      it 'returns the error' do
+        expect(processed_source.parser_error).to be_a(Exception)
+        expect(processed_source.parser_error.message)
+          .to include('invalid byte sequence')
+      end
+    end
   end
 
   describe '#lines' do
@@ -36,78 +98,70 @@ describe RuboCop::ProcessedSource do
     end
 
     it 'has same number of elements as line count' do
-      expect(processed_source.lines.size).to eq(4)
+      expect(processed_source.lines.size).to eq(5)
     end
 
     it 'contains lines as string without linefeed' do
       first_line = processed_source.lines.first
-      expect(first_line).to eq('def some_method')
+      expect(first_line).to eq('# encoding: utf-8')
     end
   end
 
   describe '#[]' do
     context 'when an index is passed' do
       it 'returns the line' do
-        expect(processed_source[2]).to eq('end')
+        expect(processed_source[3]).to eq('end')
       end
     end
 
     context 'when a range is passed' do
       it 'returns the array of lines' do
-        expect(processed_source[2..3]).to eq(%w(end some_method))
+        expect(processed_source[3..4]).to eq(%w(end some_method))
       end
     end
 
     context 'when start index and length are passed' do
       it 'returns the array of lines' do
-        expect(processed_source[2, 2]).to eq(%w(end some_method))
+        expect(processed_source[3, 2]).to eq(%w(end some_method))
       end
     end
   end
 
   describe 'valid_syntax?' do
-    def create_diagnostics(level)
-      Parser::Diagnostic.new(level, :odd_hash, [], double('location'))
-    end
+    subject { processed_source.valid_syntax? }
 
-    let(:diagnostics) do
-      [create_diagnostics(level)]
-    end
+    context 'when the source is completely valid' do
+      let(:source) { 'def valid_code; end' }
 
-    context 'when the source has diagnostic with error level' do
-      let(:level) { :error }
-
-      it 'returns false' do
-        expect(processed_source.valid_syntax?).to be_false
+      it 'returns true' do
+        expect(processed_source.diagnostics).to be_empty
+        expect(processed_source).to be_valid_syntax
       end
     end
 
-    context 'when the source has diagnostic with fatal level' do
-      let(:level) { :fatal }
+    context 'when the source is invalid' do
+      let(:source) { 'def invalid_code; en' }
 
       it 'returns false' do
-        expect(processed_source.valid_syntax?).to be_false
+        expect(processed_source).not_to be_valid_syntax
       end
     end
 
-    context 'when the source has diagnostic with warning level' do
-      let(:level) { :warning }
+    context 'when the source is valid but has some warning diagnostics' do
+      let(:source) { 'do_something *array' }
 
       it 'returns true' do
-        expect(processed_source.valid_syntax?).to be_true
+        expect(processed_source.diagnostics).not_to be_empty
+        expect(processed_source.diagnostics.first.level).to eq(:warning)
+        expect(processed_source).to be_valid_syntax
       end
     end
 
-    context 'when the source has diagnostics with error and warning level' do
-      let(:diagnostics) do
-        [
-          create_diagnostics(:error),
-          create_diagnostics(:warning)
-        ]
-      end
+    context 'when the source could not be parsed due to encoding error' do
+      include_context 'invalid encoding source'
 
       it 'returns false' do
-        expect(processed_source.valid_syntax?).to be_false
+        expect(processed_source).not_to be_valid_syntax
       end
     end
   end