tailor 1.4.0 → 1.4.1

data/spec/functional/horizontal_spacing/comma_spacing_spec.rb

@@ -2,24 +2,22 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 COMMA_SPACING = {}
-COMMA_SPACING['no_space_after_comma'] = %Q{[1,2]}
-COMMA_SPACING['two_spaces_after_comma'] = %Q{[1,  2]}
-COMMA_SPACING['one_space_before_comma'] = %Q{[1 , 2]}
-COMMA_SPACING['two_spaces_before_comma'] = %Q{[1  , 2]}
-COMMA_SPACING['two_spaces_before_comma_twice'] = %Q{[1  , 2  , 3]}
-COMMA_SPACING['two_spaces_after_comma_twice'] = %Q{[1,  2,  3]}
+COMMA_SPACING['no_space_after_comma'] = %([1,2])
+COMMA_SPACING['two_spaces_after_comma'] = %([1,  2])
+COMMA_SPACING['one_space_before_comma'] = %([1 , 2])
+COMMA_SPACING['two_spaces_before_comma'] = %([1  , 2])
+COMMA_SPACING['two_spaces_before_comma_twice'] = %([1  , 2  , 3])
+COMMA_SPACING['two_spaces_after_comma_twice'] = %([1,  2,  3])
 
-COMMA_SPACING['spaces_before_with_trailing_comments'] = %Q{[
+COMMA_SPACING['spaces_before_with_trailing_comments'] = %([
   1 ,   # Comment!
   2 ,   # Another comment.
-}
-
+)
 
 describe 'Spacing around comma detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     File.open(file_name, 'w') { |f| f.write contents }
     critic.check_file(file_name, style.to_hash)
@@ -29,7 +27,7 @@ describe 'Spacing around comma detection' do
     Tailor::Critic.new
   end
 
-  let(:contents) { COMMA_SPACING[file_name]}
+  let(:contents) { COMMA_SPACING[file_name] }
 
   let(:style) do
     style = Tailor::Configuration::Style.new
@@ -41,28 +39,28 @@ describe 'Spacing around comma detection' do
 
   context 'no space after a comma' do
     let(:file_name) { 'no_space_after_comma' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'spaces_after_comma' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 3 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_comma' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 3 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context 'two spaces after a comma' do
     let(:file_name) { 'two_spaces_after_comma' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'spaces_after_comma' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 3 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_comma' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 3 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context 'one space before comma' do
     let(:file_name) { 'one_space_before_comma' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'spaces_before_comma' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 2 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_before_comma' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 2 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 end

data/spec/functional/horizontal_spacing/hard_tabs_spec.rb

@@ -8,16 +8,16 @@ require 'tailor/configuration/style'
 HARD_TABS = {}
 
 HARD_TABS['hard_tab'] =
-  %Q{def something
+  %(def something
 \tputs 'something'
-end}
+end)
 
 HARD_TABS['hard_tab_with_spaces'] =
-  %Q{class Thing
+  %(class Thing
   def something
 \t  puts 'something'
   end
-end}
+end)
 
 # This only reports the hard tab problem (and not the indentation problem)
 # because a hard tab is counted as 1 space; here, this is 4 spaces, so it
@@ -25,22 +25,22 @@ end}
 # hard tab should signal the problem.  If you fix the hard tab and don't
 # fix indentation, tailor will flag you on the indentation on the next run.
 HARD_TABS['hard_tab_with_1_indented_space'] =
-  %Q{class Thing
+  %(class Thing
   def something
 \t   puts 'something'
   end
-end}
+end)
 
 HARD_TABS['hard_tab_with_2_indented_spaces'] =
-  %Q{class Thing
+  %(class Thing
   def something
 \t    puts 'something'
   end
-end}
+end)
 
 describe 'Hard tab detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     File.open(file_name, 'w') { |f| f.write contents }
     critic.check_file(file_name, style.to_hash)
@@ -50,7 +50,7 @@ describe 'Hard tab detection' do
     Tailor::Critic.new
   end
 
-  let(:contents) { HARD_TABS[file_name]}
+  let(:contents) { HARD_TABS[file_name] }
 
   let(:style) do
     style = Tailor::Configuration::Style.new
@@ -62,49 +62,49 @@ describe 'Hard tab detection' do
 
   context '1 hard tab' do
     let(:file_name) { 'hard_tab' }
-    specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
-    specify { critic.problems[file_name].first[:line].should be 2 }
-    specify { critic.problems[file_name].first[:column].should be 0 }
-    specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
-    specify { critic.problems[file_name].last[:line].should be 2 }
-    specify { critic.problems[file_name].last[:column].should be 1 }
-    specify { critic.problems[file_name].last[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 2 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'allow_hard_tabs' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 2 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
+    specify { expect(critic.problems[file_name].last[:type]).to eq 'indentation_spaces' }
+    specify { expect(critic.problems[file_name].last[:line]).to eq 2 }
+    specify { expect(critic.problems[file_name].last[:column]).to eq 1 }
+    specify { expect(critic.problems[file_name].last[:level]).to eq :error }
   end
 
   context '1 hard tab with 2 spaces after it' do
     let(:file_name) { 'hard_tab_with_spaces' }
-    specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
-    specify { critic.problems[file_name].first[:line].should be 3 }
-    specify { critic.problems[file_name].first[:column].should be 0 }
-    specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
-    specify { critic.problems[file_name].last[:line].should be 3 }
-    specify { critic.problems[file_name].last[:column].should be 3 }
-    specify { critic.problems[file_name].last[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 2 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'allow_hard_tabs' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 3 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
+    specify { expect(critic.problems[file_name].last[:type]).to eq 'indentation_spaces' }
+    specify { expect(critic.problems[file_name].last[:line]).to eq 3 }
+    specify { expect(critic.problems[file_name].last[:column]).to eq 3 }
+    specify { expect(critic.problems[file_name].last[:level]).to eq :error }
   end
 
   context '1 hard tab with 3 spaces after it' do
     let(:file_name) { 'hard_tab_with_1_indented_space' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
-    specify { critic.problems[file_name].first[:line].should be 3 }
-    specify { critic.problems[file_name].first[:column].should be 0 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'allow_hard_tabs' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 3 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context '1 hard tab with 4 spaces after it' do
     let(:file_name) { 'hard_tab_with_2_indented_spaces' }
-    specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
-    specify { critic.problems[file_name].first[:line].should be 3 }
-    specify { critic.problems[file_name].first[:column].should be 0 }
-    specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
-    specify { critic.problems[file_name].last[:line].should be 3 }
-    specify { critic.problems[file_name].last[:column].should be 5 }
-    specify { critic.problems[file_name].last[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 2 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'allow_hard_tabs' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 3 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
+    specify { expect(critic.problems[file_name].last[:type]).to eq 'indentation_spaces' }
+    specify { expect(critic.problems[file_name].last[:line]).to eq 3 }
+    specify { expect(critic.problems[file_name].last[:column]).to eq 5 }
+    specify { expect(critic.problems[file_name].last[:level]).to eq :error }
   end
 end

data/spec/functional/horizontal_spacing/long_lines_spec.rb

@@ -2,16 +2,14 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 LONG_LINE = {}
-LONG_LINE['long_line_no_newline'] = %Q{'#{'#' * 79}'}
-LONG_LINE['long_line_newline_at_82'] = %Q{'#{'#' * 79}'
-}
-
+LONG_LINE['long_line_no_newline'] = %('#{'#' * 79}')
+LONG_LINE['long_line_newline_at_82'] = %('#{'#' * 79}'
+)
 
 describe 'Long line detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     File.open(file_name, 'w') { |f| f.write contents }
     critic.check_file(file_name, style.to_hash)
@@ -21,7 +19,7 @@ describe 'Long line detection' do
     Tailor::Critic.new
   end
 
-  let(:contents) { LONG_LINE[file_name]}
+  let(:contents) { LONG_LINE[file_name] }
 
   let(:style) do
     style = Tailor::Configuration::Style.new
@@ -33,19 +31,19 @@ describe 'Long line detection' do
 
   context 'line is 81 chars, no newline' do
     let(:file_name) { 'long_line_no_newline' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'max_line_length' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 81 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'max_line_length' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 81 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context 'line is 81 chars, plus a newline' do
     let(:file_name) { 'long_line_newline_at_82' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'max_line_length' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 81 }
-    specify { critic.problems[file_name].first[:level].should be :error }
+    specify { expect(critic.problems[file_name].size).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:type]).to eq 'max_line_length' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 81 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 end

data/spec/functional/horizontal_spacing/long_methods_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 LONG_METHOD_IN_CLASS = {}
 LONG_METHOD_IN_CLASS['ok_with_equals'] = <<-METH
 class Test
@@ -21,7 +20,7 @@ METH
 
 describe 'Long method detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     File.open('long_method.rb', 'w') { |f| f.write contents }
     subject.check_file(file_name, style.to_hash)
@@ -46,10 +45,11 @@ describe 'Long method detection' do
   context 'methods are within limits' do
     context 'method ends with line that ends with ==' do
       let(:file_name) { 'ok_with_equals' }
-      specify {
+      specify do
         pending 'https://github.com/turboladen/tailor/issues/112'
 
-        subject.problems[file_name].size.should be 1 }
+        expect(subject.problems[file_name].size).to eq 1
+      end
     end
   end
 end

data/spec/functional/horizontal_spacing/parens_spec.rb

@@ -2,24 +2,23 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 PARENS = {}
-PARENS['simple_method_call_space_after_lparen'] = %Q{thing( one, two)}
-PARENS['simple_method_call_space_before_rparen'] = %Q{thing(one, two )}
+PARENS['simple_method_call_space_after_lparen'] = %(thing( one, two))
+PARENS['simple_method_call_space_before_rparen'] = %(thing(one, two ))
 PARENS['method_call_space_after_lparen_trailing_comment'] =
-  %Q{thing( one, two)    # comment}
+  %(thing( one, two)    # comment)
 PARENS['method_call_space_after_lparen_before_rparen_trailing_comment'] =
-  %Q{thing( one, two )    # comment}
+  %(thing( one, two )    # comment)
 
-PARENS['multi_line_method_call_space_after_lparen'] = %Q{thing( one,
-  two)}
+PARENS['multi_line_method_call_space_after_lparen'] = %(thing( one,
+  two))
 PARENS['multi_line_method_call_space_after_lparen_trailing_comment'] =
-  %Q{thing( one,
-  two)}
+  %(thing( one,
+  two))
 
 describe 'Detection of spaces around brackets' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     File.open(file_name, 'w') { |f| f.write contents }
     critic.check_file(file_name, style.to_hash)
@@ -29,7 +28,7 @@ describe 'Detection of spaces around brackets' do
     Tailor::Critic.new
   end
 
-  let(:contents) { PARENS[file_name]}
+  let(:contents) { PARENS[file_name] }
 
   let(:style) do
     style = Tailor::Configuration::Style.new
@@ -42,61 +41,62 @@ describe 'Detection of spaces around brackets' do
   context 'methods' do
     context 'space after lparen' do
       let(:file_name) { 'simple_method_call_space_after_lparen' }
-      specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 6 }
-      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_lparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 6 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
     end
 
     context 'space before rparen' do
       let(:file_name) { 'simple_method_call_space_before_rparen' }
-      specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_before_rparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 15 }
-      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_before_rparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 15 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
     end
 
     context 'space after lparen, trailing comment' do
       let(:file_name) { 'method_call_space_after_lparen_trailing_comment' }
-      specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 6 }
-      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_lparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 6 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
     end
 
     context 'space after lparen, before rparen, trailing comment' do
       let(:file_name) { 'method_call_space_after_lparen_before_rparen_trailing_comment' }
-      specify { critic.problems[file_name].size.should be 2 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 6 }
-      specify { critic.problems[file_name].first[:level].should be :error }
-      specify { critic.problems[file_name].last[:type].should == 'spaces_before_rparen' }
-      specify { critic.problems[file_name].last[:line].should be 1 }
-      specify { critic.problems[file_name].last[:column].should be 16 }
-      specify { critic.problems[file_name].last[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 2 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_lparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 6 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
+      specify { expect(critic.problems[file_name].last[:type]).to eq 'spaces_before_rparen' }
+      specify { expect(critic.problems[file_name].last[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].last[:column]).to eq 16 }
+      specify { expect(critic.problems[file_name].last[:level]).to eq :error }
     end
   end
 
   context 'multi-line method calls' do
     context 'space after lparen' do
       let(:file_name) { 'multi_line_method_call_space_after_lparen' }
-      specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 6 }
-      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_lparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 6 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
     end
+
     context 'space after lparen, trailing comment' do
       let(:file_name) { 'multi_line_method_call_space_after_lparen_trailing_comment' }
-      specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 6 }
-      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { expect(critic.problems[file_name].size).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:type]).to eq 'spaces_after_lparen' }
+      specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+      specify { expect(critic.problems[file_name].first[:column]).to eq 6 }
+      specify { expect(critic.problems[file_name].first[:level]).to eq :error }
     end
   end
 end