diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 705d0c9072..2a6e80fc89 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -4,7 +4,7 @@ *Carlos Galdino + Rafael Mendonça França* -* Deprecate `:mouseover` options for `image_tag` helper. *Rafael Mendonça França* +* Deprecate `:mouseover` option for `image_tag` helper. *Rafael Mendonça França* * Deprecate `button_to_function` and `link_to_function` helpers. *Rafael Mendonça França* diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index ccba30eaa4..cf6c007c84 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -367,7 +367,7 @@ module ActionView end if mouseover = options.delete(:mouseover) - ActiveSupport::Deprecation.warn ":mouseover options is deprecated and will be removed from Rails 4.0" + ActiveSupport::Deprecation.warn ":mouseover option is deprecated and will be removed from Rails 4.0" options[:onmouseover] = "this.src='#{path_to_image(mouseover)}'" options[:onmouseout] = "this.src='#{src}'" diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index adc13f0be6..4aa9f76f47 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -441,14 +441,14 @@ class AssetTagHelperTest < ActionView::TestCase end def test_image_tag_with_mouseover - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal( %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png") ) end - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal( %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />), image_tag("mouse.png", :mouseover => image_path("mouse_over.png")) @@ -1111,11 +1111,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase assert_dom_equal(%(/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style")) assert_dom_equal(%(/collaboration/hieraki/images/xml.png), image_path("xml.png")) - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse.png'" src="/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) end - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse2.png'" src="/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png"))) end end @@ -1131,11 +1131,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style")) assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png")) - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) end - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png"))) end end @@ -1147,11 +1147,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style")) assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png")) - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) end - assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do + assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png"))) end end |