end tenancy in queue if the next job is not tenant aware

src/Bootstrappers/QueueTenancyBootstrapper.php

@@ -75,14 +75,20 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
 
     protected static function initializeTenancyForQueue($tenantId)
     {
-        // The job is not tenant-aware
         if (! $tenantId) {
+            // The job is not tenant-aware
+            if (tenancy()->initialized) {
+                // Tenancy was initialized, so we revert back to the central context
+                tenancy()->end();
+            }
+
             return;
         }
 
         if (tenancy()->initialized) {
+            // Tenancy is already initialized
             if (tenant()->getTenantKey() === $tenantId) {
-                // Tenancy is already initialized for the tenant (e.g. dispatchNow was used)
+                // It's initialized for the same tenant (e.g. dispatchNow was used, or the previous job also ran for this tenant)
                 return;
             }
         }

tests/Etc/tmp/queuetest.json

@@ -1 +0,0 @@
-{"userName":"Bar","shouldFail":false,"tenant_id":"The current tenant id is: a7f73c10-9879-40ae-b7b0-1ded7c1f7b1b"}

tests/QueueTest.php

@@ -55,6 +55,11 @@ class QueueTest extends TestCase
         $this->valuestore = Valuestore::make(__DIR__ . '/Etc/tmp/queuetest.json')->flush();
     }
 
+    public function tearDown(): void
+    {
+        $this->valuestore->flush();
+    }
+
     protected function withFailedJobs()
     {
         Schema::connection('central')->create('failed_jobs', function (Blueprint $table) {