aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRajarshi Das <mita9051@gmail.com>2014-09-06 11:49:39 +0530
committerRajarshi Das <mita9051@gmail.com>2014-09-06 12:09:01 +0530
commitab2ace6bbef1cc98c98e5a9a6b45e734bc5edd9d (patch)
treefa5d618d9d2e6952d1e80edbac1ddc491d40cc96 /actionview
parent381f9931ec533dd9003f6e7224d7461b93f2fb24 (diff)
downloadrails-ab2ace6bbef1cc98c98e5a9a6b45e734bc5edd9d.tar.gz
rails-ab2ace6bbef1cc98c98e5a9a6b45e734bc5edd9d.tar.bz2
rails-ab2ace6bbef1cc98c98e5a9a6b45e734bc5edd9d.zip
fix the undefined method content_tag #15245
not required include ActionView::Helpers::TagHelper in test as well
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/translation_helper.rb1
-rw-r--r--actionview/test/template/translation_helper_test.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb
index 1d50ea2ff5..c2fda42396 100644
--- a/actionview/lib/action_view/helpers/translation_helper.rb
+++ b/actionview/lib/action_view/helpers/translation_helper.rb
@@ -6,6 +6,7 @@ module ActionView
# = Action View Translation Helpers
module Helpers
module TranslationHelper
+ include TagHelper
# Delegates to <tt>I18n#translate</tt> but also performs three additional functions.
#
# First, it will ensure that any thrown +MissingTranslation+ messages will be turned
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
index 41f6770f23..362f05ea70 100644
--- a/actionview/test/template/translation_helper_test.rb
+++ b/actionview/test/template/translation_helper_test.rb
@@ -1,7 +1,6 @@
require 'abstract_unit'
class TranslationHelperTest < ActiveSupport::TestCase
- include ActionView::Helpers::TagHelper
include ActionView::Helpers::TranslationHelper
attr_reader :request, :view