From 7583f3645db3d9537c2b53402feccde92fb8cdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Mon, 19 Aug 2019 14:07:06 +0200
Subject: [PATCH] wip

---
 src/TenancyServiceProvider.php |  2 +-
 tests/QueueTest.php            | 61 ++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 tests/QueueTest.php

diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index 300758c0..411873f5 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -70,7 +70,7 @@ class TenancyServiceProvider extends ServiceProvider
     {
         $this->app['queue']->createPayloadUsing(function () {
             if (tenancy()->initialized) {
-                [$uuid, $domain] = tenant()->get('uuid', 'domain');
+                [$uuid, $domain] = tenant()->get(['uuid', 'domain']);
 
                 return [
                     'tenant_uuid' => $uuid,
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
new file mode 100644
index 00000000..aa0bfa0c
--- /dev/null
+++ b/tests/QueueTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stancl\Tenancy\Tests;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\Events\JobProcessed;
+use Illuminate\Queue\Events\JobProcessing;
+use Illuminate\Support\Facades\Event;
+
+class QueueTest extends TestCase
+{
+    /** @test */
+    public function queues_use_non_tenant_db_connection()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    public function tenancy_is_initialized_inside_queues()
+    {
+        // Queue::fake();
+        $this->loadLaravelMigrations(['--database' => 'tenant']);
+        Event::fake();
+
+        dispatch(new TestJob());
+        // Queue::assertPushed(TestJob::class);
+        Event::assertDispatched(JobProcessing::class, function ($event) {
+            return $event->job->payload()['tenant_uuid'] === tenant('uuid');
+        });
+    }
+}
+
+class TestJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        logger(json_encode(\DB::table('users')->get()));
+    }
+}
\ No newline at end of file