aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/erb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-08-28 11:24:29 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-08-28 11:24:29 +0200
commit4f093d81aca814b7433c4a1366985327b4ad0708 (patch)
treed8361811cbf1f5b3947c57cbe1be1016c2835b2d /actionpack/test/template/erb
parent1ec1eb2ff2ad5de70db7a632b93641a06a623a42 (diff)
parentdaa0ed3af2e6443e26d658282b8ed654b5a32926 (diff)
downloadrails-4f093d81aca814b7433c4a1366985327b4ad0708.tar.gz
rails-4f093d81aca814b7433c4a1366985327b4ad0708.tar.bz2
rails-4f093d81aca814b7433c4a1366985327b4ad0708.zip
Merge branch 'actionview-decoupling'
This branch contains set of changes that will allow to extract Action View out of Action Pack in the future. This work will be probably done after Rails 4.0 release, because of a few deprecations that were done to make decoupling possible.
Diffstat (limited to 'actionpack/test/template/erb')
-rw-r--r--actionpack/test/template/erb/helper.rb3
1 files changed, 2 insertions, 1 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