merge from main

tests/app/dao/test_service_sms_sender_dao.py

@@ -159,16 +159,11 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session):
         is_default=True,
         sms_sender="updated",
     )
-    sms_senders = (
-        ServiceSmsSender.query.filter_by(service_id=service.id)
-        .order_by(ServiceSmsSender.created_at)
-        .all()
-    )
-    assert len(sms_senders) == 2
-    assert sms_senders[0].sms_sender == "testing"
-    assert not sms_senders[0].is_default
-    assert sms_senders[1].sms_sender == "updated"
-    assert sms_senders[1].is_default
+    sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+
+    expected = {("testing", False), ("updated", True)}
+    results = {(sender.sms_sender, sender.is_default) for sender in sms_senders}
+    assert expected == results
 
 
 def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_update(

tests/app/test_utils.py

@@ -13,6 +13,7 @@ from app.utils import (
     get_reference_from_personalisation,
     get_uuid_string_or_none,
     midnight_n_days_ago,
+    scrub,
 )
 
 
@@ -94,6 +95,13 @@ def test_get_public_notify_type_text():
     )
 
 
+def test_scrub():
+    result = scrub(
+        "This is a message with 17775554324, and also 18884449323 and also 17775554324"
+    )
+    assert result == "This is a message with 1XXXXX54324, and also 1XXXXX49323 and also 1XXXXX54324"
+
+
 # This method is used for simulating bulk sends.  We use localstack and run on a developer's machine to do the
 # simulation.  Please see docs->bulk_testing.md for instructions.
 # def test_generate_csv_for_bulk_testing():