1 files changed, 71 insertions, 6 deletions

diff --git a/activestorage/test/models/attachments_test.rb b/activestorage/test/models/attachments_test.rb
index 25e0352eca..ce83ec27d2 100644
--- a/activestorage/test/models/attachments_test.rb
+++ b/activestorage/test/models/attachments_test.rb
@@ -80,6 +80,20 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
     end
   end
 
+  test "replace independent attached blob" do
+    @user.cover_photo.attach create_blob(filename: "funky.jpg")
+
+    perform_enqueued_jobs do
+      assert_difference -> { ActiveStorage::Blob.count }, +1 do
+        assert_no_difference -> { ActiveStorage::Attachment.count } do
+          @user.cover_photo.attach create_blob(filename: "town.jpg")
+        end
+      end
+    end
+
+    assert_equal "town.jpg", @user.cover_photo.filename.to_s
+  end
+
   test "attach blob to new record" do
     user = User.new(name: "Jason")
 
@@ -122,17 +136,26 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
   end
 
   test "identify newly-attached, directly-uploaded blob" do
-    # Simulate a direct upload.
-    blob = create_blob_before_direct_upload(filename: "racecar.jpg", content_type: "application/octet-stream", byte_size: 1124062, checksum: "7GjDDNEQb4mzMzsW+MS0JQ==")
-    ActiveStorage::Blob.service.upload(blob.key, file_fixture("racecar.jpg").open)
+    blob = directly_upload_file_blob(content_type: "application/octet-stream")
 
-    stub_request(:get, %r{localhost:3000/rails/active_storage/disk/.*}).to_return(body: file_fixture("racecar.jpg"))
     @user.avatar.attach(blob)
 
     assert_equal "image/jpeg", @user.avatar.reload.content_type
     assert_predicate @user.avatar, :identified?
   end
 
+  test "identify and analyze newly-attached, directly-uploaded blob" do
+    blob = directly_upload_file_blob(content_type: "application/octet-stream")
+
+    perform_enqueued_jobs do
+      @user.avatar.attach blob
+    end
+
+    assert_equal true, @user.avatar.reload.metadata[:identified]
+    assert_equal 4104, @user.avatar.metadata[:width]
+    assert_equal 2736, @user.avatar.metadata[:height]
+  end
+
   test "identify newly-attached blob only once" do
     blob = create_file_blob
     assert_predicate blob, :identified?
@@ -204,13 +227,20 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
     avatar_key = @user.avatar.key
 
     perform_enqueued_jobs do
-      @user.destroy
+      @user.reload.destroy
 
       assert_nil ActiveStorage::Blob.find_by(key: avatar_key)
       assert_not ActiveStorage::Blob.service.exist?(avatar_key)
     end
   end
 
+  test "delete attachment for independent blob when record is destroyed" do
+    @user.cover_photo.attach create_blob(filename: "funky.jpg")
+
+    @user.destroy
+    assert_not ActiveStorage::Attachment.exists?(record: @user, name: "cover_photo")
+  end
+
   test "find with attached blob" do
     records = %w[alice bob].map do |name|
       User.create!(name: name).tap do |user|
@@ -382,7 +412,7 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
     highlight_keys = @user.highlights.collect(&:key)
 
     perform_enqueued_jobs do
-      @user.destroy
+      @user.reload.destroy
 
       assert_nil ActiveStorage::Blob.find_by(key: highlight_keys.first)
       assert_not ActiveStorage::Blob.service.exist?(highlight_keys.first)
@@ -391,4 +421,39 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
       assert_not ActiveStorage::Blob.service.exist?(highlight_keys.second)
     end
   end
+
+  test "delete attachments for independent blobs when the record is destroyed" do
+    @user.vlogs.attach create_blob(filename: "funky.mp4"), create_blob(filename: "wonky.mp4")
+
+    @user.destroy
+    assert_not ActiveStorage::Attachment.exists?(record: @user, name: "vlogs")
+  end
+
+  test "selectively purge one attached blob of many" do
+    first_blob  = create_blob(filename: "funky.jpg")
+    second_blob = create_blob(filename: "wonky.jpg")
+    attachments = @user.highlights.attach(first_blob, second_blob)
+
+    assert_difference -> { ActiveStorage::Blob.count }, -1 do
+      @user.highlights.where(id: attachments.first.id).purge
+    end
+
+    assert_not ActiveStorage::Blob.exists?(key: first_blob.key)
+    assert ActiveStorage::Blob.exists?(key: second_blob.key)
+  end
+
+  test "selectively purge one attached blob of many later" do
+    first_blob  = create_blob(filename: "funky.jpg")
+    second_blob = create_blob(filename: "wonky.jpg")
+    attachments = @user.highlights.attach(first_blob, second_blob)
+
+    perform_enqueued_jobs do
+      assert_difference -> { ActiveStorage::Blob.count }, -1 do
+        @user.highlights.where(id: attachments.first.id).purge_later
+      end
+    end
+
+    assert_not ActiveStorage::Blob.exists?(key: first_blob.key)
+    assert ActiveStorage::Blob.exists?(key: second_blob.key)
+  end
 end