From e050b900796d559d899714ad5e8e31c0e39a7a0a Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 1 Mar 2016 23:11:43 -0800 Subject: Update to rspec 3.X format It's possible the specs need more cleanup. I only focuses on deprecation messages. --- mixlib-log.gemspec | 2 +- spec/mixlib/log/formatter_spec.rb | 10 +++++----- spec/mixlib/log_spec.rb | 40 +++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/mixlib-log.gemspec b/mixlib-log.gemspec index e9c8ef2..a735341 100644 --- a/mixlib-log.gemspec +++ b/mixlib-log.gemspec @@ -14,6 +14,6 @@ Gem::Specification.new do |gem| gem.extra_rdoc_files = ["README.md", "LICENSE", "NOTICE"] gem.files = Dir["lib/**/*"] + Dir["spec/**/*"] + ["Gemfile", "Rakefile", ".gemtest", "mixlib-log.gemspec"] gem.add_development_dependency "rake" - gem.add_development_dependency "rspec", "~> 2.10" + gem.add_development_dependency "rspec", "~> 3.4" gem.add_development_dependency "cucumber" end diff --git a/spec/mixlib/log/formatter_spec.rb b/spec/mixlib/log/formatter_spec.rb index 5cb6d39..f4d664b 100644 --- a/spec/mixlib/log/formatter_spec.rb +++ b/spec/mixlib/log/formatter_spec.rb @@ -25,27 +25,27 @@ describe Mixlib::Log::Formatter do end it "should print raw strings with msg2str(string)" do - @formatter.msg2str("nuthin new").should == "nuthin new" + expect(@formatter.msg2str("nuthin new")).to eq("nuthin new") end it "should format exceptions properly with msg2str(e)" do e = IOError.new("legendary roots crew") - @formatter.msg2str(e).should == "legendary roots crew (IOError)\n" + expect(@formatter.msg2str(e)).to eq("legendary roots crew (IOError)\n") end it "should format random objects via inspect with msg2str(Object)" do - @formatter.msg2str([ "black thought", "?uestlove" ]).should == '["black thought", "?uestlove"]' + expect(@formatter.msg2str([ "black thought", "?uestlove" ])).to eq('["black thought", "?uestlove"]') end it "should return a formatted string with call" do time = Time.new Mixlib::Log::Formatter.show_time = true - @formatter.call("monkey", time, "test", "mos def").should == "[#{time.iso8601}] monkey: mos def\n" + expect(@formatter.call("monkey", time, "test", "mos def")).to eq("[#{time.iso8601}] monkey: mos def\n") end it "should allow you to turn the time on and off in the output" do Mixlib::Log::Formatter.show_time = false - @formatter.call("monkey", Time.new, "test", "mos def").should == "monkey: mos def\n" + expect(@formatter.call("monkey", Time.new, "test", "mos def")).to eq("monkey: mos def\n") end end diff --git a/spec/mixlib/log_spec.rb b/spec/mixlib/log_spec.rb index 984aee0..22b3758 100644 --- a/spec/mixlib/log_spec.rb +++ b/spec/mixlib/log_spec.rb @@ -49,7 +49,7 @@ describe Mixlib::Log do io = StringIO.new Logit.init(io) Logit << "foo" - io.string.should match(/foo/) + expect(io.string).to match(/foo/) end it "creates a logger with a file name" do @@ -57,7 +57,7 @@ describe Mixlib::Log do Logit.init(tempfile.path) Logit << "bar" tempfile.rewind - tempfile.read.should match(/bar/) + expect(tempfile.read).to match(/bar/) end end @@ -65,18 +65,18 @@ describe Mixlib::Log do logger = LoggerLike.new Logit.init(logger) Logit.debug "qux" - logger.messages.should match(/qux/) + expect(logger.messages).to match(/qux/) end it "should re-initialize the logger if init is called again" do first_logdev, second_logdev = StringIO.new, StringIO.new Logit.init(first_logdev) Logit.fatal "FIRST" - first_logdev.string.should match(/FIRST/) + expect(first_logdev.string).to match(/FIRST/) Logit.init(second_logdev) Logit.fatal "SECOND" - first_logdev.string.should_not match(/SECOND/) - second_logdev.string.should match(/SECOND/) + expect(first_logdev.string).to_not match(/SECOND/) + expect(second_logdev.string).to match(/SECOND/) end it "should set the log level using the binding form, with :debug, :info, :warn, :error, or :fatal" do @@ -89,8 +89,8 @@ describe Mixlib::Log do } levels.each do |symbol, constant| Logit.level = symbol - Logit.logger.level.should == constant - Logit.level.should == symbol + expect(Logit.logger.level).to eq(constant) + expect(Logit.level).to eq(symbol) end end @@ -98,7 +98,7 @@ describe Mixlib::Log do logdev = StringIO.new Logit.init(logdev) Logit.fatal { "the_message" } - logdev.string.should match(/the_message/) + expect(logdev.string).to match(/the_message/) end it "should set the log level using the method form, with :debug, :info, :warn, :error, or :fatal" do @@ -111,45 +111,43 @@ describe Mixlib::Log do } levels.each do |symbol, constant| Logit.level(symbol) - Logit.logger.level.should == constant + expect(Logit.logger.level).to eq(constant) end end it "should raise an ArgumentError if you try and set the level to something strange using the binding form" do - lambda { Logit.level = :the_roots }.should raise_error(ArgumentError) + expect(lambda { Logit.level = :the_roots }).to raise_error(ArgumentError) end it "should raise an ArgumentError if you try and set the level to something strange using the method form" do - lambda { Logit.level(:the_roots) }.should raise_error(ArgumentError) + expect(lambda { Logit.level(:the_roots) }).to raise_error(ArgumentError) end it "should pass other method calls directly to logger" do Logit.level = :debug - Logit.should be_debug - lambda { Logit.debug("Gimme some sugar!") }.should_not raise_error + expect(Logit).to be_debug + expect(lambda { Logit.debug("Gimme some sugar!") }).to_not raise_error end it "should pass add method calls directly to logger" do logdev = StringIO.new Logit.init(logdev) Logit.level = :debug - Logit.should be_debug - lambda { Logit.add(Logger::DEBUG, "Gimme some sugar!") }.should_not raise_error - logdev.string.should match(/Gimme some sugar/) + expect(Logit).to be_debug + expect(lambda { Logit.add(Logger::DEBUG, "Gimme some sugar!") }).to_not raise_error + expect(logdev.string).to match(/Gimme some sugar/) end it "should default to STDOUT if init is called with no arguments" do logger_mock = Struct.new(:formatter, :level).new - Logger.stub!(:new).and_return(logger_mock) - Logger.should_receive(:new).with(STDOUT).and_return(logger_mock) + expect(Logger).to receive(:new).with(STDOUT).and_return(logger_mock) Logit.init end it "should have by default a base log level of warn" do logger_mock = Struct.new(:formatter, :level).new - Logger.stub!(:new).and_return(logger_mock) Logit.init - Logit.level.should eql(:warn) + expect(Logit.level).to eq(:warn) end end -- cgit v1.2.1