Merge pull request #46 from pavoltanuska/patch-1

Return the response after sending the message

Author: Lloople

src/OneSignalChannel.php

@@ -23,6 +23,7 @@ public function __construct(OneSignalClient $oneSignal)
      * @param mixed $notifiable
      * @param \Illuminate\Notifications\Notification $notification
      *
+     * @return \Psr\Http\Message\ResponseInterface
      * @throws \NotificationChannels\OneSignal\Exceptions\CouldNotSendNotification
      */
     public function send($notifiable, Notification $notification)
@@ -45,5 +46,7 @@ public function send($notifiable, Notification $notification)
         if ($response->getStatusCode() !== 200) {
             throw CouldNotSendNotification::serviceRespondedWithAnError($response);
         }
+
+        return $response;
     }
 }

tests/ChannelTest.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Psr7\Response;
 use Orchestra\Testbench\TestCase;
 use Berkayk\OneSignal\OneSignalClient;
+use Psr\Http\Message\ResponseInterface;
 use NotificationChannels\OneSignal\OneSignalChannel;
 use NotificationChannels\OneSignal\Exceptions\CouldNotSendNotification;
 
@@ -52,7 +53,9 @@ public function it_can_send_a_notification()
             ])
             ->andReturn($response);
 
-        $this->channel->send(new Notifiable(), new TestNotification());
+        $channel_response = $this->channel->send(new Notifiable(), new TestNotification());
+
+        $this->assertInstanceOf(ResponseInterface::class, $channel_response);
     }
 
     /** @test */
@@ -104,6 +107,18 @@ public function it_can_send_a_notification_with_email()
             ])
             ->andReturn($response);
 
-        $this->channel->send(new NotifiableEmail(), new TestNotification());
+        $channel_response = $this->channel->send(new NotifiableEmail(), new TestNotification());
+
+        $this->assertInstanceOf(ResponseInterface::class, $channel_response);
+    }
+
+    /** @test */
+    public function it_sends_nothing_and_returns_null_when_player_id_empty()
+    {
+        $this->oneSignal->shouldReceive('sendNotificationCustom')
+            ->never();
+
+        $channel_response = $this->channel->send(new EmptyNotifiable(), new TestNotification());
+        $this->assertNull($channel_response);
     }
 }

tests/EmptyNotifiable.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace NotificationChannels\OneSignal\Test;
+
+class EmptyNotifiable
+{
+    use \Illuminate\Notifications\Notifiable;
+
+    /**
+     * @return int
+     */
+    public function routeNotificationForOneSignal()
+    {
+        return '';
+    }
+}