0
@@ -6,3 +6,4 @@ log/*.pid
0
 config/database.yml
0
 config/settings.yml
0
 gems
0
+*.pid

0
@@ -28,14 +28,10 @@ use_orm :datamapper
0
 
0
 ### Add your other dependencies here
0
 
0
-dependency "merb-mailer"
0
-dependency "merb-assets"
0
-dependency "merb_helpers"
0
 
0
 ### This defines which test framework the generators will use
0
 ### rspec is turned on by default
0
 # use_test :test_unit
0
-require "merb_rspec"
0
 use_test :rspec
0
 
0
 # These are some examples of how you might specify dependencies.
0
@@ -46,6 +42,13 @@ use_test :rspec
0
 # OR
0
 # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
0
 
0
+# temporary fix untill the plugins work correctly
0
+Merb::BootLoader.before_app_loads do
0
+  dependency "merb-mailer"
0
+  dependency "merb_helpers"
0
+  dependency "merb-assets"
0
+end
0
+
0
 Merb::BootLoader.after_app_loads do
0
   ### Add dependencies here that must load after the application loads:
0
 

0
@@ -20,13 +20,9 @@ require "#{dir}/spec_helpers/app_specific"
0
 DataMapper::Persistence.auto_migrate!
0
 
0
 Spec::Runner.configure do |config|
0
-    config.include(Merb::Test::Helper)
0
-    config.include(Merb::Test::RequestHelper)
0
-    config.include(Merb::Test::RspecMatchers)
0
-    # TODO should the next two get automagically included somewhere else?
0
-    config.include(Merb::Test::Rspec::ControllerMatchers)
0
-    config.include(Merb::Test::Rspec::MarkupMatchers)
0
-    
0
+  config.include(Merb::Test::ControllerHelper)
0
+  config.include(Merb::Test::ViewHelper)
0
+  config.include(Merb::Test::RouteHelper)
0
 end
0
 
0
 ### METHODS BELOW THIS LINE SHOULD BE EXTRACTED TO MERB ITSELF

0
@@ -37,7 +37,7 @@ describe "default controller behavior", :shared => true do
0
   describe "#show" do
0
     it "should fail for a model that doesn't exist" do
0
       if controller_instance.respond_to? :show
0
-        calling {dispatch_to(controller_class, :show, :id => invalid_id)}.
0
+        lambda {dispatch_to(controller_class, :show, :id => invalid_id)}.
0
           should raise_error(Merb::ControllerExceptions::NotFound)
0
       end
0
     end