diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:40:36 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:40:36 -0800 |
| commit | 5797575bac580037e4a9ee686a8bcb7e56b65235 (patch) | |
| tree | af475622d753635f6e66f56dd9b6c7a24ec78613 /actionpack | |
| parent | 47fe14bfcc553acfd4c44434636529f25054a751 (diff) | |
| download | rails-5797575bac580037e4a9ee686a8bcb7e56b65235.tar.gz rails-5797575bac580037e4a9ee686a8bcb7e56b65235.tar.bz2 rails-5797575bac580037e4a9ee686a8bcb7e56b65235.zip | |
Stop setting UrlFor using SharedTestHelpers
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/activerecord/polymorphic_routes_test.rb | 2 |
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 |