From 3407faf8119ced1b923a40a84c29c67b23b70aec Mon Sep 17 00:00:00 2001
From: Abrar Ahmad <abrar.dev99@gmail.com>
Date: Wed, 30 Nov 2022 13:25:39 +0500
Subject: [PATCH] fix prefix test according to prefix changes

---
 tests/PrefixCacheBootstrapperTest.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/PrefixCacheBootstrapperTest.php b/tests/PrefixCacheBootstrapperTest.php
index 603cba43..e03c3dfe 100644
--- a/tests/PrefixCacheBootstrapperTest.php
+++ b/tests/PrefixCacheBootstrapperTest.php
@@ -20,39 +20,40 @@ beforeEach(function () {
 });
 
 test('cache prefix is separate for each tenant', function () {
-    $originalPrefix = config('cache.prefix') . ':';
+    $originalPrefix = config('cache.prefix');
+    $prefixBase = config('tenancy.cache.prefix_base');
 
-    expect($originalPrefix)
+    expect($originalPrefix . ':') // cache manager postfix ':' to prefix
         ->toBe(app('cache')->getPrefix())
         ->toBe(app('cache.store')->getPrefix());
 
     $tenant1 = Tenant::create();
     $tenant2 = Tenant::create();
 
-    $tenantOnePrefix = 'tenant_' . $tenant1->id . ':';
+    $tenantOnePrefix = $originalPrefix . $prefixBase . $tenant1->getTenantKey();
 
     tenancy()->initialize($tenant1);
     cache()->set('key', 'tenantone-value');
 
-    expect($tenantOnePrefix)
+    expect($tenantOnePrefix . ':')
         ->toBe(app('cache')->getPrefix())
         ->toBe(app('cache.store')->getPrefix());
 
-    $tenantTwoPrefix = 'tenant_' . $tenant2->id . ':';
+    $tenantTwoPrefix = $originalPrefix . $prefixBase . $tenant2->getTenantKey();
 
     tenancy()->initialize($tenant2);
     cache()->set('key', 'tenanttwo-value');
 
-    expect($tenantTwoPrefix)
+    expect($tenantTwoPrefix . ':')
         ->toBe(app('cache')->getPrefix())
         ->toBe(app('cache.store')->getPrefix());
 
     // Assert tenants' data is accessible using the prefix from the central context
     tenancy()->end();
-    config(['cache.prefix' => null]); // stop prefixing cache keys in central
+    config(['cache.prefix' => null]); // stop prefixing cache keys in central so we can provide prefix manually
 
-    expect(cache($tenantOnePrefix . 'key'))->toBe('tenantone-value');
-    expect(cache($tenantTwoPrefix . 'key'))->toBe('tenanttwo-value');
+    expect(cache($tenantOnePrefix . ':key'))->toBe('tenantone-value');
+    expect(cache($tenantTwoPrefix . ':key'))->toBe('tenanttwo-value');
 });
 
 test('cache is persisted when reidentification is used', function () {