diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-03-04 09:01:53 -0800 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-03-04 09:01:53 -0800 |
| commit | 0dee0929cf660f02e474ee488e54a37b15b8c79d (patch) | |
| tree | 15d18c719700ee56c417b4a43119a1faec62059a /spec | |
| parent | 7cf27dd96755216d14507bc6baeda3e50bbd64ea (diff) | |
| download | mixlib-log-0dee0929cf660f02e474ee488e54a37b15b8c79d.tar.gz | |
upgrade to rspec 2
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mixlib/log_spec.rb | 3 | ||||
| -rw-r--r-- | spec/spec.opts | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/spec/mixlib/log_spec.rb b/spec/mixlib/log_spec.rb index d064871..57c8a5b 100644 --- a/spec/mixlib/log_spec.rb +++ b/spec/mixlib/log_spec.rb @@ -18,6 +18,7 @@ # require 'tempfile' +require 'stringio' require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper")) describe Mixlib::Log do @@ -98,7 +99,7 @@ describe Mixlib::Log do end it "should default to STDOUT if init is called with no arguments" do - logger_mock = mock(Logger, :null_object => true) + logger_mock = Struct.new(:formatter, :level).new Logger.stub!(:new).and_return(logger_mock) Logger.should_receive(:new).with(STDOUT).and_return(logger_mock) Logit.init diff --git a/spec/spec.opts b/spec/spec.opts deleted file mode 100644 index 7636dbe..0000000 --- a/spec/spec.opts +++ /dev/null @@ -1,4 +0,0 @@ ---colour ---format specdoc ---loadby mtime ---reverse |