0
@@ -124,7 +124,7 @@ module Merb
0
     def log_file
0
       if Merb::Config[:log_file]
0
         Merb::Config[:log_file]
0
-      elsif $TESTING
0
+      elsif Merb.testing?
0
         log_path / "merb_test.log"
0
       elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster])
0
         STDOUT
0
@@ -193,14 +193,22 @@ module Merb
0
     def frozen!
0
       @frozen = true
0
     end
0
-
0
+    
0
+    # Load configuration and assign logger.
0
+    #
0
+    # ==== Parameters
0
+    # options<Hash>:: Options to pass on to the Merb config.
0
+    def load_config(options = {})
0
+      Merb::Config.setup({ :log_file => STDOUT, :log_level => :warn, :log_auto_flush => true }.merge(options))
0
+      Merb::BootLoader::Logger.run
0
+    end
0
+    
0
     # Load all basic dependencies (selected BootLoaders only).
0
     #
0
     # ==== Parameters
0
     # options<Hash>:: Options to pass on to the Merb config.
0
     def load_dependencies(options = {})
0
-      Merb::Config.setup({ :log_file => $stdout, :log_level => :warn, :log_auto_flush => true }.merge(options))
0
-      Merb::BootLoader::Logger.run
0
+      load_config(options)
0
       Merb::BootLoader::BuildFramework.run
0
       Merb::BootLoader::Dependencies.run
0
       Merb::BootLoader::BeforeAppRuns.run
0
@@ -210,6 +218,12 @@ module Merb
0
     def reload
0
       Merb::BootLoader::ReloadClasses.reload
0
     end
0
+    
0
+    # ==== Returns
0
+    # Boolean:: True if Merb is running via script/frozen-merb or other freezer.
0
+    def testing?
0
+      $TESTING || Merb::Config[:testing]
0
+    end
0
 
0
     # If block was given configures using the block.
0
     #
0
@@ -287,4 +301,4 @@ require 'merb-core/controller/mime'
0
 require 'merb-core/vendor/facets'
0
 
0
 # Set the environment if it hasn't already been set.
0
-Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || ($TESTING ? 'test' : 'development')
0
\ No newline at end of file
0
+Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development')
0
\ No newline at end of file

0
@@ -125,4 +125,15 @@ describe Merb::Config do
0
     Merb.disabled?(:foo, :buz).should == true
0
   end
0
   
0
+  it "should take Merb.testing? into account" do
0
+    $TESTING.should == true
0
+    Merb::Config[:testing].should be_nil
0
+    Merb.should be_testing
0
+    $TESTING = false
0
+    Merb.should_not be_testing
0
+    Merb::Config[:testing] = true
0
+    Merb.should be_testing
0
+    $TESTING = true; Merb::Config[:testing] = false # reset
0
+  end
0
+  
0
 end
0
\ No newline at end of file

0
@@ -1,5 +1,4 @@
0
 $TESTING=true
0
-
0
 require "rubygems"
0
 require "spec"
0
 require File.join(File.dirname(__FILE__), "..", "lib", "merb-core")