From d8b95f11d8b746a11268df447ea0258d5b181fa7 Mon Sep 17 00:00:00 2001 From: Zach Holt Date: Sun, 18 May 2008 15:38:59 -0700 Subject: [PATCH] Added require_js and require_css mathcher helper methods. Enables controller.should require_js( 'app' ) and controller.should require_css( 'master' ) --- merb-assets/lib/merb-assets.rb | 1 + merb-assets/spec/spec_helper.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/merb-assets/lib/merb-assets.rb b/merb-assets/lib/merb-assets.rb index 2434640..b38234f 100644 --- a/merb-assets/lib/merb-assets.rb +++ b/merb-assets/lib/merb-assets.rb @@ -1,5 +1,6 @@ require 'merb-assets/assets' require 'merb-assets/assets_mixin' +require 'merb-assets/test' Merb::BootLoader.before_app_loads do Merb::Controller.send(:include, Merb::AssetsMixin) diff --git a/merb-assets/spec/spec_helper.rb b/merb-assets/spec/spec_helper.rb index 0bc0ded..992360c 100644 --- a/merb-assets/spec/spec_helper.rb +++ b/merb-assets/spec/spec_helper.rb @@ -10,4 +10,5 @@ Merb.start :environment => 'test' Spec::Runner.configure do |config| config.include Merb::Test::RequestHelper -end \ No newline at end of file + config.include Merb::Test::Rspec::ControllerMatchers +end -- 1.5.4.3