Fixed and refactored the tests.

Author: danielmorell

composer.json

@@ -38,6 +38,11 @@
             "Rollbar\\Laravel\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Rollbar\\Laravel\\Tests\\": "tests/"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [

phpunit.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="tests/bootstrap.php"
          colors="true"
@@ -8,15 +9,15 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="true"
->
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Test Suite">
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>

tests/RollbarTest.php

@@ -2,31 +2,12 @@
 
 namespace Rollbar\Laravel\Tests;
 
-use Rollbar\Laravel\RollbarServiceProvider;
 use Rollbar\Laravel\MonologHandler;
 use Rollbar\Laravel\AgentHandler;
 use Rollbar\RollbarLogger;
-use Monolog\Logger;
-use Mockery;
 
-class RollbarTest extends \Orchestra\Testbench\TestCase
+class RollbarTest extends TestCase
 {
-    private string $access_token = 'B42nHP04s06ov18Dv8X7VI4nVUs6w04X';
-
-    protected function setUp(): void
-    {
-        putenv('ROLLBAR_TOKEN=' . $this->access_token);
-
-        parent::setUp();
-        
-        Mockery::close();
-    }
-
-    protected function getPackageProviders($app)
-    {
-        return [RollbarServiceProvider::class];
-    }
-
     public function testBinding()
     {
         $client = $this->app->make(RollbarLogger::class);
@@ -55,28 +36,31 @@ public function testPassConfiguration()
 
     public function testCustomConfiguration()
     {
-        $this->app->config->set('logging.channels.rollbar.root', '/tmp');
-        $this->app->config->set('logging.channels.rollbar.included_errno', E_ERROR);
-        $this->app->config->set('logging.channels.rollbar.environment', 'staging');
+        $this->refreshApplicationWithConfig([
+            'logging.channels.rollbar.root' => '/tmp',
+            'logging.channels.rollbar.included_errno' => E_ERROR,
+            'logging.channels.rollbar.environment' => 'staging',
+        ]);
 
+        /** @var RollbarLogger $client */
         $client = $this->app->make(RollbarLogger::class);
-        $config = $client->extend([]);
-        
+        $config = $client->getConfig()->getConfigArray();
+
         $this->assertEquals('staging', $config['environment']);
         $this->assertEquals('/tmp', $config['root']);
         $this->assertEquals(E_ERROR, $config['included_errno']);
     }
 
     public function testRollbarAgentConfigurationAdapter()
     {
-        $this->app->config->set('logging.channels.rollbar.handler', AgentHandler::class);
+        $this->refreshApplicationWithConfig(['logging.channels.rollbar.handler' => AgentHandler::class]);
 
         $client = $this->app->make(RollbarLogger::class);
         $config = $client->extend([]);
 
         $this->assertEquals(
             'agent',
-            $config['handler'],
+            $config['handler'] ?? null,
             'AgentHandler given as Laravel logging config handler should be given as "agent" to Rollbar::init'
         );
     }

tests/TestCase.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Rollbar\Laravel\Tests;
+
+use Illuminate\Foundation\Application;
+use Mockery;
+use Rollbar\Laravel\RollbarServiceProvider;
+
+abstract class TestCase extends \Orchestra\Testbench\TestCase
+{
+    protected string $access_token = 'B42nHP04s06ov18Dv8X7VI4nVUs6w04X';
+
+    protected array $appConfig = [];
+
+    protected function setUp(): void
+    {
+        putenv('ROLLBAR_TOKEN=' . $this->access_token);
+
+        parent::setUp();
+
+        Mockery::close();
+    }
+
+    /**
+     * Set up the environment.
+     *
+     * @param $app
+     * @return void
+     */
+    protected function defineEnvironment($app): void
+    {
+        $configs = array_merge(
+            [
+                'logging.channels.rollbar.driver' => 'rollbar',
+                'logging.channels.rollbar.level' => 'debug',
+                'logging.channels.rollbar.access_token' => env('ROLLBAR_TOKEN'),
+            ],
+            $this->appConfig,
+        );
+        foreach ($configs as $key => $value) {
+            $app['config']->set($key, $value);
+        }
+    }
+
+    /**
+     * @param Application $app The Laravel application.
+     * @return class-string[] The service providers to register.
+     */
+    protected function getPackageProviders($app): array
+    {
+        return [RollbarServiceProvider::class];
+    }
+
+    /**
+     * Creates a new Laravel application with the given configuration and sets it as the active application.
+     *
+     * @param array $config The configuration to use.
+     * @return void
+     */
+    protected function refreshApplicationWithConfig(array $config): void
+    {
+        $this->appConfig = $config;
+        $this->refreshApplication();
+    }
+}