Merge pull request #9038 from alphagov/fix-ww-org-social

Fix bug with social media accounts on new editions
alphagov · May 15, 2024 · 77a230e · 77a230e
2 parents e8067b8 + 7f3725b
commit 77a230e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/app/models/concerns/edition/social_media_accounts.rb b/app/models/concerns/edition/social_media_accounts.rb
@@ -4,7 +4,7 @@ module Edition::SocialMediaAccounts
   class Trait < Edition::Traits::Trait
     def process_associations_after_save(edition)
       @edition.social_media_accounts.each do |association|
-        new_social_media_account = edition.social_media_accounts.build(association.attributes.except("id", "socialable_id", "socialable_type"))
+        new_social_media_account = edition.social_media_accounts.create!(association.attributes.except("id", "socialable_id", "socialable_type"))
 
         @edition.non_english_translated_locales.map(&:code).each do |locale|
           I18n.with_locale(locale) do

diff --git a/test/unit/app/models/editionable_worldwide_organisation_test.rb b/test/unit/app/models/editionable_worldwide_organisation_test.rb
@@ -135,6 +135,20 @@ class EditionableWorldwideOrganisationTest < ActiveSupport::TestCase
     assert_equal [c], worldwide_organisation.office_staff_roles
   end
 
+  test "should clone social media associations which don't have translations when new draft of published edition is created" do
+    published_worldwide_organisation = create(
+      :editionable_worldwide_organisation,
+      :published,
+      :with_social_media_account,
+    )
+    draft_worldwide_organisation = published_worldwide_organisation.create_draft(create(:writer))
+
+    draft_worldwide_organisation.reload
+
+    assert_equal published_worldwide_organisation.social_media_accounts.first.title, draft_worldwide_organisation.social_media_accounts.first.title
+    assert_equal published_worldwide_organisation.social_media_accounts.first.url, draft_worldwide_organisation.social_media_accounts.first.url
+  end
+
   test "should clone social media associations and their translations when new draft of published edition is created" do
     published_worldwide_organisation = create(
       :editionable_worldwide_organisation,
@@ -152,6 +166,8 @@ class EditionableWorldwideOrganisationTest < ActiveSupport::TestCase
 
     draft_worldwide_organisation = published_worldwide_organisation.create_draft(create(:writer))
 
+    draft_worldwide_organisation.reload
+
     assert_equal published_worldwide_organisation.social_media_accounts.first.title, draft_worldwide_organisation.social_media_accounts.first.title
     assert_equal published_worldwide_organisation.social_media_accounts.first.url, draft_worldwide_organisation.social_media_accounts.first.url