Skip to content

Commit e454a7a

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

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

lib/prototype-rails.rb

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ class Engine < Rails::Engine
1010

1111
ActiveSupport.on_load(:action_view) do
1212
require 'prototype-rails/on_load_action_view'
13+
if Rails.env.test?
14+
ActionView::TestCase.class_eval do
15+
include ActionView::Helpers::PrototypeHelper
16+
include ActionView::Helpers::ScriptaculousHelper
17+
end
18+
end
1319
end
1420
end
1521
end

lib/prototype-rails/on_load_action_view.rb

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

17-
ActionView::TestCase.class_eval do
18-
include ActionView::Helpers::PrototypeHelper
19-
include ActionView::Helpers::ScriptaculousHelper
20-
end
21-
2217
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)