From 06bfe2c9824e29037adbe16ce4970654cadde5f1 Mon Sep 17 00:00:00 2001 From: Kevin McConnell Date: Thu, 11 Dec 2025 11:28:32 +0000 Subject: [PATCH] Scope the config option Also use a `configure` block to set it up. --- config/environments/test.rb | 2 +- config/initializers/multi_tenant.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 0bfb2e0f0..157e4b00b 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -69,5 +69,5 @@ Rails.application.configure do config.autoload_paths += %w[ test/test_helpers ] # Enable multi-tenant mode for tests - config.x.multi_tenant = true + config.x.multi_tenant.enabled = true end diff --git a/config/initializers/multi_tenant.rb b/config/initializers/multi_tenant.rb index 0b581ef9d..0bf19fa65 100644 --- a/config/initializers/multi_tenant.rb +++ b/config/initializers/multi_tenant.rb @@ -1,3 +1,5 @@ -Rails.application.config.after_initialize do - Account.multi_tenant = ENV["MULTI_TENANT"] == "true" || Rails.configuration.x.multi_tenant == true +Rails.application.configure do + config.after_initialize do + Account.multi_tenant = ENV["MULTI_TENANT"] == "true" || config.x.multi_tenant.enabled == true + end end