Updated code style, added new test, fixed broken tests

laravel · Jul 28, 2019 · 638d1cc · 638d1cc
1 parent c34618c
commit 638d1cc
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/src/Channels/NexmoSmsChannel.php b/src/Channels/NexmoSmsChannel.php
@@ -59,7 +59,7 @@ public function send($notifiable, Notification $notification)
             'from' => $message->from ?: $this->from,
             'to' => $to,
             'text' => trim($message->content),
-            'client_ref' => $message->client_ref,
+            'client_ref' => $message->clientRef,
         ]);
     }
 }
diff --git a/src/Messages/NexmoMessage.php b/src/Messages/NexmoMessage.php
@@ -30,7 +30,7 @@ class NexmoMessage
      *
      * @var string
      */
-    public $client_ref = '';
+    public $clientRef = '';
 
     /**
      * Create a new message instance.
@@ -84,12 +84,12 @@ public function unicode()
     /**
      * Set the client reference (up to 40 characters).
      *
-     * @param  string  $client_ref
+     * @param  string  $clientRef
      * @return $this
      */
-    public function clientRef($client_ref)
+    public function clientRef($clientRef)
     {
-        $this->client_ref = $client_ref;
+        $this->clientRef = $clientRef;
 
         return $this;
     }

diff --git a/tests/NotificationNexmoChannelTest.php b/tests/NotificationNexmoChannelTest.php
@@ -31,6 +31,7 @@ public function testSmsIsSentViaNexmo()
             'from' => '4444444444',
             'to' => '5555555555',
             'text' => 'this is my message',
+            'client_ref' => '',
         ]);
 
         $channel->send($notifiable, $notification);
@@ -50,6 +51,27 @@ public function testSmsIsSentViaNexmoWithCustomFrom()
             'from' => '5554443333',
             'to' => '5555555555',
             'text' => 'this is my message',
+            'client_ref' => '',
+        ]);
+
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testSmsIsSentViaNexmoWithCustomFromAndClientRef()
+    {
+        $notification = new NotificationNexmoChannelTestCustomFromAndClientRefNotification;
+        $notifiable = new NotificationNexmoChannelTestNotifiable;
+
+        $channel = new NexmoSmsChannel(
+            $nexmo = m::mock(Client::class), '4444444444'
+        );
+
+        $nexmo->shouldReceive('message->send')->with([
+            'type' => 'unicode',
+            'from' => '5554443333',
+            'to' => '5555555555',
+            'text' => 'this is my message',
+            'client_ref' => '11',
         ]);
 
         $channel->send($notifiable, $notification);
@@ -78,3 +100,11 @@ public function toNexmo($notifiable)
         return (new NexmoMessage('this is my message'))->from('5554443333')->unicode();
     }
 }
+
+class NotificationNexmoChannelTestCustomFromAndClientRefNotification extends Notification
+{
+    public function toNexmo($notifiable)
+    {
+        return (new NexmoMessage('this is my message'))->from('5554443333')->unicode()->clientRef('11');
+    }
+}