From bc8041559a11c16ef25228b019250b3cc122e115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael.franca@plataformatec.com.br>
Date: Thu, 6 Feb 2014 00:15:52 -0200
Subject: [PATCH] Revert "Merge pull request #28 from
 grosser/grosser/test-load"

This reverts commit 3f512ecf3848a313ec366019f62ae5dbc59e0112, reversing
changes made to 2841450c007aa149ed15cfa9782d4a3a326e7ce2.

Reason: I'll use the solution in
https://github.com/rails/prototype-rails/pull/23 that doesn't check the
Rails environment
---
 lib/prototype-rails.rb                     | 6 ------
 lib/prototype-rails/on_load_action_view.rb | 5 +++++
 test/lib/abstract_unit.rb                  | 6 ------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/prototype-rails.rb b/lib/prototype-rails.rb
index 8739574..8f176f5 100644
--- a/lib/prototype-rails.rb
+++ b/lib/prototype-rails.rb
@@ -10,12 +10,6 @@ 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 1d5c781..2332d68 100644
--- a/lib/prototype-rails/on_load_action_view.rb
+++ b/lib/prototype-rails/on_load_action_view.rb
@@ -14,4 +14,9 @@
   include ActionView::Helpers::ScriptaculousHelper
 end
 
+ActionView::TestCase.class_eval do
+  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
+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 f5feb8d..41b92e0 100644
--- a/test/lib/abstract_unit.rb
+++ b/test/lib/abstract_unit.rb
@@ -8,12 +8,6 @@
 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'