test: fix lazy firebase rebase follow-ups

Author: xtrinch

fcm_django/models.py

@@ -29,6 +29,7 @@
 MAX_MESSAGES_PER_BATCH = 500
 MAX_DEVICES_PER_SUBSCRIBE_REQUEST = 1000
 
+
 class Device(models.Model):
     id = models.AutoField(
         verbose_name="ID",
@@ -134,9 +135,9 @@ def _build_bulk_personalized_messages(
         registration_ids: list[str],
         title_template: str,
         body_template: str,
-        message_data: Optional[dict[str, dict[str, Any]]] = None,
-        data_fields: Optional[dict[str, Any]] = None,
-    ) -> list["messaging.Message"]:
+        message_data: dict[str, dict[str, Any]] | None = None,
+        data_fields: dict[str, Any] | None = None,
+    ) -> list[messaging.Message]:
         from firebase_admin import messaging
 
         messages = []
@@ -159,7 +160,7 @@ def _build_bulk_personalized_messages(
     @staticmethod
     def _get_deactivation_candidates(
         registration_ids: list[str],
-        results: list[Union["messaging.SendResponse", "messaging.ErrorInfo"]],
+        results: list[messaging.SendResponse | messaging.ErrorInfo],
     ) -> list[str]:
         if not results:
             return []
@@ -275,10 +276,10 @@ def send_message(
 
     async def asend_message(
         self,
-        message: "messaging.Message",
+        message: messaging.Message,
         skip_registration_id_lookup: bool = False,
         additional_registration_ids: Sequence[str] = None,
-        app: Optional["firebase_admin.App"] = None,
+        app: firebase_admin.App | None = None,
         **more_send_message_kwargs,
     ) -> FirebaseResponseDict:
         registration_ids = await self.aget_registration_ids(
@@ -374,11 +375,11 @@ async def asend_bulk_personalized_messages(
         self,
         title_template: str,
         body_template: str,
-        message_data: Optional[dict[str, dict[str, Any]]] = None,
-        data_fields: Optional[dict[str, Any]] = None,
+        message_data: dict[str, dict[str, Any]] | None = None,
+        data_fields: dict[str, Any] | None = None,
         skip_registration_id_lookup: bool = False,
         additional_registration_ids: Sequence[str] = None,
-        app: Optional["firebase_admin.App"] = None,
+        app: firebase_admin.App | None = None,
         **more_send_message_kwargs,
     ) -> FirebaseResponseDict:
         registration_ids = await self.aget_registration_ids(
@@ -438,7 +439,7 @@ async def adeactivate(
         *,
         reason: str,
         source: str,
-        metadata: Optional[dict[str, Any]] = None,
+        metadata: dict[str, Any] | None = None,
     ) -> list[str]:
         active_devices = self.filter(active=True)
         device_rows = [
@@ -483,7 +484,7 @@ def deactivate_devices_with_error_results(
     async def adeactivate_devices_with_error_results(
         self,
         registration_ids: list[str],
-        results: list[Union["messaging.SendResponse", "messaging.ErrorInfo"]],
+        results: list[messaging.SendResponse | messaging.ErrorInfo],
     ) -> list[str]:
         deactivation_candidates = self._get_deactivation_candidates(
             registration_ids, results

tests/test_admin.py

@@ -37,7 +37,7 @@ def test_send_message_action_handles_firebase_error(
     client, base_admin_url, fcm_device, mocker
 ):
     mocker.patch(
-        "fcm_django.models.messaging.send",
+        "firebase_admin.messaging.send",
         side_effect=FirebaseError(code="unknown", message="firebase failed"),
     )
 
@@ -60,7 +60,7 @@ def test_send_topic_message_action_handles_firebase_error(
     client, base_admin_url, fcm_device, mocker
 ):
     mocker.patch(
-        "fcm_django.models.messaging.send",
+        "firebase_admin.messaging.send",
         side_effect=FirebaseError(code="unknown", message="firebase failed"),
     )
 

tests/test_models.py

@@ -110,11 +110,11 @@ def assert_sent_successfully(
         self,
         result: Any,
         fcm_device: FCMDevice,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
         message_id: str,
         app: Any = None,
-        send_message_kwargs: Optional[dict] = None,
+        send_message_kwargs: dict | None = None,
     ):
         send_message_kwargs = send_message_kwargs or {}
 
@@ -135,7 +135,7 @@ def assert_sent_successfully(
     def test_ok(
         self,
         fcm_device: FCMDevice,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
         firebase_message_id_send: str,
     ):
@@ -151,7 +151,7 @@ def test_ok(
     def test_custom_params(
         self,
         fcm_device: FCMDevice,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
         firebase_message_id_send: str,
     ):
@@ -200,9 +200,9 @@ def test_uses_overridden_default_firebase_app(
     def test_firebase_error(
         self,
         fcm_device: FCMDevice,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
-        firebase_error: "FirebaseError",
+        firebase_error: FirebaseError,
     ):
         """
         Ensure when happened unknown firebase error device is still active and raised the FirebaseError
@@ -221,7 +221,7 @@ def test_firebase_error(
     def test_firebase_invalid_registration_error(
         self,
         fcm_device: FCMDevice,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
     ):
         """
@@ -265,12 +265,12 @@ class TestFCMDeviceSendTopicMessage:
     def assert_sent_successfully(
         self,
         result: Any,
-        message: "Message",
+        message: Message,
         topic: str,
         mock_firebase_send: MagicMock,
         message_id: str,
         app: Any = None,
-        send_message_kwargs: Optional[dict] = None,
+        send_message_kwargs: dict | None = None,
     ):
         send_message_kwargs = send_message_kwargs or {}
 
@@ -289,7 +289,7 @@ def assert_sent_successfully(
 
     def test_ok(
         self,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
         firebase_message_id_send: str,
     ):
@@ -306,7 +306,7 @@ def test_ok(
 
     def test_custom_params(
         self,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
         firebase_message_id_send: str,
     ):
@@ -334,9 +334,9 @@ def test_custom_params(
 
     def test_firebase_error(
         self,
-        message: "Message",
+        message: Message,
         mock_firebase_send: MagicMock,
-        firebase_error: "FirebaseError",
+        firebase_error: FirebaseError,
     ):
         """
         Ensure we raise an error in case firebase_admin.messaging.send throws one

tests/test_settings.py

@@ -51,6 +51,7 @@ def test_runtime_settings_do_not_share_nested_defaults():
 
     assert "temporary" not in DEFAULT_SETTINGS["ERRORS"]
 
+
 def test_importing_models_and_admin_does_not_eager_load_firebase_admin():
     env = {
         **os.environ,