From f43f0e04485218636d151c0d56a11309e5c5fa8c Mon Sep 17 00:00:00 2001 From: walterdavis Date: Tue, 12 Feb 2013 13:26:55 -0500 Subject: [PATCH 1/2] Applied patch to fix test class_eval bug --- lib/prototype-rails/on_load_action_view.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/prototype-rails/on_load_action_view.rb b/lib/prototype-rails/on_load_action_view.rb index 2332d68..dfc9923 100644 --- a/lib/prototype-rails/on_load_action_view.rb +++ b/lib/prototype-rails/on_load_action_view.rb @@ -13,10 +13,10 @@ include ActionView::Helpers::PrototypeHelper include ActionView::Helpers::ScriptaculousHelper end - -ActionView::TestCase.class_eval do - include ActionView::Helpers::PrototypeHelper - include ActionView::Helpers::ScriptaculousHelper +if Rails.env.test? + ActionView::TestCase.class_eval do + include ActionView::Helpers::PrototypeHelper + include ActionView::Helpers::ScriptaculousHelper + end end - ActionView::Template.register_template_handler :rjs, ActionView::Template::Handlers::RJS.new From 26b2f6a8f20dd9c310f0a64cfc8df2ace0adaa9d Mon Sep 17 00:00:00 2001 From: walterdavis Date: Tue, 12 Feb 2013 15:21:24 -0500 Subject: [PATCH 2/2] Changed test to present? --- lib/prototype-rails/on_load_action_view.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prototype-rails/on_load_action_view.rb b/lib/prototype-rails/on_load_action_view.rb index dfc9923..2f75b1e 100644 --- a/lib/prototype-rails/on_load_action_view.rb +++ b/lib/prototype-rails/on_load_action_view.rb @@ -13,7 +13,7 @@ include ActionView::Helpers::PrototypeHelper include ActionView::Helpers::ScriptaculousHelper end -if Rails.env.test? +if ActionView::TestCase.present? ActionView::TestCase.class_eval do include ActionView::Helpers::PrototypeHelper include ActionView::Helpers::ScriptaculousHelper