app/controllers/application_controller.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2024 Manuel Bustillo
 
 class ApplicationController < ActionController::Base
-  set_current_tenant_through_filter
   before_action :set_tenant
   before_action :authenticate_user!
   after_action :set_csrf_cookie
@@ -48,7 +47,7 @@ class ApplicationController < ActionController::Base
   end
 
   def set_tenant
-    set_current_tenant(Wedding.find_by!(slug: params[:slug]))
+    ActsAsTenant.current_tenant = Wedding.find_by(slug: params[:slug])
   end
 
   def development_swagger?

config/initializers/acts_as_tenant.rb

@@ -1,5 +0,0 @@
-# Copyright (C) 2024 Manuel Bustillo
-
-ActsAsTenant.configure do |config|
-  config.require_tenant = !Rails.env.test?
-end

db/seeds.rb

@@ -2,15 +2,12 @@
 
 NUMBER_OF_GUESTS = 50
 
-ActsAsTenant.without_tenant do
+TablesArrangement.delete_all
-  TablesArrangement.delete_all
+Expense.delete_all
-  Expense.delete_all
+Guest.delete_all
-  Guest.delete_all
+Group.delete_all
-  Group.delete_all
-  
-  Wedding.delete_all
-end
 
+Wedding.delete_all
 wedding = Wedding.create!(slug: :default, date: 1.year.from_now)
 
 ActsAsTenant.with_tenant(wedding) do