diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-06-21 18:39:35 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-08-28 11:19:29 +0200 |
| commit | dc663dd52c99ab6e6c633b54d1a0e836f379bf9f (patch) | |
| tree | c6c1a406186d88cb74b40ecfec337ab70c1a04db /actionpack/test | |
| parent | 9b0ac0bc74569db460f87ea6888b3847be0ff5be (diff) | |
| download | rails-dc663dd52c99ab6e6c633b54d1a0e836f379bf9f.tar.gz rails-dc663dd52c99ab6e6c633b54d1a0e836f379bf9f.tar.bz2 rails-dc663dd52c99ab6e6c633b54d1a0e836f379bf9f.zip | |
Don't require action_dispatch in ActionView::UrlHelpers
ActionDispatch::Routing::UrlFor was always required in UrlHelpers. This
was changed by splitting previous implementation of UrlHelper into 2
modules: ActionView::Helpers::UrlHelper and
ActionView::Routing::UrlHelper. The former one keeps only basic
implementation of url_for. The latter adds features that allow to use
routes and is only required when url_helpers or mounted_helpers are
required.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/erb/helper.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/template/url_helper_test.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/template/erb/helper.rb b/actionpack/test/template/erb/helper.rb index 799f9e4036..a1973068d5 100644 --- a/actionpack/test/template/erb/helper.rb +++ b/actionpack/test/template/erb/helper.rb @@ -1,5 +1,6 @@ module ERBTest class ViewContext + include ActionView::Helpers::UrlHelper include SharedTestRoutes.url_helpers include ActionView::Helpers::TagHelper include ActionView::Helpers::JavaScriptHelper @@ -20,4 +21,4 @@ module ERBTest "<%= #{str} do %>#{rest}<% end %>" end end -end
\ No newline at end of file +end diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index f9f8c36fff..9c4271f19b 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -20,9 +20,9 @@ class UrlHelperTest < ActiveSupport::TestCase get "/article/:id" => "foo#article", :as => :article end + include ActionView::Helpers::UrlHelper include routes.url_helpers - include ActionView::Helpers::UrlHelper include ActionView::Helpers::JavaScriptHelper include ActionDispatch::Assertions::DomAssertions include ActionView::Context |