Skip to content

Commit bc80415

Browse files
author
Rafael Mendonça França
committed
Revert "Merge pull request #28 from grosser/grosser/test-load"
This reverts commit 3f512ec, reversing changes made to 2841450. Reason: I'll use the solution in #23 that doesn't check the Rails environment
1 parent 6849a2b commit bc80415

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

lib/prototype-rails.rb

-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ 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
1913
end
2014
end
2115
end

lib/prototype-rails/on_load_action_view.rb

+5
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,9 @@
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+
1722
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,12 +8,6 @@
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-
1711
require 'prototype-rails/on_load_action_controller'
1812
require 'prototype-rails/on_load_action_view'
1913

0 commit comments

Comments
 (0)