@@ -26,9 +26,11 @@ module ActionHelper def helper *args options = args.last.is_a?(Hash) ? args.pop : nil if options - master_action_helper = forced_action_helper_for(options[:only].to_s) - args.each do |helper| - master_action_helper.module_eval { include helper } + [options[:only]].flatten.each do |action| + master_action_helper = forced_action_helper_for(action.to_s) + args.each do |helper| + master_action_helper.module_eval { include helper } + end end else super lib/action_helper.rb @@ -65,11 +65,26 @@ describe ActionHelper do end end - describe "#helper declarative class method overloading" do - it "mixes in to action named in the :only option" do + describe "override of ActionController::Base#helper class method" do + it "mixes in to one action named in the :only option" do do_action 'action_helped_via_declarative_class_method_with_only' response.template.should be_a_kind_of(OtherHelper) end + + it "mixes in to each of an array of actions named in the :only option" do + class OnlyOptionWithMultipleActionsController < FakeActionControllerBase + include ActionHelper + helper OtherHelper, :only => [:first_action, :second_action] + def first_action; end + def second_action; end + end + + do_action 'first_action', OnlyOptionWithMultipleActionsController + response.template.should be_a_kind_of(OtherHelper) + + do_action 'second_action', OnlyOptionWithMultipleActionsController + response.template.should be_a_kind_of(OtherHelper) + end it "delegates to base helper method when no options hash given" do $base_helper_called.should be_true @@ -84,7 +99,8 @@ describe ActionHelper do it "doesn't mix in to action named in the except option" end - def do_action action + def do_action action, controller_class = nil + @controller = controller_class.new if controller_class @controller.fake_process action end spec/action_helper_spec.rb 7bd496bd179b94445dc9422e29dd6772e7cfb938 John D. Hume duelin.markers@gmail.com http://github.com/duelinmarkers/actionhelper/commit/12e60ca131c685ee7e6a6ee2a3432bb12d6a237d 12e60ca131c685ee7e6a6ee2a3432bb12d6a237d 2008-05-18T20:54:20-07:00 2008-05-18T20:54:20-07:00 Support array of actions in the :only option 197ef9005c85e133fad450b4d5f1e8ebb93999cd John D. Hume duelin.markers@gmail.com