From 36e0ac3b5357534ecf147d445f19a837b5a96e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Di=CC=81az?= Date: Wed, 25 Apr 2018 15:28:30 -0500 Subject: Move #extract_metadata_from to ActiveStorage's TestHelper ImageAnalyzerTest and VideoAnalyzerTest are defining the same helper, since both use `#create_file_blob` that is defined in TestHelper, it makes sense to move `#extract_metadata_from` to that side. --- activestorage/test/analyzer/image_analyzer_test.rb | 5 ----- activestorage/test/analyzer/video_analyzer_test.rb | 5 ----- activestorage/test/test_helper.rb | 4 ++++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/activestorage/test/analyzer/image_analyzer_test.rb b/activestorage/test/analyzer/image_analyzer_test.rb index f8a38f001a..55bb5e7280 100644 --- a/activestorage/test/analyzer/image_analyzer_test.rb +++ b/activestorage/test/analyzer/image_analyzer_test.rb @@ -29,9 +29,4 @@ class ActiveStorage::Analyzer::ImageAnalyzerTest < ActiveSupport::TestCase assert_equal 792, metadata[:width] assert_equal 584, metadata[:height] end - - private - def extract_metadata_from(blob) - blob.tap(&:analyze).metadata - end end diff --git a/activestorage/test/analyzer/video_analyzer_test.rb b/activestorage/test/analyzer/video_analyzer_test.rb index 2612006551..d30f49315a 100644 --- a/activestorage/test/analyzer/video_analyzer_test.rb +++ b/activestorage/test/analyzer/video_analyzer_test.rb @@ -51,9 +51,4 @@ class ActiveStorage::Analyzer::VideoAnalyzerTest < ActiveSupport::TestCase metadata = extract_metadata_from(blob) assert_equal({ "analyzed" => true, "identified" => true }, metadata) end - - private - def extract_metadata_from(blob) - blob.tap(&:analyze).metadata - end end diff --git a/activestorage/test/test_helper.rb b/activestorage/test/test_helper.rb index 4787eccd09..499d955a2f 100644 --- a/activestorage/test/test_helper.rb +++ b/activestorage/test/test_helper.rb @@ -75,6 +75,10 @@ class ActiveSupport::TestCase def read_image(blob_or_variant) MiniMagick::Image.open blob_or_variant.service.send(:path_for, blob_or_variant.key) end + + def extract_metadata_from(blob) + blob.tap(&:analyze).metadata + end end require "global_id" -- cgit v1.2.3