Removes the before_app_loads constraing on loading merb_helpers. Ther…

…e's no need for this
derdewey · Jun 1, 2008 · 0200553 · 0200553
1 parent f465ae9
commit 0200553
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/merb_helpers/lib/merb_helpers.rb b/merb_helpers/lib/merb_helpers.rb
@@ -36,6 +36,4 @@ def self.load_helpers(helpers = @@helpers_files)
 
 end
 
-Merb::BootLoader.before_app_loads do  
-  Merb::Helpers.load
-end
+Merb::Helpers.load
diff --git a/merb_helpers/spec/merb_helpers_config_spec.rb b/merb_helpers/spec/merb_helpers_config_spec.rb
@@ -32,7 +32,7 @@
   end
 
   it "should load all helpers by default" do
-    Merb::Plugins.should_receive(:config).and_return({})
+    Merb::Plugins.should_receive(:config).any_number_of_times.and_return({})
     reload_merb_helpers
     defined?(Merb::Helpers).should_not be_nil
     defined?(Merb::Helpers::DateAndTime).should_not  be_nil