Fix analyzing new blobs from uploaded files on attach

1 files changed, 58 insertions, 0 deletions

diff --git a/activestorage/test/models/attached/many_test.rb b/activestorage/test/models/attached/many_test.rb
index bc44e9da68..c4510a9e84 100644
--- a/activestorage/test/models/attached/many_test.rb
+++ b/activestorage/test/models/attached/many_test.rb
@@ -156,6 +156,46 @@ class ActiveStorage::ManyAttachedTest < ActiveSupport::TestCase
     end
   end
 
+  test "analyzing a new blob from an uploaded file after attaching it to an existing record" do
+    perform_enqueued_jobs do
+      @user.highlights.attach fixture_file_upload("racecar.jpg")
+    end
+
+    assert @user.highlights.reload.first.analyzed?
+    assert_equal 4104, @user.highlights.first.metadata[:width]
+    assert_equal 2736, @user.highlights.first.metadata[:height]
+  end
+
+  test "analyzing a new blob from an uploaded file after attaching it to an existing record via update" do
+    perform_enqueued_jobs do
+      @user.update! highlights: [ fixture_file_upload("racecar.jpg") ]
+    end
+
+    assert @user.highlights.reload.first.analyzed?
+    assert_equal 4104, @user.highlights.first.metadata[:width]
+    assert_equal 2736, @user.highlights.first.metadata[:height]
+  end
+
+  test "analyzing a directly-uploaded blob after attaching it to an existing record" do
+    perform_enqueued_jobs do
+      @user.highlights.attach directly_upload_file_blob(filename: "racecar.jpg")
+    end
+
+    assert @user.highlights.reload.first.analyzed?
+    assert_equal 4104, @user.highlights.first.metadata[:width]
+    assert_equal 2736, @user.highlights.first.metadata[:height]
+  end
+
+  test "analyzing a directly-uploaded blob after attaching it to an existing record via update" do
+    perform_enqueued_jobs do
+      @user.update! highlights: [ directly_upload_file_blob(filename: "racecar.jpg") ]
+    end
+
+    assert @user.highlights.reload.first.analyzed?
+    assert_equal 4104, @user.highlights.first.metadata[:width]
+    assert_equal 2736, @user.highlights.first.metadata[:height]
+  end
+
   test "attaching existing blobs to a new record" do
     User.new(name: "Jason").tap do |user|
       user.highlights.attach create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg")
@@ -257,6 +297,24 @@ class ActiveStorage::ManyAttachedTest < ActiveSupport::TestCase
     assert_equal "Could not find or build blob: expected attachable, got :foo", error.message
   end
 
+  test "analyzing a new blob from an uploaded file after attaching it to a new record" do
+    perform_enqueued_jobs do
+      user = User.create!(name: "Jason", highlights: [ fixture_file_upload("racecar.jpg") ])
+      assert user.highlights.reload.first.analyzed?
+      assert_equal 4104, user.highlights.first.metadata[:width]
+      assert_equal 2736, user.highlights.first.metadata[:height]
+    end
+  end
+
+  test "analyzing a directly-uploaded blob after attaching it to a new record" do
+    perform_enqueued_jobs do
+      user = User.create!(name: "Jason", highlights: [ directly_upload_file_blob(filename: "racecar.jpg") ])
+      assert user.highlights.reload.first.analyzed?
+      assert_equal 4104, user.highlights.first.metadata[:width]
+      assert_equal 2736, user.highlights.first.metadata[:height]
+    end
+  end
+
   test "purging" do
     [ create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") ].tap do |blobs|
       @user.highlights.attach blobs