diff options
author | George Claghorn <george.claghorn@gmail.com> | 2019-02-26 12:11:50 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-26 12:11:50 -0500 |
commit | 7c95c522473ec7efb7830f8afa056805ce3d6128 (patch) | |
tree | f5c726b7eabcbd010e8f77a9afb4535036eed39a /activestorage | |
parent | aa9bc1e8f023b227d77aeee99cefde48c247b88d (diff) | |
parent | 32438ed64fea7dbe52ea0898be3d4276e63baa78 (diff) | |
download | rails-7c95c522473ec7efb7830f8afa056805ce3d6128.tar.gz rails-7c95c522473ec7efb7830f8afa056805ce3d6128.tar.bz2 rails-7c95c522473ec7efb7830f8afa056805ce3d6128.zip |
Merge pull request #35412 from abhchand/correctly-load-blob-association
Ensure that the `_blob` association is properly loaded when attaching `::One`
Diffstat (limited to 'activestorage')
-rw-r--r-- | activestorage/lib/active_storage/attached/changes/create_one.rb | 1 | ||||
-rw-r--r-- | activestorage/test/models/attached/many_test.rb | 3 | ||||
-rw-r--r-- | activestorage/test/models/attached/one_test.rb | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/activestorage/lib/active_storage/attached/changes/create_one.rb b/activestorage/lib/active_storage/attached/changes/create_one.rb index 5812fd2b08..89cccfb58a 100644 --- a/activestorage/lib/active_storage/attached/changes/create_one.rb +++ b/activestorage/lib/active_storage/attached/changes/create_one.rb @@ -30,6 +30,7 @@ module ActiveStorage def save record.public_send("#{name}_attachment=", attachment) + record.public_send("#{name}_blob=", blob) end private diff --git a/activestorage/test/models/attached/many_test.rb b/activestorage/test/models/attached/many_test.rb index 8fede0e682..e826109874 100644 --- a/activestorage/test/models/attached/many_test.rb +++ b/activestorage/test/models/attached/many_test.rb @@ -16,6 +16,9 @@ class ActiveStorage::ManyAttachedTest < ActiveSupport::TestCase @user.highlights.attach create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") assert_equal "funky.jpg", @user.highlights.first.filename.to_s assert_equal "town.jpg", @user.highlights.second.filename.to_s + + assert_not_empty @user.highlights_attachments + assert_equal @user.highlights_blobs.count, 2 end test "attaching existing blobs from signed IDs to an existing record" do diff --git a/activestorage/test/models/attached/one_test.rb b/activestorage/test/models/attached/one_test.rb index 7fb3262781..ac08d324bb 100644 --- a/activestorage/test/models/attached/one_test.rb +++ b/activestorage/test/models/attached/one_test.rb @@ -15,6 +15,9 @@ class ActiveStorage::OneAttachedTest < ActiveSupport::TestCase test "attaching an existing blob to an existing record" do @user.avatar.attach create_blob(filename: "funky.jpg") assert_equal "funky.jpg", @user.avatar.filename.to_s + + assert_not_nil @user.avatar_attachment + assert_not_nil @user.avatar_blob end test "attaching an existing blob from a signed ID to an existing record" do |