tailor 1.4.0 → 1.4.1

data/spec/functional/indentation_spacing_spec.rb

@@ -3,10 +3,9 @@ require_relative '../support/good_indentation_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 describe 'Indentation spacing problem detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
   end
 
@@ -30,9 +29,9 @@ describe 'Indentation spacing 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
 
@@ -40,18 +39,18 @@ describe 'Indentation spacing problem detection' do
     let(:file_name) { 'case_whens_in' }
 
     let(:contents) do
-      %Q{def my_method
+      %(def my_method
   case true
     when true
       puts "stuff"
     when false
       puts "blah blah"
   end
-end}
+end)
     end
 
     it 'is OK' do
-      pending 'Implementation of the option to allow for this'
+      skip 'Implementation of the option to allow for this'
     end
   end
 
@@ -59,13 +58,13 @@ end}
     let(:file_name) { 'method_closing_lonely_paren' }
 
     let(:contents) do
-      %Q{def your_thing(one
+      %{def your_thing(one
   )
 end}
     end
 
     it 'is OK' do
-      pending
+      skip 'Implementation'
     end
   end
 
@@ -73,14 +72,14 @@ end}
     let(:file_name) { 'rparen_and_do_same_line' }
 
     let(:contents) do
-      %Q{opt.on('-c', '--config-file FILE',
+      %{opt.on('-c', '--config-file FILE',
   "Use a specific config file.") do |config|
   options.config_file = config
 end}
     end
 
     it 'is OK' do
-      pending
+      skip 'Implementation'
     end
   end
 
@@ -88,16 +87,16 @@ end}
     let(:file_name) { 'block_chain' }
 
     let(:contents) do
-      %Q{{
+      %({
   a: 1
 }.each do |k, v|
   puts k, v
-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
 end

data/spec/functional/naming/camel_case_methods_spec.rb

@@ -2,17 +2,15 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 CAMEL_CASE_METHODS = {}
 
 CAMEL_CASE_METHODS['one_caps_camel_case_method'] =
-  %Q{def thingOne
-end}
+  %(def thingOne
+end)
 
 CAMEL_CASE_METHODS['one_caps_camel_case_method_trailing_comment'] =
-  %Q{def thingOne   # comment
-end}
-
+  %(def thingOne   # comment
+end)
 
 describe 'Detection of camel case methods' do
   before do

data/spec/functional/naming/screaming_snake_case_classes_spec.rb

@@ -2,26 +2,23 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 SCREAMING_SNAKE_CASE_CLASSES = {}
 
 SCREAMING_SNAKE_CASE_CLASSES['one_screaming_snake_case_class'] =
-  %Q{class Thing_One
-end}
+  %(class Thing_One
+end)
 
 SCREAMING_SNAKE_CASE_CLASSES['one_screaming_snake_case_module'] =
-  %Q{module Thing_One
-end}
+  %(module Thing_One
+end)
 
 SCREAMING_SNAKE_CASE_CLASSES['double_screaming_snake_case_class'] =
-  %Q{class Thing_One_Again
-end}
+  %(class Thing_One_Again
+end)
 
 SCREAMING_SNAKE_CASE_CLASSES['double_screaming_snake_case_module'] =
-  %Q{module Thing_One_Again
-end}
-
-
+  %(module Thing_One_Again
+end)
 
 describe 'Detection of camel case methods' do
   before do
@@ -47,37 +44,37 @@ describe 'Detection of camel case methods' do
 
   context 'standard screaming snake case class' do
     let(:file_name) { 'one_screaming_snake_case_class' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
-    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 'allow_screaming_snake_case_classes' }
+    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 'standard screaming snake case module' do
     let(:file_name) { 'one_screaming_snake_case_module' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 7 }
-    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_screaming_snake_case_classes' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 7 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context 'double screaming snake case class' do
     let(:file_name) { 'double_screaming_snake_case_class' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
-    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 'allow_screaming_snake_case_classes' }
+    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 'double screaming snake case module' do
     let(:file_name) { 'double_screaming_snake_case_module' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    specify { critic.problems[file_name].first[:column].should be 7 }
-    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_screaming_snake_case_classes' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 7 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 end

data/spec/functional/naming_spec.rb

@@ -6,7 +6,7 @@ require 'tailor/configuration/style'
 
 describe 'Naming problem detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
   end
 
@@ -28,9 +28,9 @@ describe 'Naming 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
 end

data/spec/functional/rake_task_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'tailor/rake_task'
 
-
 describe Tailor::RakeTask do
   let(:rake) do
     Rake::Application.new
@@ -22,10 +21,7 @@ describe Tailor::RakeTask do
 
       it 'finds problems' do
         subject
-
-        expect {
-          rake['tailor'].invoke
-        }.to raise_error SystemExit
+        expect { rake['tailor'].invoke }.to raise_error SystemExit
       end
     end
 
@@ -38,10 +34,7 @@ describe Tailor::RakeTask do
 
       it 'does not find problems' do
         subject
-
-        expect {
-          rake['tailor'].invoke
-        }.to_not raise_error
+        expect { rake['tailor'].invoke }.to_not raise_error
       end
     end
   end
@@ -57,10 +50,7 @@ describe Tailor::RakeTask do
 
     it 'runs the task' do
       subject
-
-      expect {
-        rake[task_name].invoke
-      }.to_not raise_error RuntimeError, "Don't know how to build task '#{task_name}''"
+      expect { rake[task_name].invoke }.to raise_exception SystemExit
     end
   end
 
@@ -68,16 +58,13 @@ describe Tailor::RakeTask do
     subject do
       Tailor::RakeTask.new do |t|
         t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
-        t.tailor_opts = %w[--max-line-length=1000]
+        t.tailor_opts = %w(--max-line-length=1000)
       end
     end
 
     it 'uses the options from the rake task' do
       subject
-
-      expect {
-        rake['tailor'].invoke
-      }.to_not raise_error
+      expect { rake['tailor'].invoke }.to_not raise_error
     end
   end
 
@@ -89,11 +76,8 @@ describe Tailor::RakeTask do
     before do
       require 'fileutils'
 
-      unless File.exists?(test_dir)
-        FileUtils.mkdir(test_dir)
-      end
-
-      File.directory?(test_dir).should be_true
+      FileUtils.mkdir(test_dir)  unless File.exist?(test_dir)
+      expect(File.directory?(test_dir)).to eq true
 
       File.open(test_dir + '/test.rb', 'w') do |f|
         f.write <<-CONTENTS
@@ -101,7 +85,7 @@ puts 'I no have end quote
         CONTENTS
       end
 
-      File.exists?(test_dir + '/test.rb').should be_true
+      expect(File.exist?(test_dir + '/test.rb')).to eq true
     end
 
     after do
@@ -120,10 +104,7 @@ puts 'I no have end quote
 
     it 'uses the options from the rake task' do
       subject
-
-      expect {
-        rake['tailor'].invoke
-      }.to raise_error
+      expect { rake['tailor'].invoke }.to raise_error
     end
   end
 end

data/spec/functional/string_interpolation_spec.rb

@@ -15,7 +15,7 @@ describe 'String interpolation cases' do
   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 }

data/spec/functional/string_quoting_spec.rb

@@ -16,7 +16,7 @@ describe 'String Quoting' do
   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 }

data/spec/functional/vertical_spacing/class_length_spec.rb

@@ -2,27 +2,25 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 CLASS_LENGTH = {}
 CLASS_LENGTH['class_too_long'] =
-  %Q{class Party
+  %(class Party
   include Clowns
   include Pizza
 
   def barrel_roll
     puts 'DOABARRELROLL!'
   end
-end}
+end)
 
 CLASS_LENGTH['parent_class_too_long'] =
-  %Q{class Party
+  %(class Party
 
   class Pizza
     include Cheese
     include Yumminess
   end
-end}
-
+end)
 
 describe 'Detection of class length' do
   before do

data/spec/functional/vertical_spacing/method_length_spec.rb

@@ -2,25 +2,23 @@ require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-
 METHOD_LENGTH = {}
 METHOD_LENGTH['method_too_long'] =
-  %Q{def thing
+  %(def thing
   puts
   puts
-end}
+end)
 
 METHOD_LENGTH['parent_method_too_long'] =
-  %Q{def thing
+  %(def thing
   puts
   def inner_thing; print '1'; end
   puts
-end}
-
+end)
 
 describe 'Detection of method length' 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)
@@ -43,19 +41,19 @@ describe 'Detection of method length' do
 
   context 'single class too long' do
     let(:file_name) { 'method_too_long' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_method' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    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 'max_code_lines_in_method' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 
   context 'method in a method' do
     let(:file_name) { 'method_too_long' }
-    specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_method' }
-    specify { critic.problems[file_name].first[:line].should be 1 }
-    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 'max_code_lines_in_method' }
+    specify { expect(critic.problems[file_name].first[:line]).to eq 1 }
+    specify { expect(critic.problems[file_name].first[:column]).to eq 0 }
+    specify { expect(critic.problems[file_name].first[:level]).to eq :error }
   end
 end

data/spec/functional/vertical_spacing_spec.rb

@@ -6,7 +6,7 @@ require 'tailor/configuration/style'
 
 describe 'Vertical Space problem detection' do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
     FakeFS.activate!
   end
 
@@ -28,9 +28,9 @@ describe 'Vertical 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
 end