Merge pull request #33 from grosser/grosser/fix

fix test-case vs devise vs rails 4.2
rails · Jan 22, 2015 · 13f2ca7 · 13f2ca7
2 parents c548aa4 + f047d9f
commit 13f2ca7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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 defined?(Rails.env) && 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
@@ -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'