Skip to content

Commit f047d9f

Browse files
committed
Revert "Revert "Merge pull request rails#28 from grosser/grosser/test-load""
This reverts commit bc80415.
1 parent c548aa4 commit f047d9f

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/lib/abstract_unit.rb

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
require 'action_view'
99
require 'action_view/testing/resolvers'
1010

11+
module Rails
12+
def self.env
13+
ActiveSupport::StringInquirer.new("test")
14+
end
15+
end
16+
1117
require 'prototype-rails/on_load_action_controller'
1218
require 'prototype-rails/on_load_action_view'
1319

0 commit comments

Comments
 (0)