0
@@ -37,14 +37,14 @@ describe Merb::Logger do
0
 
0
     it "should set the log level to :warn (4) when second parameter is :warn" do
0
       Merb::Config[:log_level] = :warn
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
       Merb.logger.level.should == 4
0
     end
0
 
0
     it "should set the log level to :debug (0) when Merb.environment is development" do
0
       Merb.environment = "development"
0
       Merb::Config.delete(:log_level)
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
       Merb::BootLoader::Logger.run
0
       Merb.logger.level.should == 0
0
     end
0
@@ -52,7 +52,7 @@ describe Merb::Logger do
0
     it "should set the log level to :error (6) when Merb.environment is production" do
0
       Merb.environment = "production"
0
       Merb::Config.delete(:log_level)
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
       Merb::BootLoader::Logger.run
0
       Merb.logger.level.should == 4
0
     end
0
@@ -63,7 +63,7 @@ describe Merb::Logger do
0
 
0
     it 'allows level value be specified as a String' do
0
       Merb::Config[:log_level] = 'warn'
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
       Merb.logger.level.should == 4
0
     end
0
   end
0
@@ -72,7 +72,7 @@ describe Merb::Logger do
0
   describe "#flush" do
0
     it "should immediately return if the buffer is empty" do
0
       Merb::Config[:log_stream] = StringIO.new
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
 
0
       Merb.logger.flush
0
       Merb::Config[:log_stream].string.should == ""
0
@@ -80,7 +80,7 @@ describe Merb::Logger do
0
 
0
     it "should call the write_method with the stringified contents of the buffer if the buffer is non-empty" do
0
       Merb::Config[:log_stream] = StringIO.new
0
-      Merb.logger = nil
0
+      Merb.reset_logger!
0
 
0
       Merb.logger << "a message"
0
       Merb.logger << "another message"
0
@@ -97,7 +97,7 @@ describe Merb::Logger do
0
 
0
   def set_level(level)
0
     Merb::Config[:log_level] = level
0
-    Merb.logger = nil
0
+    Merb.reset_logger!
0
   end
0
 
0
   # Spec examples below all use log_with_method

0
@@ -111,7 +111,7 @@ Spec::Runner.configure do |config|
0
   def with_level(level)
0
     Merb::Config[:log_stream] = StringIO.new
0
     Merb::Config[:log_level] = level
0
-    Merb.logger = nil
0
+    Merb.reset_logger!
0
     yield
0
     Merb::Config[:log_stream]
0
   end