From 0386323a37bc163e62bb2859ae8ceb6b1984ba59 Mon Sep 17 00:00:00 2001 From: grosser Date: Thu, 26 Dec 2013 16:00:18 -0800 Subject: [PATCH 1/2] do not load test-case in development --- lib/prototype-rails/on_load_action_view.rb | 8 +++++--- test/lib/abstract_unit.rb | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/prototype-rails/on_load_action_view.rb b/lib/prototype-rails/on_load_action_view.rb index 2332d68..3ad27cf 100644 --- a/lib/prototype-rails/on_load_action_view.rb +++ b/lib/prototype-rails/on_load_action_view.rb @@ -14,9 +14,11 @@ 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 diff --git a/test/lib/abstract_unit.rb b/test/lib/abstract_unit.rb index 41b92e0..f5feb8d 100644 --- a/test/lib/abstract_unit.rb +++ b/test/lib/abstract_unit.rb @@ -8,6 +8,12 @@ require 'action_view' require 'action_view/testing/resolvers' +module Rails + def self.env + ActiveSupport::StringInquirer.new("test") + end +end + require 'prototype-rails/on_load_action_controller' require 'prototype-rails/on_load_action_view' From c04e4d04ff0fa41b8a90841ced9379539c11fdc2 Mon Sep 17 00:00:00 2001 From: grosser Date: Thu, 2 Jan 2014 17:35:28 -0800 Subject: [PATCH 2/2] move env check to railtie --- lib/prototype-rails.rb | 6 ++++++ lib/prototype-rails/on_load_action_view.rb | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/prototype-rails.rb b/lib/prototype-rails.rb index 8f176f5..8739574 100644 --- a/lib/prototype-rails.rb +++ b/lib/prototype-rails.rb @@ -10,6 +10,12 @@ class Engine < Rails::Engine ActiveSupport.on_load(:action_view) do require 'prototype-rails/on_load_action_view' + if Rails.env.test? + ActionView::TestCase.class_eval do + include ActionView::Helpers::PrototypeHelper + include ActionView::Helpers::ScriptaculousHelper + end + end end end end diff --git a/lib/prototype-rails/on_load_action_view.rb b/lib/prototype-rails/on_load_action_view.rb index 3ad27cf..1d5c781 100644 --- a/lib/prototype-rails/on_load_action_view.rb +++ b/lib/prototype-rails/on_load_action_view.rb @@ -14,11 +14,4 @@ include ActionView::Helpers::ScriptaculousHelper end -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