aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-26 00:55:22 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-26 00:55:22 +0000
commit06dd7b8efa3073f413cf7a6b57c6a1a90a242ae1 (patch)
treee7338ba94e6bc4757a0561421331916e7ee1a2ff /actionpack
parente57bd727df9d1e259b4ea9f2ab84595fe5a85b07 (diff)
downloadrails-06dd7b8efa3073f413cf7a6b57c6a1a90a242ae1.tar.gz
rails-06dd7b8efa3073f413cf7a6b57c6a1a90a242ae1.tar.bz2
rails-06dd7b8efa3073f413cf7a6b57c6a1a90a242ae1.zip
The image_tag helper is not converting the options hash to symbols (closes #3615) [agkr@pobox.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
-rw-r--r--actionpack/test/template/asset_tag_helper_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 418092cf88..0b725ce508 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -131,7 +131,7 @@ module ActionView
# * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
# * file name without extension, like "logo", that gets expanded to "/images/logo.png"
def image_tag(source, options = {})
- options.symbolize_keys
+ options.symbolize_keys!
options[:src] = image_path(source)
options[:alt] ||= File.basename(options[:src], '.*').split('.').first.capitalize
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 8ec3229547..5e2d46cbf8 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -74,6 +74,7 @@ class AssetTagHelperTest < Test::Unit::TestCase
%(image_tag("xml")) => %(<img alt="Xml" src="/images/xml.png" />),
%(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.png" />),
%(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
+ %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/images/symbolize.png" width="45" />)
}
def test_auto_discovery
@@ -174,6 +175,7 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
%(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/calloboration/hieraki/images/rss.png" />),
%(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />),
%(image_tag("http://www.example.com/images/icon.gif")) => %(<img alt="Icon" src="http://www.example.com/images/icon.gif" />),
+ %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/calloboration/hieraki/images/symbolize.png" width="45" />)
}
def test_auto_discovery