rubocop 0.28.0 → 0.29.0

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

@@ -6,22 +6,22 @@ describe RuboCop::Cop::Style::Tab do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a line indented with tab' do
-    inspect_source(cop, ["\tx = 0"])
+    inspect_source(cop, "\tx = 0")
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for a line indented with multiple tabs' do
-    inspect_source(cop, ["\t\t\tx = 0"])
+    inspect_source(cop, "\t\t\tx = 0")
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for a line indented with mixed whitespace' do
-    inspect_source(cop, [" \tx = 0"])
+    inspect_source(cop, " \tx = 0")
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a line with tab in a string' do
-    inspect_source(cop, ["(x = \"\t\")"])
+    inspect_source(cop, "(x = \"\t\")")
     expect(cop.offenses).to be_empty
   end
 

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

@@ -25,7 +25,7 @@ describe RuboCop::Cop::Style::TrailingBlankLines, :config do
     end
 
     it 'registers an offense for no final newline' do
-      inspect_source(cop, ['x = 0'])
+      inspect_source(cop, 'x = 0')
       expect(cop.messages).to eq(['Final newline missing.'])
     end
 
@@ -56,7 +56,7 @@ describe RuboCop::Cop::Style::TrailingBlankLines, :config do
     end
 
     it 'registers an offense for no final newline' do
-      inspect_source(cop, ['x = 0'])
+      inspect_source(cop, 'x = 0')
       expect(cop.messages).to eq(['Final newline missing.'])
     end
 

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

@@ -6,13 +6,13 @@ describe RuboCop::Cop::Style::TrailingWhitespace do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a line ending with space' do
-    source = ['x = 0 ']
+    source = 'x = 0 '
     inspect_source(cop, source)
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for a line ending with tab' do
-    inspect_source(cop, ["x = 0\t"])
+    inspect_source(cop, "x = 0\t")
     expect(cop.offenses.size).to eq(1)
   end
 

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

@@ -453,6 +453,20 @@ describe RuboCop::Cop::Style::TrivialAccessors, :config do
       end
     end
 
+    context 'non-matching reader' do
+      let(:source) do
+        ['def foo',
+         '  @bar',
+         'end']
+      end
+
+      it 'does not autocorrect' do
+        expect(autocorrect_source(cop, source))
+          .to eq(source.join("\n"))
+        expect(cop.offenses.map(&:corrected?)).to eq [false]
+      end
+    end
+
     context 'matching non-DSL writer' do
       let(:source) do
         ['def foo=(f)',
@@ -477,6 +491,7 @@ describe RuboCop::Cop::Style::TrivialAccessors, :config do
       it 'does not autocorrect' do
         expect(autocorrect_source(cop, source))
           .to eq(source.join("\n"))
+        expect(cop.offenses.map(&:corrected?)).to eq [false]
       end
     end
 
@@ -490,6 +505,7 @@ describe RuboCop::Cop::Style::TrivialAccessors, :config do
       it 'does not autocorrect' do
         expect(autocorrect_source(cop, source))
           .to eq(source.join("\n"))
+        expect(cop.offenses.map(&:corrected?)).to eq [false]
       end
     end
 

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

@@ -6,26 +6,22 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
   subject(:cop) { described_class.new }
 
   it 'registers no offense for normal arrays of strings' do
-    inspect_source(cop,
-                   ['["one", "two", "three"]'])
+    inspect_source(cop, '["one", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers no offense for normal arrays of strings with interpolation' do
-    inspect_source(cop,
-                   ['["one", "two", "th#{ ?r }ee"]'])
+    inspect_source(cop, '["one", "two", "th#{ ?r }ee"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers an offense for misused %W' do
-    inspect_source(cop,
-                   ['%W(cat dog)'])
+    inspect_source(cop, '%W(cat dog)')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers no offense for %W with interpolation' do
-    inspect_source(cop,
-                   ['%W(c#{ ?a }t dog)'])
+    inspect_source(cop, '%W(c#{ ?a }t dog)')
     expect(cop.offenses).to be_empty
   end
 
@@ -48,44 +44,37 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
   end
 
   it 'registers no offense for %w without interpolation' do
-    inspect_source(cop,
-                   ['%w(cat dog)'])
+    inspect_source(cop, '%w(cat dog)')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers no offense for %w with interpolation-like syntax' do
-    inspect_source(cop,
-                   ['%w(c#{ ?a }t dog)'])
+    inspect_source(cop, '%w(c#{ ?a }t dog)')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers no offense for arrays with character constants' do
-    inspect_source(cop,
-                   ['["one", ?\n]'])
+    inspect_source(cop, '["one", ?\n]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array of non-words' do
-    inspect_source(cop,
-                   ['["one space", "two", "three"]'])
+    inspect_source(cop, '["one space", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array containing non-string' do
-    inspect_source(cop,
-                   ['["one", "two", 3]'])
+    inspect_source(cop, '["one", "two", 3]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array with one element' do
-    inspect_source(cop,
-                   ['["three"]'])
+    inspect_source(cop, '["three"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array with empty strings' do
-    inspect_source(cop,
-                   ['["", "two", "three"]'])
+    inspect_source(cop, '["", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated global variables in string' do
     inspect_source(cop,
-                   ['puts "this is a #$test"'])
+                   'puts "this is a #$test"')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['$test'])
     expect(cop.messages)
@@ -17,7 +17,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated global variables in regexp' do
     inspect_source(cop,
-                   ['puts /this is a #$test/'])
+                   'puts /this is a #$test/')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['$test'])
     expect(cop.messages)
@@ -27,7 +27,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated global variables in regexp' do
     inspect_source(cop,
-                   ['puts `this is a #$test`'])
+                   'puts `this is a #$test`')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['$test'])
     expect(cop.messages)
@@ -37,7 +37,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated regexp back references' do
     inspect_source(cop,
-                   ['puts "this is a #$1"'])
+                   'puts "this is a #$1"')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['$1'])
     expect(cop.messages)
@@ -46,7 +46,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated instance variables' do
     inspect_source(cop,
-                   ['puts "this is a #@test"'])
+                   'puts "this is a #@test"')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['@test'])
     expect(cop.messages)
@@ -56,7 +56,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'registers an offense for interpolated class variables' do
     inspect_source(cop,
-                   ['puts "this is a #@@t"'])
+                   'puts "this is a #@@t"')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['@@t'])
     expect(cop.messages)
@@ -65,7 +65,7 @@ describe RuboCop::Cop::Style::VariableInterpolation do
 
   it 'does not register an offense for variables in expressions' do
     inspect_source(cop,
-                   ['puts "this is a #{@test} #{@@t} #{$t} #{$1}"'])
+                   'puts "this is a #{@test} #{@@t} #{$t} #{$1}"')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -18,12 +18,12 @@ describe RuboCop::Cop::Style::WhileUntilDo do
   end
 
   it 'accepts do in single-line while' do
-    inspect_source(cop, ['while cond do something end'])
+    inspect_source(cop, 'while cond do something end')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts do in single-line until' do
-    inspect_source(cop, ['until cond do something end'])
+    inspect_source(cop, 'until cond do something end')
     expect(cop.offenses).to be_empty
   end
 

data/spec/rubocop/cop/{metrics → style}/while_until_modifier_spec.rb

@@ -64,12 +64,12 @@ describe RuboCop::Cop::Style::WhileUntilModifier do
   end
 
   it 'accepts modifier while' do
-    inspect_source(cop, ['ala while bala'])
+    inspect_source(cop, 'ala while bala')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts modifier until' do
-    inspect_source(cop, ['ala until bala'])
+    inspect_source(cop, 'ala until bala')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -8,56 +8,56 @@ describe RuboCop::Cop::Style::WordArray, :config do
 
   it 'registers an offense for arrays of single quoted strings' do
     inspect_source(cop,
-                   ["['one', 'two', 'three']"])
+                   "['one', 'two', 'three']")
     expect(cop.offenses.size).to eq(1)
     expect(cop.config_to_allow_offenses).to eq('MinSize' => 3)
   end
 
   it 'registers an offense for arrays of double quoted strings' do
     inspect_source(cop,
-                   ['["one", "two", "three"]'])
+                   '["one", "two", "three"]')
     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]'])
+                   '["one", ?\n]')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not register an offense for array of non-words' do
     inspect_source(cop,
-                   ['["one space", "two", "three"]'])
+                   '["one space", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array containing non-string' do
     inspect_source(cop,
-                   ['["one", "two", 3]'])
+                   '["one", "two", 3]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array starting with %w' do
     inspect_source(cop,
-                   ['%w(one two three)'])
+                   '%w(one two three)')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array with one element' do
     inspect_source(cop,
-                   ['["three"]'])
+                   '["three"]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for array with empty strings' do
     inspect_source(cop,
-                   ['["", "two", "three"]'])
+                   '["", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 
@@ -65,7 +65,7 @@ describe RuboCop::Cop::Style::WordArray, :config do
     cop_config['MinSize'] = 3
 
     inspect_source(cop,
-                   ['["one", "two", "three"]'])
+                   '["one", "two", "three"]')
     expect(cop.offenses).to be_empty
   end
 
@@ -105,7 +105,7 @@ describe RuboCop::Cop::Style::WordArray, :config do
     let(:cop_config) { { 'MinSize' => 0, 'WordRegex' => /\A[\w@.]+\z/ } }
 
     it 'registers an offense for arrays of email addresses' do
-      inspect_source(cop, ["['a@example.com', 'b@example.com']"])
+      inspect_source(cop, "['a@example.com', 'b@example.com']")
       expect(cop.offenses.size).to eq(1)
     end
 

data/spec/rubocop/cop/util_spec.rb

@@ -39,6 +39,57 @@ describe RuboCop::Cop::Util do
     end
   end
 
+  describe 'source indicated by #range_with_surrounding_comma' do
+    let(:input_range) { OpenStruct.new(begin_pos: 7, end_pos: 12) }
+    let(:buffer) { OpenStruct.new(source: 'raise ,Error,') }
+
+    subject do
+      r = described_class.range_with_surrounding_comma(input_range,
+                                                       side, buffer)
+      buffer.source[r.begin_pos...r.end_pos]
+    end
+
+    context 'when side is :both' do
+      let(:side) { :both }
+      it { should eq(',Error,') }
+    end
+
+    context 'when side is :left' do
+      let(:side) { :left }
+      it { should eq(',Error') }
+    end
+
+    context 'when side is :right' do
+      let(:side) { :right }
+      it { should eq('Error,') }
+    end
+  end
+
+  describe 'source indicated by #range_with_surrounding_space' do
+    let(:input_range) { OpenStruct.new(begin_pos: 5, end_pos: 9) }
+    let(:buffer) { OpenStruct.new(source: 'f {  a(2) }') }
+    subject do
+      r = described_class.range_with_surrounding_space(input_range, side,
+                                                       buffer)
+      buffer.source[r.begin_pos...r.end_pos]
+    end
+
+    context 'when side is :both' do
+      let(:side) { :both }
+      it { should eq('  a(2) ') }
+    end
+
+    context 'when side is :left' do
+      let(:side) { :left }
+      it { should eq('  a(2)') }
+    end
+
+    context 'when side is :right' do
+      let(:side) { :right }
+      it { should eq('a(2) ') }
+    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|

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'astrolabe/sexp'
+
+describe RuboCop::Cop::VariableForce::Reference do
+  include Astrolabe::Sexp
+
+  describe '.new' do
+    context 'when non variable reference node is passed' do
+      it 'raises error' do
+        node = s(:def)
+        scope = RuboCop::Cop::VariableForce::Scope.new(s(:class))
+        expect { described_class.new(node, scope) }
+          .to raise_error(ArgumentError)
+      end
+    end
+  end
+end

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

@@ -209,6 +209,13 @@ describe RuboCop::Cop::VariableForce::VariableTable do
     end
   end
 
+  describe '#find_variable with an empty scope stack' do
+    it 'returns nil' do
+      found_variable = variable_table.find_variable(:unknown)
+      expect(found_variable).to be_nil
+    end
+  end
+
   describe '#accessible_variables' do
     let(:accessible_variable_names) do
       variable_table.accessible_variables.map(&:name)