Supporting Laravel 5.5

Author: alexpechkarev

CHANGELOG.md

@@ -12,7 +12,7 @@ All notable changes to `pushmix/laravel-web-notification` will be documented in
 
 ## v1.1 - 2019-01-27
 
-- applying scrutinizer sugestions
+- applying scrutinizer suggestions
 - adding CODE_OF_CONDUCT.md
 - adding CONTRIBUTING.md
 - adding LICENSE.md

README.md

@@ -1,4 +1,4 @@
-## ![Pushmix](https://www.pushmix.co.uk/media/favicons/favicon-32x32.png) Pushmix Notifications Driver for Laravel.
+## ![Pushmix](https://www.pushmix.co.uk/media/favicons/favicon-32x32.png) Pushmix Notifications Driver for Laravel 5.5.
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/pushmix/laravel-web-notification.svg)](https://packagist.org/packages/pushmix/laravel-web-notification)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
@@ -11,7 +11,7 @@
 
 ## About
 
-This package makes it easy to send [Pushmix notifications](https://www.pushmix.co.uk/docs/laravel-package) with Laravel 5.3+.
+This package makes it easy to send [Pushmix notifications](https://www.pushmix.co.uk/docs/laravel-package) with Laravel 5.5.
 
 ## Contents
 

src/js/pm_service_worker.js

@@ -9,8 +9,10 @@
 use Illuminate\Notifications\AnonymousNotifiable;
 use Pushmix\WebNotification\Exceptions\CouldNotSendNotification;
 
-class ChannelTest extends TestCase
-{
+class ChannelTest extends TestCase{
+
+    protected $SUBSCRIPTION_ID = "SUBSCRIPTION_ID";
+
     public function setUp()
     {
         parent::setUp();
@@ -19,7 +21,7 @@ public function setUp()
     protected function getEnvironmentSetUp($app)
     {
         //setup db config if needed
-        $app['config']->set('pushmix.subscription_id', 'SUBSCRIPTION_ID');
+        $app['config']->set('pushmix.subscription_id', $this->SUBSCRIPTION_ID);
         $app['config']->set('pushmix.api_url', 'https://www.pushmix.co.uk/api/notify');
     }
 

tests/ChannelTest.php

@@ -12,6 +12,8 @@ class ClientTest extends TestCase
 {
     protected $client;
 
+    protected $SUBSCRIPTION_ID = "SUBSCRIPTION_ID";
+
     public function setUp()
     {
         parent::setUp();
@@ -45,9 +47,9 @@ public function it_can_init_key()
     public function it_can_get_key()
     {
         $client = new PushmixClient();
-        \Config::set('pushmix.subscription_id', 'SUBSCRIPTION_ID');
+        \Config::set('pushmix.subscription_id', $this->SUBSCRIPTION_ID);
         $client->initKey();
-        $this->assertSame('SUBSCRIPTION_ID', $client->getKey());
+        $this->assertSame($this->SUBSCRIPTION_ID, $client->getKey());
     }
 
     /***/
@@ -108,7 +110,7 @@ public function it_can_set_api_url()
     public function it_can_send_notification()
     {
         \Config::set('pushmix.api_url', 'https://www.pushmix.co.uk/api/notify');
-        \Config::set('pushmix.subscription_id', 'SUBSCRIPTION_ID');
+        \Config::set('pushmix.subscription_id', $this->SUBSCRIPTION_ID);
         $client = new PushmixClient();
         $client->initKey()->initApiUrl();
         $response = $client->sendNotification([
@@ -127,7 +129,7 @@ public function it_can_send_notification()
     public function it_can_send_notification_async()
     {
         \Config::set('pushmix.api_url', 'https://www.pushmix.co.uk/api/notify');
-        \Config::set('pushmix.subscription_id', 'SUBSCRIPTION_ID');
+        \Config::set('pushmix.subscription_id', $this->SUBSCRIPTION_ID);
         $client = new PushmixClient();
         $client->initKey()->initApiUrl();
         $client->async(true);