diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-25 03:12:13 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-25 03:12:13 -0800 |
| commit | a6aea14e69b56529b66eeaa00bf9df18da68b8da (patch) | |
| tree | c2d9e12ad79a98409149020d0096a09a1b3fc606 /actionpack/test | |
| parent | 40295aa0abfa9d2c5e821673d7d514445b943892 (diff) | |
| parent | 7d93e814e6cbdf78f4190cba36c1edb8e8d42ff6 (diff) | |
| download | rails-a6aea14e69b56529b66eeaa00bf9df18da68b8da.tar.gz rails-a6aea14e69b56529b66eeaa00bf9df18da68b8da.tar.bz2 rails-a6aea14e69b56529b66eeaa00bf9df18da68b8da.zip | |
Merge pull request #4661 from janko-m/master
Modify video_tag a bit and make audio_tag able to accept multiple sources
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index aa7304b3ed..45a8492d58 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -201,8 +201,8 @@ class AssetTagHelperTest < ActionView::TestCase %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi" />), %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov" />), %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov" />), - %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="multiple.ogg" /><source src="multiple.avi" /></video>), - %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="multiple.ogg" /><source src="multiple.avi" /></video>) + %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="/videos/multiple.ogg" /><source src="/videos/multiple.avi" /></video>), + %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="/videos/multiple.ogg" /><source src="/videos/multiple.avi" /></video>) } AudioPathToTag = { @@ -224,6 +224,8 @@ class AssetTagHelperTest < ActionView::TestCase %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav" />), %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov" />), %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov" />), + %(audio_tag(["audio.mp3", "audio.ogg"])) => %(<audio><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>), + %(audio_tag(["audio.mp3", "audio.ogg"], :autobuffer => true, :controls => true)) => %(<audio autobuffer="autobuffer" controls="controls"><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>) } def test_auto_discovery_link_tag |