aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/test/abstract_unit.rb6
-rw-r--r--actionpack/test/activerecord/polymorphic_routes_test.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 9960f7af87..e0acbdd430 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -254,10 +254,10 @@ module ActionController
end
end
-# ROUTES TODO: Cleaner way to do this?
+# This stub emulates the Railtie including the URL helpers from a Rails application
module ActionController
- UrlFor = SharedTestRoutes.url_helpers
class Base
- include UrlFor
+ # ROUTES TODO: Rename SharedTestRoutes to something that reflects it's a standin for Rails.application
+ include SharedTestRoutes.url_helpers
end
end \ No newline at end of file
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 6e406ecd15..5643ad5ad6 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -26,7 +26,7 @@ class Series < ActiveRecord::Base
end
class PolymorphicRoutesTest < ActionController::TestCase
- include ActionController::UrlFor
+ include SharedTestRoutes.url_helpers
self.default_url_options[:host] = 'example.com'
def setup