diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-12-08 13:25:54 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-12-08 13:25:54 -0800 |
| commit | a822287cefc38b9b8b3be38ffd775cd3d511b7c3 (patch) | |
| tree | d69c6ea1fcc4299caa11bcbef2ce5520347a4f46 /activestorage/test/analyzer | |
| parent | 08fab27db52aa375df85a23e89799600f785b9d4 (diff) | |
| parent | da8e0ba03cbae33857954c0c1a228bd6dae562da (diff) | |
| download | rails-a822287cefc38b9b8b3be38ffd775cd3d511b7c3.tar.gz rails-a822287cefc38b9b8b3be38ffd775cd3d511b7c3.tar.bz2 rails-a822287cefc38b9b8b3be38ffd775cd3d511b7c3.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'activestorage/test/analyzer')
| -rw-r--r-- | activestorage/test/analyzer/video_analyzer_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/test/analyzer/video_analyzer_test.rb b/activestorage/test/analyzer/video_analyzer_test.rb index 4a3c4a8bfc..b3b9c97fe4 100644 --- a/activestorage/test/analyzer/video_analyzer_test.rb +++ b/activestorage/test/analyzer/video_analyzer_test.rb @@ -21,8 +21,8 @@ class ActiveStorage::Analyzer::VideoAnalyzerTest < ActiveSupport::TestCase blob = create_file_blob(filename: "rotated_video.mp4", content_type: "video/mp4") metadata = blob.tap(&:analyze).metadata - assert_equal 640, metadata[:width] - assert_equal 480, metadata[:height] + assert_equal 480, metadata[:width] + assert_equal 640, metadata[:height] assert_equal [4, 3], metadata[:aspect_ratio] assert_equal 5.227975, metadata[:duration] assert_equal 90, metadata[:angle] |