From a5580666a7180d2b4e0c881c1d8e2281090852d2 Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Wed, 10 Dec 2025 17:15:26 +0000
Subject: [PATCH] Single tenant by default & update tests

---
 app/models/concerns/multi_tenant.rb         |  2 +-
 test/controllers/signups_controller_test.rb | 13 +++++--------
 test/test_helper.rb                         |  2 ++
 test/test_helpers/session_test_helper.rb    |  8 ++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/models/concerns/multi_tenant.rb b/app/models/concerns/multi_tenant.rb
index 07d98025d..4a9c194f2 100644
--- a/app/models/concerns/multi_tenant.rb
+++ b/app/models/concerns/multi_tenant.rb
@@ -3,7 +3,7 @@ module MultiTenant
 
   class_methods do
     def accepting_signups?
-      ENV.fetch("MULTI_TENANT", "true") == "true" || Account.none?
+      ENV.fetch("MULTI_TENANT", "false") == "true" || Account.none?
     end
   end
 end
diff --git a/test/controllers/signups_controller_test.rb b/test/controllers/signups_controller_test.rb
index a56446463..230064515 100644
--- a/test/controllers/signups_controller_test.rb
+++ b/test/controllers/signups_controller_test.rb
@@ -65,17 +65,14 @@ class SignupsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "redirects to session#new when single_tenant and user exists" do
-    previous_multi_tenant = ENV["MULTI_TENANT"]
-    ENV["MULTI_TENANT"] = "false"
-
     users(:david)
 
-    untenanted do
-      get new_signup_path
+    in_single_tenant_mode do
+      untenanted do
+        get new_signup_path
 
-      assert_redirected_to new_session_url
+        assert_redirected_to new_session_url
+      end
     end
-  ensure
-    ENV["MULTI_TENANT"] = previous_multi_tenant
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 12ab491ed..36738664e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,6 @@
 ENV["RAILS_ENV"] ||= "test"
+ENV["MULTI_TENANT"] ||= "true"
+
 require_relative "../config/environment"
 
 require "rails/test_help"
diff --git a/test/test_helpers/session_test_helper.rb b/test/test_helpers/session_test_helper.rb
index 927123bcf..b7f369036 100644
--- a/test/test_helpers/session_test_helper.rb
+++ b/test/test_helpers/session_test_helper.rb
@@ -57,4 +57,12 @@ module SessionTestHelper
   ensure
     integration_session.default_url_options[:script_name] = original_script_name
   end
+
+  def in_single_tenant_mode
+    previous_multi_tenant = ENV["MULTI_TENANT"]
+    ENV["MULTI_TENANT"] = "false"
+    yield
+  ensure
+    ENV["MULTI_TENANT"] = previous_multi_tenant
+  end
 end