Skip to content

Commit de7c86c

Browse files
grosserpixeltrix
authored andcommitted
Revert "Revert "Merge pull request #28 from grosser/grosser/test-load""
This reverts commit bc80415.
1 parent 30c16ec commit de7c86c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

lib/prototype-rails/on_load_action_view.rb

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
include ActionView::Helpers::ScriptaculousHelper
1515
end
1616

17-
ActionView::TestCase.class_eval do
18-
include ActionView::Helpers::PrototypeHelper
19-
include ActionView::Helpers::ScriptaculousHelper
17+
if defined?(Rails.env) && Rails.env.test?
18+
ActionView::TestCase.class_eval do
19+
include ActionView::Helpers::PrototypeHelper
20+
include ActionView::Helpers::ScriptaculousHelper
21+
end
2022
end
2123

2224
ActionView::Template.register_template_handler :rjs, ActionView::Template::Handlers::RJS.new

test/abstract_unit.rb

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
require 'action_view'
1919
require 'action_view/testing/resolvers'
2020

21+
module Rails
22+
def self.env
23+
ActiveSupport::StringInquirer.new("test")
24+
end
25+
end
26+
2127
require 'prototype-rails/on_load_action_controller'
2228
require 'prototype-rails/on_load_action_view'
2329

0 commit comments

Comments
 (0)