tailor 1.4.0 → 1.4.1

data/spec/unit/tailor/configuration_spec.rb

@@ -3,7 +3,7 @@ require 'tailor/configuration'
 require 'tailor/cli'
 
 describe Tailor::Configuration do
-  before { Tailor::Logger.stub(:log) }
+  before { allow(Tailor::Logger).to receive(:log) }
 
   subject do
     Tailor::Configuration.new('.')
@@ -13,14 +13,14 @@ describe Tailor::Configuration do
     context 'param is nil' do
       it 'returns the pre-exisiting @formatters' do
         subject.instance_variable_set(:@formatters, [:blah])
-        subject.formatters.should == [:blah]
+        expect(subject.formatters).to eq [:blah]
       end
     end
 
     context 'param is some value' do
       it 'sets @formatters to that value' do
         subject.formatters 'blah'
-        subject.instance_variable_get(:@formatters).should == ['blah']
+        expect(subject.instance_variable_get(:@formatters)).to eq ['blah']
       end
     end
   end
@@ -35,7 +35,7 @@ describe Tailor::Configuration do
         style.trailing_newlines 2
       end
 
-      subject.instance_variable_get(:@file_sets).should == {
+      expect(subject.instance_variable_get(:@file_sets)).to eq(
         bobo: {
           file_list: [],
           style: {
@@ -65,13 +65,13 @@ describe Tailor::Configuration do
             trailing_newlines: [2, { level: :error }]
           }
         }
-      }
+      )
     end
 
     context 'first param is nil' do
       it 'uses :default as the label' do
         subject.file_set
-        subject.instance_variable_get(:@file_sets).should include(:default)
+        expect(subject.instance_variable_get(:@file_sets)).to include(:default)
       end
     end
   end
@@ -81,14 +81,14 @@ describe Tailor::Configuration do
       it 'returns @config_file' do
         subject.instance_variable_set(:@config_file, 'pants')
         subject.config_file
-        subject.instance_variable_get(:@config_file).should == 'pants'
+        expect(subject.instance_variable_get(:@config_file)).to eq 'pants'
       end
     end
 
     context '@config_file is nil' do
       context 'DEFAULT_PROJECT_CONFIG exists' do
         before do
-          File.should_receive(:exists?).with(/\.tailor/).and_return true
+          expect(File).to receive(:exists?).with(/\.tailor/).and_return true
         end
 
         it "returns Dir.pwd + './tailor'" do
@@ -98,14 +98,14 @@ describe Tailor::Configuration do
 
       context 'DEFAULT_PROJECT_CONFIG does not exist' do
         before do
-          File.should_receive(:exists?).with(/\.tailor/).and_return false
-          File.should_receive(:exists?).with(/\.tailorrc/).and_return true
+          expect(File).to receive(:exists?).with(/\.tailor/).and_return false
+          expect(File).to receive(:exists?).with(/\.tailorrc/).and_return true
         end
 
         it 'returns DEFAULT_RC_FILE' do
           subject.config_file
-          subject.instance_variable_get(:@config_file).should ==
-            Tailor::Configuration::DEFAULT_RC_FILE
+          expect(subject.instance_variable_get(:@config_file)).
+            to eq Tailor::Configuration::DEFAULT_RC_FILE
         end
       end
     end
@@ -115,11 +115,13 @@ describe Tailor::Configuration do
     before do
       subject.instance_variable_set(:@file_sets, {})
     end
+
     it 'yields if a block is provided' do
       expect do |config|
         subject.recursive_file_set('*.rb', &config)
       end.to yield_control
     end
+
     it 'does not raise if a block is not provided' do
       expect { subject.recursive_file_set('*.rb') }.not_to raise_error
     end

data/spec/unit/tailor/formatter_spec.rb

@@ -22,7 +22,7 @@ describe Tailor::Formatter do
 
     context 'problems are empty' do
       it 'returns an empty Array' do
-        subject.problems_at_level({}, :error).should == []
+        expect(subject.problems_at_level({}, :error)).to eq []
       end
     end
 
@@ -31,7 +31,7 @@ describe Tailor::Formatter do
         msg = 'File contains invalid Ruby; '
         msg << 'run `ruby -c [your_file.rb]` for more details.'
 
-        subject.problems_at_level(problems, :warn).should == [
+        expect(subject.problems_at_level(problems, :warn)).to eq [
           {
             type: 'allow_invalid_ruby',
             line: 0,
@@ -45,7 +45,7 @@ describe Tailor::Formatter do
 
     context 'the level asked for does not exist in the problems' do
       it 'returns an empty Array' do
-        subject.problems_at_level(problems, :error).should == []
+        expect(subject.problems_at_level(problems, :error)).to eq []
       end
     end
   end

data/spec/unit/tailor/formatters/yaml_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'tailor/formatters/yaml'
 require 'yaml'
 
-
 describe Tailor::Formatters::Yaml do
   describe '#summary_report' do
     context 'no files have problems' do
@@ -16,7 +15,7 @@ describe Tailor::Formatters::Yaml do
       it 'returns YAML with no body' do
         result = subject.summary_report(problems)
         hash = YAML.load(result)
-        hash.should == {}
+        expect(hash).to eq({})
       end
     end
 
@@ -34,10 +33,10 @@ describe Tailor::Formatters::Yaml do
       it 'returns YAML that contains the problem file and its problem' do
         result = subject.summary_report(problems)
         hash = YAML.load(result)
-        hash.keys.size.should == 1
-        hash.keys.first.should == '/path_to/file1.rb'
-        hash.should_not include '/path_to/file2.rb'
-        hash['/path_to/file1.rb'].first[:type].should eq 'type1'
+        expect(hash.keys.size).to eq 1
+        expect(hash.keys.first).to eq '/path_to/file1.rb'
+        expect(hash).to_not include '/path_to/file2.rb'
+        expect(hash['/path_to/file1.rb'].first[:type]).to eq 'type1'
       end
     end
 
@@ -62,13 +61,13 @@ describe Tailor::Formatters::Yaml do
       it 'returns YAML that contains the problem files and their problems' do
         result = subject.summary_report(problems)
         hash = YAML.load(result)
-        hash.keys.size.should == 2
-        hash.keys.first.should == '/path_to/file1.rb'
-        hash.keys.last.should == '/path_to/file3.rb'
-        hash.should_not include '/path_to/file2.rb'
-        hash['/path_to/file1.rb'].first[:type].should eq 'type1'
-        hash['/path_to/file3.rb'].first[:type].should eq 'type2'
-        hash['/path_to/file3.rb'].last[:type].should eq 'type3'
+        expect(hash.keys.size).to eq 2
+        expect(hash.keys.first).to eq '/path_to/file1.rb'
+        expect(hash.keys.last).to eq '/path_to/file3.rb'
+        expect(hash).to_not include '/path_to/file2.rb'
+        expect(hash['/path_to/file1.rb'].first[:type]).to eq 'type1'
+        expect(hash['/path_to/file3.rb'].first[:type]).to eq 'type2'
+        expect(hash['/path_to/file3.rb'].last[:type]).to eq 'type3'
       end
     end
   end

data/spec/unit/tailor/lexed_line_spec.rb

@@ -3,7 +3,7 @@ require 'tailor/lexed_line'
 
 describe Tailor::LexedLine do
   before do
-    Tailor::Logger.stub(:log)
+    allow(Tailor::Logger).to receive(:log)
   end
 
   subject { Tailor::LexedLine.new(lexed_output, 1) }
@@ -29,7 +29,7 @@ describe Tailor::LexedLine do
     it 'returns all lexed output from line 1 when self.lineno is 1' do
       line = Tailor::LexedLine.new(lexed_output, 1)
 
-      line.should == [
+      expect(line).to eq [
         [[1, 0], :on_ident, 'require'],
         [[1, 7], :on_sp, ' '],
         [[1, 8], :on_tstring_beg, "'"],
@@ -44,24 +44,24 @@ describe Tailor::LexedLine do
     context '0 length line, no \n ending' do
       let(:lexed_output) { [[[1, 0], :on_sp, '  ']] }
 
-      it 'should return true' do
-        subject.only_spaces?.should be_true
+      it 'is true' do
+        expect(subject.only_spaces?).to eq true
       end
     end
 
     context '0 length line, with \n ending' do
       let(:lexed_output) { [[[1, 0], :on_nl, "\n"]] }
 
-      it 'should return true' do
-        subject.only_spaces?.should be_true
+      it 'is true' do
+        expect(subject.only_spaces?).to eq true
       end
     end
 
     context 'comment line, starting at column 0' do
       let(:lexed_output) { [[[1, 0], :on_comment, '# comment']] }
 
-      it 'should return false' do
-        subject.only_spaces?.should be_false
+      it 'is false' do
+        expect(subject.only_spaces?).to eq false
       end
     end
 
@@ -73,8 +73,8 @@ describe Tailor::LexedLine do
         ]
       end
 
-      it 'should return false' do
-        subject.only_spaces?.should be_false
+      it 'is false' do
+        expect(subject.only_spaces?).to eq false
       end
     end
 
@@ -90,8 +90,8 @@ describe Tailor::LexedLine do
         ]
       end
 
-      it 'should return false' do
-        subject.only_spaces?.should be_false
+      it 'is false' do
+        expect(subject.only_spaces?).to eq false
       end
     end
   end
@@ -113,7 +113,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns true' do
-        subject.ends_with_op?.should be_true
+        expect(subject.ends_with_op?).to eq true
       end
     end
 
@@ -130,7 +130,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns false' do
-        subject.ends_with_op?.should be_false
+        expect(subject.ends_with_op?).to eq false
       end
     end
   end
@@ -148,10 +148,10 @@ describe Tailor::LexedLine do
         ]
       end
 
-      before { subject.stub(:ends_with_kw?).and_return true }
+      before { allow(subject).to receive(:ends_with_kw?).and_return true }
 
       it 'returns false' do
-        subject.ends_with_modifier_kw?.should be_false
+        expect(subject.ends_with_modifier_kw?).to eq false
       end
     end
 
@@ -173,29 +173,25 @@ describe Tailor::LexedLine do
 
       context 'the keyword is a modifier' do
         before do
-          token.stub(:modifier_keyword?).and_return true
-          Tailor::Lexer::Token.stub(:new).and_return token
-          subject.stub(:ends_with_kw?).and_return true
+          allow(token).to receive(:modifier_keyword?).and_return true
+          allow(Tailor::Lexer::Token).to receive(:new).and_return token
+          allow(subject).to receive(:ends_with_kw?).and_return true
         end
 
-        after { Tailor::Lexer::Token.unstub(:new) }
-
         it 'returns true' do
-          subject.ends_with_modifier_kw?.should be_true
+          expect(subject.ends_with_modifier_kw?).to eq true
         end
       end
 
       context 'the keyword is not a modifier' do
         before do
-          token.stub(:modifier_keyword?).and_return false
-          Tailor::Lexer::Token.stub(:new).and_return token
-          subject.stub(:ends_with_kw?).and_return true
+          allow(token).to receive(:modifier_keyword?).and_return false
+          allow(Tailor::Lexer::Token).to receive(:new).and_return token
+          allow(subject).to receive(:ends_with_kw?).and_return true
         end
 
-        after { Tailor::Lexer::Token.unstub(:new) }
-
-        it 'returns true' do
-          subject.ends_with_modifier_kw?.should be_false
+        it 'returns false' do
+          expect(subject.ends_with_modifier_kw?).to eq false
         end
       end
     end
@@ -214,13 +210,13 @@ describe Tailor::LexedLine do
 
     context 'line ends with the event' do
       it 'returns true' do
-        subject.does_line_end_with(:on_sp).should be_true
+        expect(subject.does_line_end_with(:on_sp)).to eq true
       end
     end
 
     context 'line does not even with event' do
       it 'returns false' do
-        subject.does_line_end_with(:on_kw).should be_false
+        expect(subject.does_line_end_with(:on_kw)).to eq false
       end
     end
   end
@@ -238,7 +234,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns the space' do
-        subject.last_non_line_feed_event.should == [[1, 9], :on_sp, ' ']
+        expect(subject.last_non_line_feed_event).to eq [[1, 9], :on_sp, ' ']
       end
     end
 
@@ -253,7 +249,8 @@ describe Tailor::LexedLine do
       end
 
       it 'returns the event before it' do
-        subject.last_non_line_feed_event.should == [[1, 4], :on_ident, 'thing']
+        expect(subject.last_non_line_feed_event).
+          to eq [[1, 4], :on_ident, 'thing']
       end
     end
   end
@@ -272,7 +269,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns true' do
-        subject.loop_with_do?.should be_true
+        expect(subject.loop_with_do?).to eq true
       end
     end
 
@@ -288,7 +285,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns false' do
-        subject.loop_with_do?.should be_false
+        expect(subject.loop_with_do?).to eq false
       end
     end
 
@@ -305,7 +302,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns true' do
-        subject.loop_with_do?.should be_true
+        expect(subject.loop_with_do?).to eq true
       end
     end
 
@@ -321,7 +318,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns false' do
-        subject.loop_with_do?.should be_false
+        expect(subject.loop_with_do?).to eq false
       end
     end
 
@@ -344,7 +341,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns true' do
-        subject.loop_with_do?.should be_true
+        expect(subject.loop_with_do?).to eq true
       end
     end
 
@@ -366,7 +363,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns false' do
-        subject.loop_with_do?.should be_false
+        expect(subject.loop_with_do?).to eq false
       end
     end
   end
@@ -376,15 +373,15 @@ describe Tailor::LexedLine do
       let(:lexed_output) { [[[1, 0], :on_sp, '     ']] }
 
       it 'returns nil' do
-        subject.first_non_space_element.should be_nil
+        expect(subject.first_non_space_element).to be_nil
       end
     end
 
-    context "lexed line contains only \\n" do
+    context 'lexed line contains only \n' do
       let(:lexed_output) { [[[1, 0], :on_ignored_nl, "\n"]] }
 
       it 'returns nil' do
-        subject.first_non_space_element.should be_nil
+        expect(subject.first_non_space_element).to be_nil
       end
     end
 
@@ -397,8 +394,8 @@ describe Tailor::LexedLine do
         ]
       end
 
-      it 'returns nil' do
-        subject.first_non_space_element.should == [[1, 2], :on_rbrace, '}']
+      it 'returns the token array' do
+        expect(subject.first_non_space_element).to eq [[1, 2], :on_rbrace, '}']
       end
     end
   end
@@ -408,13 +405,13 @@ describe Tailor::LexedLine do
 
     context 'self contains an event at the given column' do
       it 'returns that event' do
-        subject.event_at(0).should == lexed_output.first
+        expect(subject.event_at(0)).to eq lexed_output.first
       end
     end
 
     context 'self does not contain an event at the given column' do
       it 'returns nil' do
-        subject.event_at(1234).should be_nil
+        expect(subject.event_at(1234)).to be_nil
       end
     end
   end
@@ -423,13 +420,13 @@ describe Tailor::LexedLine do
     let(:lexed_output) { [[[1, 0], :on_sp, '     ']] }
 
     context '#event_at returns nil' do
-      before { subject.stub(:event_at).and_return nil }
-      specify { subject.event_index(1234).should be_nil }
+      before { allow(subject).to receive(:event_at).and_return nil }
+      specify { expect(subject.event_index(1234)).to be_nil }
     end
 
     context '#event_at returns a valid column' do
       it 'returns the event' do
-        subject.event_index(0).should be_zero
+        expect(subject.event_index(0)).to be_zero
       end
     end
   end
@@ -446,7 +443,7 @@ describe Tailor::LexedLine do
     end
 
     it "returns the String made up of self's tokens" do
-      subject.to_s.should == "def thing \n"
+      expect(subject.to_s).to eq "def thing \n"
     end
   end
 
@@ -471,7 +468,7 @@ describe Tailor::LexedLine do
         end
 
         it 'replaces the comment with an :on_ignored_nl' do
-          subject.remove_trailing_comment(file_text).should == [
+          expect(subject.remove_trailing_comment(file_text)).to eq [
             [[1, 0], :on_kw, 'def'],
             [[1, 3], :on_sp, ' '],
             [[1, 4], :on_ident, 'thing'],
@@ -501,7 +498,7 @@ describe Tailor::LexedLine do
         end
 
         it 'replaces the comment with an :on_ignored_nl' do
-          subject.remove_trailing_comment(file_text).should == [
+          expect(subject.remove_trailing_comment(file_text)).to eq [
             [[1, 0], :on_kw, 'def'],
             [[1, 3], :on_sp, ' '],
             [[1, 4], :on_ident, 'thing'],
@@ -533,7 +530,7 @@ describe Tailor::LexedLine do
         end
 
         it 'replaces the comment with an :on_nl' do
-          subject.remove_trailing_comment(file_text).should == [
+          expect(subject.remove_trailing_comment(file_text)).to eq [
             [[1, 0], :on_kw, 'def'],
             [[1, 3], :on_sp, ' '],
             [[1, 4], :on_ident, 'thing'],
@@ -561,7 +558,7 @@ describe Tailor::LexedLine do
         end
 
         it 'replaces the comment with an :on_nl' do
-          subject.remove_trailing_comment(file_text).should == [
+          expect(subject.remove_trailing_comment(file_text)).to eq [
             [[1, 0], :on_kw, 'def'],
             [[1, 3], :on_sp, ' '],
             [[1, 4], :on_ident, 'thing'],
@@ -572,8 +569,8 @@ describe Tailor::LexedLine do
         end
 
         it 'returns a LexedLine' do
-          subject.remove_trailing_comment(file_text).
-            should be_a Tailor::LexedLine
+          expect(subject.remove_trailing_comment(file_text)).
+            to be_a Tailor::LexedLine
         end
       end
     end
@@ -586,7 +583,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns true' do
-        subject.end_of_multi_line_string?.should be_true
+        expect(subject.end_of_multi_line_string?).to eq true
       end
     end
 
@@ -595,8 +592,8 @@ describe Tailor::LexedLine do
         [[[1, 11], :on_comma, ','], [[1, 12], :on_nl, "\n"]]
       end
 
-      it 'returns true' do
-        subject.end_of_multi_line_string?.should be_false
+      it 'returns false' do
+        expect(subject.end_of_multi_line_string?).to eq false
       end
     end
 
@@ -609,8 +606,8 @@ describe Tailor::LexedLine do
         ]
       end
 
-      it 'returns true' do
-        subject.end_of_multi_line_string?.should be_false
+      it 'returns false' do
+        expect(subject.end_of_multi_line_string?).to eq false
       end
     end
   end
@@ -626,10 +623,11 @@ describe Tailor::LexedLine do
       end
 
       before do
-        subject.stub(:last_non_line_feed_event).and_return last_event
+        allow(subject).to receive(:last_non_line_feed_event).
+          and_return last_event
       end
 
-      specify { subject.is_line_only_a(:on_period).should be_false }
+      specify { expect(subject.is_line_only_a(:on_period)).to eq false }
     end
 
     context 'last event is the last event passed in' do
@@ -641,7 +639,7 @@ describe Tailor::LexedLine do
             [[1, 12], :on_nl, "\n"]]
         end
 
-        specify { subject.is_line_only_a(:on_comma).should be_true }
+        specify { expect(subject.is_line_only_a(:on_comma)).to eq true }
       end
 
       context 'there is non-spaces before the last event' do
@@ -653,7 +651,7 @@ describe Tailor::LexedLine do
             [[1, 12], :on_nl, "\n"]]
         end
 
-        specify { subject.is_line_only_a(:on_comma).should be_false }
+        specify { expect(subject.is_line_only_a(:on_comma)).to eq false }
       end
     end
   end
@@ -669,7 +667,7 @@ describe Tailor::LexedLine do
       end
 
       it 'returns false' do
-        subject.keyword_is_symbol?.should be_false
+        expect(subject.keyword_is_symbol?).to eq false
       end
     end
 
@@ -682,7 +680,7 @@ describe Tailor::LexedLine do
         end
 
         it 'returns false' do
-          subject.keyword_is_symbol?.should be_false
+          expect(subject.keyword_is_symbol?).to eq false
         end
       end
 
@@ -695,7 +693,7 @@ describe Tailor::LexedLine do
         end
 
         it 'returns false' do
-          subject.keyword_is_symbol?.should be_false
+          expect(subject.keyword_is_symbol?).to eq false
         end
       end
 
@@ -709,7 +707,7 @@ describe Tailor::LexedLine do
         end
 
         it 'returns true' do
-          subject.keyword_is_symbol?.should be_true
+          expect(subject.keyword_is_symbol?).to eq true
         end
       end
     end