aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/send_file_test.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-11-29 01:28:22 -0500
committerGitHub <noreply@github.com>2017-11-29 01:28:22 -0500
commit17661b8cb2591fda5370f7bf8df53ec78b0cdda4 (patch)
tree292662415fd57e90548487f4e71edfaa5d6837b8 /actionpack/test/controller/send_file_test.rb
parent02b5b1a609a582efafa0d619116109ca4a4e8abd (diff)
parentaf10a39f88488109cecc6e425e08c083a7e55289 (diff)
downloadrails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.tar.gz
rails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.tar.bz2
rails-17661b8cb2591fda5370f7bf8df53ec78b0cdda4.zip
Merge pull request #31251 from rails/preload_link_tag
Add preload_link_tag helper.
Diffstat (limited to 'actionpack/test/controller/send_file_test.rb')
-rw-r--r--actionpack/test/controller/send_file_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index fd2399e433..7b1a52b277 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -178,7 +178,7 @@ class SendFileTest < ActionController::TestCase
"image.jpg" => "image/jpeg",
"image.tif" => "image/tiff",
"image.gif" => "image/gif",
- "movie.mpg" => "video/mpeg",
+ "movie.mp4" => "video/mp4",
"file.zip" => "application/zip",
"file.unk" => "application/octet-stream",
"zip" => "application/octet-stream"