aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-07-17 09:59:03 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-07-17 09:59:03 +0900
commit559ffacfd958d6eabd7ed7b3873b54aa144e98f0 (patch)
tree408b76ba38e68dbc0f6cb9f6eb2f2868e727ae5a /activestorage
parent1b984fc258656f741b02565e7c50b4bb45f7de52 (diff)
downloadrails-559ffacfd958d6eabd7ed7b3873b54aa144e98f0.tar.gz
rails-559ffacfd958d6eabd7ed7b3873b54aa144e98f0.tar.bz2
rails-559ffacfd958d6eabd7ed7b3873b54aa144e98f0.zip
Revert "Merge pull request #36676 from wjessop/change_activestorage_metadata_duration_to_bound"
This reverts commit a307c697b28e3c8b2860d2274c23e4d95dc164ae, reversing changes made to f30f76af747858826d3618866676cd5a4979e64a. Reason: This assertion is not failed even without this PR since both ffprobe versions (3.2.14 and 4.1.3) return the same duration 5.166648 for `video.mp4`. So there is no need to touch this assertion at this point.
Diffstat (limited to 'activestorage')
-rw-r--r--activestorage/test/analyzer/video_analyzer_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activestorage/test/analyzer/video_analyzer_test.rb b/activestorage/test/analyzer/video_analyzer_test.rb
index 57e094908a..172a2f0aae 100644
--- a/activestorage/test/analyzer/video_analyzer_test.rb
+++ b/activestorage/test/analyzer/video_analyzer_test.rb
@@ -13,7 +13,7 @@ class ActiveStorage::Analyzer::VideoAnalyzerTest < ActiveSupport::TestCase
assert_equal 640, metadata[:width]
assert_equal 480, metadata[:height]
assert_equal [4, 3], metadata[:display_aspect_ratio]
- assert_equal true, metadata[:duration].between?(4, 6)
+ assert_equal 5.166648, metadata[:duration]
assert_not_includes metadata, :angle
end