@@ -9,9 +9,8 @@ require 'merb-core' $RAKE_ENV = true -init_file = File.join(File.dirname(__FILE__) / "config" / "init") - -Merb.load_dependencies(init_file) +init_env = ENV['MERB_ENV'] || 'rake' +Merb.load_dependencies(:environment => init_env) include FileUtils Merb::Plugins.rakefiles.each {|r| require r } Rakefile @@ -1,6 +1,6 @@ puts "Loaded DEVELOPMENT Environment..." -Merb::Config.use { |c| +Merb::Config.use do |c| c[:exception_details] = true c[:reload_classes] = true c[:reload_time] = 0.5 -} \ No newline at end of file +end config/environments/development.rb @@ -4,14 +4,12 @@ puts "Started merb_init.rb ..." # Your app's dependencies, including your database layer (if any) are defined # in config/dependencies.rb -require File.join(Merb.root, 'config', 'dependencies') +#require Merb.root / 'config' / 'dependencies' # Here's where your controllers, helpers, and models, etc. get loaded. If you # need to change the order of things, just move the call to 'load_application' # around this file. -puts "Loading Application..." -Merb::BootLoader.load_application # Load environment-specific configuration -environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment + '.rb') +environment_config = Merb.root / 'config' / 'environments' / Merb.environment + '.rb' require environment_config if File.exist?(environment_config) config/merb_init.rb @@ -1,14 +1,11 @@ require 'rubygems' require 'merb-core' -require 'merb-test' dir = File.dirname(__FILE__) require dir / "helpers" / "merb_helpers" -require 'merb-core/test/request_helper' -require 'merb-core/test/fake_request' +require 'merb-core/test/helpers' -$TESTING=true -Merb.start :environment => 'test' +Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') require "#{dir}/spec_helpers/core" require "#{dir}/spec_helpers/custom_matchers" @@ -26,4 +23,4 @@ def mock_model(klass, fields = {}) end model -end \ No newline at end of file +end spec/spec_helper.rb @@ -1,6 +1,6 @@ describe "default controller behavior", :shared => true do before(:each) do - @controller_instance = controller_class.new(Merb::Test::FakeRequest.new) + @controller_instance = controller_class.new(Merb::Test::RequestHelper::FakeRequest.new) model_class.delete_all end spec/spec_helpers/shared_behaviors/default_controller_behavior.rb a4a64804e50e4226caae85b9bb7952b53cc98165 Sean Braithwaite brapse@kui-box.local http://github.com/hornbeck/blerb-core/commit/cfbe86545f97d2a058abf3fe7b63bfb22a5c9c3d cfbe86545f97d2a058abf3fe7b63bfb22a5c9c3d 2008-03-24T14:14:32-07:00 2008-03-24T14:14:32-07:00 Adjusted spec to reflect changes in merb-core - changed rakefile/spec loading mechanism - fixed requiring of merb-core test harness - spec should be running f78b19b6fb2d42b6e0fdeb4fbf579c6cee38d2e9 Sean Braithwaite brapse@kui-box.local