aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-17 23:42:05 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-17 23:42:05 -0800
commit76f8d310468db4d1249b357ee67cb9ca0011fd60 (patch)
tree1ee6c4a4d64ba204dee986763005cc8c99b1a048 /actionview/test
parent9fb6008bfc9f11c3be8db9e2b2709feb353e9b7e (diff)
parentcd58745a7d6619366adde02fcb0baac6981c421a (diff)
downloadrails-76f8d310468db4d1249b357ee67cb9ca0011fd60.tar.gz
rails-76f8d310468db4d1249b357ee67cb9ca0011fd60.tar.bz2
rails-76f8d310468db4d1249b357ee67cb9ca0011fd60.zip
Merge pull request #13363 from kuldeepaggarwal/f-video-options
allow video_tag to accept `size` as `Number` for square shaped videos
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/asset_tag_helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index 214a13654e..541fca02d4 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -245,7 +245,7 @@ class AssetTagHelperTest < ActionView::TestCase
%(video_tag("gold.m4v", :size => "160x120")) => %(<video height="120" src="/videos/gold.m4v" width="160"></video>),
%(video_tag("gold.m4v", "size" => "320x240")) => %(<video height="240" src="/videos/gold.m4v" width="320"></video>),
%(video_tag("trailer.ogg", :poster => "screenshot.png")) => %(<video poster="/images/screenshot.png" src="/videos/trailer.ogg"></video>),
- %(video_tag("error.avi", "size" => "100")) => %(<video src="/videos/error.avi"></video>),
+ %(video_tag("error.avi", "size" => "100")) => %(<video height="100" src="/videos/error.avi" width="100"></video>),
%(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi"></video>),
%(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi"></video>),
%(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov"></video>),