From 5c2a57080da65afc2abc2776bb12af673c41aaf7 Mon Sep 17 00:00:00 2001
From: Denisson Leal <denissonleal@gmail.com>
Date: Wed, 16 Oct 2019 22:21:18 -0300
Subject: [PATCH 1/2] fix queued mongodb usage check

---
 src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php | 3 ++-
 tests/QueueTest.php                                    | 9 +++++++++
 tests/TestCase.php                                     | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php b/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php
index 9b9d07525..54b32bae4 100644
--- a/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php
+++ b/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Jenssegers\Mongodb;
 
+use DB;
 use Illuminate\Queue\QueueServiceProvider;
 use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
 
@@ -13,7 +14,7 @@ class MongodbQueueServiceProvider extends QueueServiceProvider
     protected function registerFailedJobServices()
     {
         // Add compatible queue failer if mongodb is configured.
-        if (config('queue.failed.database') == 'mongodb') {
+        if (DB::connection(config('queue.failed.database'))->getDriverName() == 'mongodb') {
             $this->app->singleton('queue.failer', function ($app) {
                 return new MongoFailedJobProvider($app['db'], config('queue.failed.database'), config('queue.failed.table'));
             });
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 6ff26d35c..403193550 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -1,6 +1,8 @@
 <?php
 declare(strict_types=1);
 
+use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
+
 class QueueTest extends TestCase
 {
     public function setUp(): void
@@ -55,4 +57,11 @@ public function testQueueJobExpired(): void
         $job->delete();
         $this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count());
     }
+
+    public function testFailQueueJob(): void
+    {
+        $p = app('queue.failer');
+
+        $this->assertInstanceOf(MongoFailedJobProvider::class, $p);
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index c27fec178..a455b8576 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -28,6 +28,7 @@ protected function getPackageProviders($app)
     {
         return [
             Jenssegers\Mongodb\MongodbServiceProvider::class,
+            Jenssegers\Mongodb\MongodbQueueServiceProvider::class,
             Jenssegers\Mongodb\Auth\PasswordResetServiceProvider::class,
             Jenssegers\Mongodb\Validation\ValidationServiceProvider::class,
         ];
@@ -50,6 +51,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('database.default', 'mongodb');
         $app['config']->set('database.connections.mysql', $config['connections']['mysql']);
         $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']);
+        $app['config']->set('database.connections.mongodb2', $config['connections']['mongodb']);
         $app['config']->set('database.connections.dsn_mongodb', $config['connections']['dsn_mongodb']);
 
         $app['config']->set('auth.model', 'User');
@@ -63,5 +65,6 @@ protected function getEnvironmentSetUp($app)
             'queue' => 'default',
             'expire' => 60,
         ]);
+        $app['config']->set('queue.failed.database', 'mongodb2');
     }
 }

From 59546dcf4c643c9f96794dbf34d6d8eef78f2ea9 Mon Sep 17 00:00:00 2001
From: Denisson Leal <denissonleal@gmail.com>
Date: Wed, 16 Oct 2019 22:30:43 -0300
Subject: [PATCH 2/2] fix standards

---
 tests/QueueTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 403193550..16ea902bb 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -60,8 +60,8 @@ public function testQueueJobExpired(): void
 
     public function testFailQueueJob(): void
     {
-        $p = app('queue.failer');
+        $provider = app('queue.failer');
 
-        $this->assertInstanceOf(MongoFailedJobProvider::class, $p);
+        $this->assertInstanceOf(MongoFailedJobProvider::class, $provider);
     }
 }