@@ -6,3 +6,4 @@ log/*.pid config/database.yml config/settings.yml gems +*.pid .gitignore @@ -28,14 +28,10 @@ use_orm :datamapper ### Add your other dependencies here -dependency "merb-mailer" -dependency "merb-assets" -dependency "merb_helpers" ### This defines which test framework the generators will use ### rspec is turned on by default # use_test :test_unit -require "merb_rspec" use_test :rspec # These are some examples of how you might specify dependencies. @@ -46,6 +42,13 @@ use_test :rspec # OR # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" +# temporary fix untill the plugins work correctly +Merb::BootLoader.before_app_loads do + dependency "merb-mailer" + dependency "merb_helpers" + dependency "merb-assets" +end + Merb::BootLoader.after_app_loads do ### Add dependencies here that must load after the application loads: config/init.rb @@ -20,13 +20,9 @@ require "#{dir}/spec_helpers/app_specific" DataMapper::Persistence.auto_migrate! Spec::Runner.configure do |config| - config.include(Merb::Test::Helper) - config.include(Merb::Test::RequestHelper) - config.include(Merb::Test::RspecMatchers) - # TODO should the next two get automagically included somewhere else? - config.include(Merb::Test::Rspec::ControllerMatchers) - config.include(Merb::Test::Rspec::MarkupMatchers) - + config.include(Merb::Test::ControllerHelper) + config.include(Merb::Test::ViewHelper) + config.include(Merb::Test::RouteHelper) end ### METHODS BELOW THIS LINE SHOULD BE EXTRACTED TO MERB ITSELF spec/spec_helper.rb @@ -37,7 +37,7 @@ describe "default controller behavior", :shared => true do describe "#show" do it "should fail for a model that doesn't exist" do if controller_instance.respond_to? :show - calling {dispatch_to(controller_class, :show, :id => invalid_id)}. + lambda {dispatch_to(controller_class, :show, :id => invalid_id)}. should raise_error(Merb::ControllerExceptions::NotFound) end end spec/spec_helpers/shared_behaviors/default_controller_behavior.rb 7fae3eaa7564a108f9ac6262bceb331ad56ab9be Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/306733f232f6060717c6abd57e33c806ece489e5 306733f232f6060717c6abd57e33c806ece489e5 2008-02-24T13:01:25-08:00 2008-02-24T13:01:25-08:00 all specs are passing. Updated the spec_helper, added temporary fix to init.rb e065c761b06554b058cc519371d9a29b020e7335 Ben Burkert ben@benburkert.com