test: move helper tests to FcmMessageTest as requested

Author: Jgmdevelopers

src/FcmMessage.php

@@ -12,7 +12,10 @@ class FcmMessage implements Message
 {
     use Macroable;
 
-   
+
+    /**
+     * Create a new message instance.
+     */
     public function __construct(
         public ?string $name = null,
         public ?string $token = null,
@@ -22,15 +25,23 @@ public function __construct(
         public array $custom = [],
         public ?Notification $notification = null,
         public ?Messaging $client = null,
-    ) { }
+    ) {
+        //
+    }
 
-    
+
+    /**
+     * Create a new message instance.
+     */
     public static function create(...$args): static
     {
         return new static(...$args);
     }
 
-   
+
+    /**
+     * Set the message name.
+     */
     public function name(?string $name): self
     {
         $this->name = $name;
@@ -46,6 +57,9 @@ public function token(?string $token): self
         return $this;
     }
 
+    /**
+     * Set the message topic.s
+     */
     public function topic(?string $topic): self
     {
         $this->topic = $topic;
@@ -75,17 +89,18 @@ public function data(?array $data): self
 
     public function custom(?array $custom = []): self
     {
-        $this->custom = $custom ?? [];
+        $this->custom = $custom;
 
         return $this;
     }
 
+
     /**
-     * Set android-specific custom options.
+     * Set "android" specific custom options.
      */
     public function android(array $options = []): self
     {
-        
+
         $this->custom([
             ...$this->custom,
             'android' => $options,
@@ -95,14 +110,17 @@ public function android(array $options = []): self
     }
 
 
+
     /**
+     * Set APNs-specific custom options for iOS.
      * Set APNs-specific custom options for iOS.
      */
     public function ios(array $options = []): self
     {
         $this->custom([
             ...$this->custom,
             'apns' => $options,
+            'apns' => $options,
         ]);
 
         return $this;
@@ -123,10 +141,10 @@ public function usingClient(Messaging $client): self
         return $this;
     }
 
+
     public function toArray()
     {
-
-        $payload = array_filter([
+        return array_filter([
             'name' => $this->name,
             'data' => $this->data,
             'token' => $this->token,
@@ -135,12 +153,9 @@ public function toArray()
             'notification' => $this->notification?->toArray(),
             ...$this->custom,
         ]);
-
-
-
-        return $payload;
     }
 
+
     /**
      * @return mixed
      */

tests/FcmMessageHelpersTest.php

@@ -109,4 +109,43 @@ public function test_it_can_set_client()
 
         $this->assertSame($client, $message->client);
     }
+
+    public function test_appends_android_options_into_custom()
+    {
+        $msg = FcmMessage::create()
+            ->notification(new Notification(title: 'T', body: 'B'))
+            ->android(['notification' => ['channel_id' => 'ops', 'sound' => 'default']]);
+
+        $payload = $msg->toArray();
+
+        $this->assertArrayHasKey('android', $payload);
+        $this->assertArrayHasKey('notification', $payload['android']);
+        $this->assertEquals('ops', $payload['android']['notification']['channel_id']);
+        $this->assertEquals('default', $payload['android']['notification']['sound']);
+    }
+
+    public function test_appends_ios_options_into_custom()
+    {
+        $msg = FcmMessage::create()
+            ->ios(['payload' => ['aps' => ['sound' => 'default']]]);
+
+        $payload = $msg->toArray();
+
+        $this->assertArrayHasKey('apns', $payload);
+        $this->assertArrayHasKey('payload', $payload['apns']);
+        $this->assertEquals('default', $payload['apns']['payload']['aps']['sound']);
+    }
+
+    public function test_preserves_existing_custom_keys_when_using_helpers()
+    {
+        $msg = FcmMessage::create()
+            ->custom(['meta' => ['a' => 1]])
+            ->android(['notification' => ['color' => '#000']]);
+
+        $payload = $msg->toArray();
+
+        $this->assertArrayHasKey('meta', $payload);
+        $this->assertEquals(1, $payload['meta']['a']);
+        $this->assertEquals('#000', $payload['android']['notification']['color']);
+    }
 }