tailor 1.4.0 → 1.4.1

data/spec/functional/horizontal_spacing/trailing_whitespace_spec.rb

@@ -3,21 +3,20 @@ require_relative '../../support/horizontal_spacing_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 TRAILING_WHITESPACE = {}
-TRAILING_WHITESPACE['empty_line_with_spaces'] = %Q{  }
-TRAILING_WHITESPACE['empty_line_with_spaces_in_method'] = %Q{def thing
+TRAILING_WHITESPACE['empty_line_with_spaces'] = %(  )
+TRAILING_WHITESPACE['empty_line_with_spaces_in_method'] = %(def thing
   
   puts 'something'
-end}
+end)
 
-TRAILING_WHITESPACE['trailing_spaces_on_def'] = %Q{def thing  
+TRAILING_WHITESPACE['trailing_spaces_on_def'] = %(def thing  
   puts 'something'
-end}
+end)
 
 describe 'Trailing whitespace 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)
@@ -27,7 +26,7 @@ describe 'Trailing whitespace detection' do
     Tailor::Critic.new
   end
 
-  let(:contents) { TRAILING_WHITESPACE[file_name]}
+  let(:contents) { TRAILING_WHITESPACE[file_name] }
 
   let(:style) do
     style = Tailor::Configuration::Style.new

data/spec/functional/horizontal_spacing_spec.rb

@@ -5,7 +5,7 @@ require 'tailor/configuration/style'
 
 describe 'Horizontal Space problem detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
   end
 
@@ -27,9 +27,9 @@ describe 'Horizontal Space problem detection' do
       File.open(file_name, 'w') { |f| f.write contents }
     end
 
-    it 'should be OK' do
+    it 'is OK' do
       critic.check_file(file_name, style.to_hash)
-      critic.problems.should == { file_name =>  [] }
+      expect(critic.problems).to eq(file_name =>  [])
     end
   end
 
@@ -43,31 +43,31 @@ describe 'Horizontal Space problem detection' do
 
     context 'no problems' do
       let(:contents) do
-        %Q{execute 'myscript' do
+        %(execute 'myscript' do
   command \\
     '/some/line/that/is/not/over/eighty/chars.sh'
   only_if { something }
-end}
+end)
       end
 
       it 'is OK' do
         critic.check_file(file_name, style.to_hash)
-        critic.problems.should == { file_name => [] }
+        expect(critic.problems).to eq(file_name => [])
       end
     end
 
     context 'line after backslash is too long' do
       let(:contents) do
-        %Q{execute 'myscript' do
+        %(execute 'myscript' do
   command \\
     '#{'*' * 75}'
   only_if { something }
-end}
+end)
       end
 
       it 'is OK' do
         critic.check_file(file_name, style.to_hash)
-        critic.problems.should == {
+        expect(critic.problems).to eq(
           file_name => [
             {
               type: 'max_line_length',
@@ -76,8 +76,7 @@ end}
               message: 'Line is 81 chars long, but should be 80.',
               level: :error
             }
-          ]
-        }
+          ])
       end
     end
   end

data/spec/functional/indentation_spacing/argument_alignment_spec.rb

@@ -4,19 +4,18 @@ require 'tailor/critic'
 require 'tailor/configuration/style'
 
 describe 'Argument alignment' do
-
   def file_name
     self.class.description
   end
 
   def contents
     ARG_INDENT[file_name] || begin
-      raise "Example not found: #{file_name}"
+      fail "Example not found: #{file_name}"
     end
   end
 
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
     FileUtils.touch file_name
     File.open(file_name, 'w') { |f| f.write contents }
@@ -32,7 +31,6 @@ describe 'Argument alignment' do
   end
 
   context :def_no_arguments do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -49,11 +47,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :def_arguments_fit_on_one_line do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -70,18 +66,16 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :def_arguments_aligned do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [{
         type: 'indentation_spaces',
         line: 2,
         column: 14,
-        message: "Line is indented to column 14, but should be at 2.",
+        message: 'Line is indented to column 14, but should be at 2.',
         level: :error
       }]
     end
@@ -93,7 +87,7 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 14,
-        message: "Line is indented to column 14, but should be at 2.",
+        message: 'Line is indented to column 14, but should be at 2.',
         level: :error
       }]
     end
@@ -103,11 +97,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :def_arguments_indented do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -126,15 +118,13 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 2,
-        message: "Line is indented to column 2, but should be at 14.",
+        message: 'Line is indented to column 2, but should be at 14.',
         level: :error
       }]
     end
-
   end
 
   context :call_arguments_fit_on_one_line do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -151,11 +141,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_no_arguments do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -172,18 +160,16 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_aligned do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [{
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -195,7 +181,7 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -205,18 +191,16 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_aligned_args_are_integer_literals do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [{
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -228,7 +212,7 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -238,18 +222,16 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_aligned_args_are_string_literals do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [{
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -261,7 +243,7 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -271,11 +253,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_aligned_multiple_lines do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [
@@ -283,14 +263,14 @@ describe 'Argument alignment' do
           type: 'indentation_spaces',
           line: 2,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         },
         {
           type: 'indentation_spaces',
           line: 3,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         }
       ]
@@ -304,14 +284,14 @@ describe 'Argument alignment' do
           type: 'indentation_spaces',
           line: 2,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         },
         {
           type: 'indentation_spaces',
           line: 3,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         }
       ]
@@ -322,7 +302,6 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_aligned_args_have_parens do
@@ -333,7 +312,7 @@ describe 'Argument alignment' do
           type: 'indentation_spaces',
           line: 2,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         }
       ]
@@ -347,7 +326,7 @@ describe 'Argument alignment' do
           type: 'indentation_spaces',
           line: 2,
           column: 49,
-          message: "Line is indented to column 49, but should be at 2.",
+          message: 'Line is indented to column 49, but should be at 2.',
           level: :error
         }
       ]
@@ -358,19 +337,16 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
-
   end
 
   context :call_arguments_aligned_no_parens do
-
     it 'warns when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to eql [{
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -382,7 +358,7 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 49,
-        message: "Line is indented to column 49, but should be at 2.",
+        message: 'Line is indented to column 49, but should be at 2.',
         level: :error
       }]
     end
@@ -392,11 +368,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_indented do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -415,15 +389,13 @@ describe 'Argument alignment' do
         type: 'indentation_spaces',
         line: 2,
         column: 2,
-        message: "Line is indented to column 2, but should be at 49.",
+        message: 'Line is indented to column 2, but should be at 49.',
         level: :error
       }]
     end
-
   end
 
   context :call_arguments_indented_separate_line do
-
     it 'does not warn when argument alignment is not specified' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
@@ -440,11 +412,9 @@ describe 'Argument alignment' do
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_on_next_line do
-
     it 'does not warn when argument alignment is not specified' do
       style.indentation_spaces 2, level: :error, line_continuations: true
       critic.check_file(file_name, style.to_hash)
@@ -452,21 +422,21 @@ describe 'Argument alignment' do
     end
 
     it 'does not warn when argument alignment is disabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: :off
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
 
     it 'does not warn when argument alignment is enabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: true
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
 
   context :call_arguments_on_next_line_nested do
-
     it 'does not warn when argument alignment is not specified' do
       style.indentation_spaces 2, level: :error, line_continuations: true
       critic.check_file(file_name, style.to_hash)
@@ -474,20 +444,21 @@ describe 'Argument alignment' do
     end
 
     it 'does not warn when argument alignment is disabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: :off
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
 
     it 'does not warn when argument alignment is enabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: true
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
-  context :call_arguments_on_next_line_multiple do
 
+  context :call_arguments_on_next_line_multiple do
     it 'does not warn when argument alignment is not specified' do
       style.indentation_spaces 2, level: :error, line_continuations: true
       critic.check_file(file_name, style.to_hash)
@@ -495,17 +466,17 @@ describe 'Argument alignment' do
     end
 
     it 'does not warn when argument alignment is disabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: :off
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
 
     it 'does not warn when argument alignment is enabled' do
-      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      style.indentation_spaces 2, level: :error, line_continuations: true,
+        argument_alignment: true
       critic.check_file(file_name, style.to_hash)
       expect(critic.problems[file_name]).to be_empty
     end
-
   end
-
 end