Fix test_tenant leaking into current_tenant

lib/acts_as_tenant.rb

@@ -85,7 +85,7 @@ def self.with_tenant(tenant, &block)
       raise ArgumentError, "block required"
     end
 
-    old_tenant = current_tenant
+    old_tenant = RequestStore[:current_tenant]
     self.current_tenant = tenant
     value = block.call
     value
@@ -98,7 +98,7 @@ def self.without_tenant(&block)
       raise ArgumentError, "block required"
     end
 
-    old_tenant = current_tenant
+    old_tenant = RequestStore[:current_tenant]
     old_unscoped = unscoped
 
     self.current_tenant = nil

spec/middlewares/test_tenant_middleware_spec.rb

@@ -81,6 +81,18 @@ def self.assert_current_id(id)
         expect(subject.status).to eq 200
         expect(ActsAsTenant.current_tenant).to eq account2
       end
+
+      it "does not leak test_tenant into current_tenant when using with_tenant before request" do
+        ActsAsTenant.with_tenant(account1) {}
+        expect(TestReceiver).to receive(:assert_current_id).with(nil)
+        expect(subject.status).to eq 200
+      end
+
+      it "does not leak test_tenant into current_tenant when using without_tenant before request" do
+        ActsAsTenant.without_tenant {}
+        expect(TestReceiver).to receive(:assert_current_id).with(nil)
+        expect(subject.status).to eq 200
+      end
     end
   end
 end