@@ -124,7 +124,7 @@ module Merb def log_file if Merb::Config[:log_file] Merb::Config[:log_file] - elsif $TESTING + elsif Merb.testing? log_path / "merb_test.log" elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster]) STDOUT @@ -193,14 +193,22 @@ module Merb def frozen! @frozen = true end - + + # Load configuration and assign logger. + # + # ==== Parameters + # options<Hash>:: Options to pass on to the Merb config. + def load_config(options = {}) + Merb::Config.setup({ :log_file => STDOUT, :log_level => :warn, :log_auto_flush => true }.merge(options)) + Merb::BootLoader::Logger.run + end + # Load all basic dependencies (selected BootLoaders only). # # ==== Parameters # options<Hash>:: Options to pass on to the Merb config. def load_dependencies(options = {}) - Merb::Config.setup({ :log_file => $stdout, :log_level => :warn, :log_auto_flush => true }.merge(options)) - Merb::BootLoader::Logger.run + load_config(options) Merb::BootLoader::BuildFramework.run Merb::BootLoader::Dependencies.run Merb::BootLoader::BeforeAppRuns.run @@ -210,6 +218,12 @@ module Merb def reload Merb::BootLoader::ReloadClasses.reload end + + # ==== Returns + # Boolean:: True if Merb is running via script/frozen-merb or other freezer. + def testing? + $TESTING || Merb::Config[:testing] + end # If block was given configures using the block. # @@ -287,4 +301,4 @@ require 'merb-core/controller/mime' require 'merb-core/vendor/facets' # Set the environment if it hasn't already been set. -Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || ($TESTING ? 'test' : 'development') \ No newline at end of file +Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development') \ No newline at end of file lib/merb-core.rb @@ -125,4 +125,15 @@ describe Merb::Config do Merb.disabled?(:foo, :buz).should == true end + it "should take Merb.testing? into account" do + $TESTING.should == true + Merb::Config[:testing].should be_nil + Merb.should be_testing + $TESTING = false + Merb.should_not be_testing + Merb::Config[:testing] = true + Merb.should be_testing + $TESTING = true; Merb::Config[:testing] = false # reset + end + end \ No newline at end of file spec/private/config/config_spec.rb @@ -1,5 +1,4 @@ $TESTING=true - require "rubygems" require "spec" require File.join(File.dirname(__FILE__), "..", "lib", "merb-core") spec/spec_helper.rb ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/209ab5ce04f2b2b2579a12228139653af5049616 209ab5ce04f2b2b2579a12228139653af5049616 2008-03-11T01:47:18-07:00 2008-03-11T01:47:18-07:00 Added Merb.testing? method This will check for either $TESTING (as used by merb internals/plugins) or Merb::Config[:testing], which can be set in the config options. Having an option like this provides a nice interface for the more public facing parts of Merb; the auto-generated spec_helper.rb file for example can just use the test environment setting. 5808a4b8ce659b0e877393cdd972b09af6fc3d11 Fabien Franzen info@atelierfabien.be