Merge pull request #2376 from alphagov/fix-for-fix-for-migration-that…

…-stripped-whitespace-from-biu-organisation-slug Handle nil name in BatchInvitationUser#strip_whitespace_from_name
alphagov · Sep 25, 2023 · b6c7bf1 · b6c7bf1
2 parents afe562d + 12f0417
commit b6c7bf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/batch_invitation_user.rb b/app/models/batch_invitation_user.rb
@@ -99,7 +99,7 @@ def sanitise_attributes_for_inviting_user_role(raw_attributes, inviting_user)
   end
 
   def strip_whitespace_from_name
-    name.strip!
+    name&.strip!
   end
 
   def strip_whitespace_from_email

diff --git a/test/models/batch_invitation_user_test.rb b/test/models/batch_invitation_user_test.rb
@@ -20,6 +20,12 @@ class BatchInvitationUserTest < ActiveSupport::TestCase
 
       assert_equal "cabinet-office", user.organisation_slug
     end
+
+    should "strip unwanted whitespace from organisation_slug before persisting even if name is nil" do
+      user = create(:batch_invitation_user, organisation_slug: "  cabinet-office ", name: nil)
+
+      assert_equal "cabinet-office", user.organisation_slug
+    end
   end
 
   context "validations" do