fix: better tests + bugfixes (#93)

* fix: better tests + bugfixes

* fix: method name change for dispatch

Author: atymic

.github/workflows/php.yml

@@ -1,6 +1,6 @@
 name: PHP
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   run:
@@ -28,4 +28,9 @@ jobs:
       - name: Lint composer.json
         run: composer validate
       - name: Run Tests
-        run: composer test:ci
+        run: composer test:unit
+      - name: Run Integration Tests
+        if: matrix.laravel-version == '^7.0'
+        run: |
+            composer require --dev --no-interaction "orchestra/testbench:^5.1"
+            composer test:integration

composer.json

@@ -40,12 +40,13 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "NotificationChannels\\Twilio\\Test\\": "tests"
+            "NotificationChannels\\Twilio\\Tests\\": "tests"
         }
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
-        "test:ci": "phpunit --verbose --coverage-clover=coverage.xml"
+        "test:unit": "phpunit --verbose --testsuite Unit",
+        "test:integration": "phpunit --verbose --testsuite Integration"
     },
     "config": {
         "sort-packages": true

phpunit.xml.dist

@@ -10,8 +10,11 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Integration">
+            <directory>tests/Integration</directory>
         </testsuite>
     </testsuites>
     <filter>

src/TwilioChannel.php

@@ -65,11 +65,7 @@ public function send($notifiable, Notification $notification)
                 ['message' => $exception->getMessage(), 'exception' => $exception]
             );
 
-            if (function_exists('event')) { // Use event helper when possible to add Lumen support
-                event($event);
-            } else {
-                $this->events->fire($event);
-            }
+            $this->events->dispatch($event);
 
             if ($this->twilio->config->isIgnoredErrorCode($exception->getCode())) {
                 return;

src/TwilioProvider.php

@@ -2,6 +2,7 @@
 
 namespace NotificationChannels\Twilio;
 
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
@@ -22,7 +23,7 @@ public function boot()
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/twilio-notification-channel.php', '');
+        $this->mergeConfigFrom(__DIR__.'/../config/twilio-notification-channel.php', 'twilio-notification-channel');
 
         $this->publishes([
             __DIR__.'/../config/twilio-notification-channel.php' => config_path('twilio-notification-channel.php'),
@@ -32,13 +33,6 @@ public function register()
             return new TwilioConfig($this->app['config']['twilio-notification-channel']);
         });
 
-        $this->app->singleton(TwilioChannel::class, function (Application $app) {
-            return new Twilio(
-                $this->app->make(TwilioService::class),
-                $this->app->make(TwilioConfig::class)
-            );
-        });
-
         $this->app->singleton(TwilioService::class, function (Application $app) {
             /** @var TwilioConfig $config */
             $config = $app->make(TwilioConfig::class);
@@ -53,6 +47,20 @@ public function register()
 
             throw InvalidConfigException::missingConfig();
         });
+
+        $this->app->singleton(Twilio::class, function (Application $app) {
+            return new Twilio(
+                $app->make(TwilioService::class),
+                $app->make(TwilioConfig::class)
+            );
+        });
+
+        $this->app->singleton(TwilioChannel::class, function (Application $app) {
+            return new TwilioChannel(
+                $app->make(Twilio::class),
+                $app->make(Dispatcher::class)
+            );
+        });
     }
 
     /**

tests/Integration/BaseIntegrationTest.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NotificationChannels\Twilio\Tests\Integration;
+
+use NotificationChannels\Twilio\TwilioProvider;
+use Orchestra\Testbench\TestCase;
+
+abstract class BaseIntegrationTest extends TestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return [TwilioProvider::class];
+    }
+}

tests/Integration/TwilioProviderTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NotificationChannels\Twilio\Tests\Integration;
+
+use NotificationChannels\Twilio\Exceptions\InvalidConfigException;
+use NotificationChannels\Twilio\TwilioChannel;
+
+class TwilioProviderTest extends BaseIntegrationTest
+{
+    public function testThatApplicationCannotCreateChannelWithoutConfig()
+    {
+        $this->expectException(InvalidConfigException::class);
+
+        $this->app->get(TwilioChannel::class);
+    }
+
+    public function testThatApplicationCannotCreateChannelWithoutSid()
+    {
+        $this->app['config']->set('twilio-notification-channel.username', 'test');
+        $this->app['config']->set('twilio-notification-channel.username', 'password');
+
+        $this->expectException(InvalidConfigException::class);
+        $this->app->get(TwilioChannel::class);
+    }
+
+    public function testThatApplicationCreatesChannelWithConfig()
+    {
+        $this->app['config']->set('twilio-notification-channel.username', 'test');
+        $this->app['config']->set('twilio-notification-channel.password', 'password');
+        $this->app['config']->set('twilio-notification-channel.account_sid', '1234');
+
+        $this->assertInstanceOf(TwilioChannel::class, $this->app->get(TwilioChannel::class));
+    }
+}

tests/TwilioProviderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace NotificationChannels\Twilio\Test;
+namespace NotificationChannels\Twilio\Tests\Unit;
 
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Notifications\Notification;

tests/IntegrationTest.php renamed to tests/Unit/IntegrationTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace NotificationChannels\Twilio\Test;
+namespace NotificationChannels\Twilio\Tests\Unit;
 
 use NotificationChannels\Twilio\TwilioCallMessage;