Merge pull request 'fix-tenant-scope' (#159 ) from fix-tenant-scope into main

Reviewed-on: #159
Do not require a tenant scope for running tests
2024-12-02 19:35:36 +00:00 · 2024-12-02 20:33:05 +01:00 · 2024-12-02 08:05:46 +00:00 · 2024-12-02 09:04:48 +01:00 · 2024-12-02 08:57:10 +01:00
3 changed files with 15 additions and 6 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -1,6 +1,7 @@
 # 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
@ -47,7 +48,7 @@ class ApplicationController < ActionController::Base
  end
  def set_tenant
-    ActsAsTenant.current_tenant = Wedding.find_by(slug: params[:slug])
+    set_current_tenant(Wedding.find_by!(slug: params[:slug]))
  end
  def development_swagger?
--- a/config/initializers/acts_as_tenant.rb
+++ b/config/initializers/acts_as_tenant.rb
@ -0,0 +1,5 @@
 # Copyright (C) 2024 Manuel Bustillo
 ActsAsTenant.configure do |config|
  config.require_tenant = !Rails.env.test?
 end
--- a/db/seeds.rb
+++ b/db/seeds.rb
@ -2,12 +2,15 @@
 NUMBER_OF_GUESTS = 50
-TablesArrangement.delete_all
+ActsAsTenant.without_tenant do
-Expense.delete_all
+  TablesArrangement.delete_all
-Guest.delete_all
+  Expense.delete_all
-Group.delete_all
+  Guest.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
Author	SHA1	Message	Date
bustikiller	e0a34df7b7	Merge pull request 'fix-tenant-scope' (#159 ) from fix-tenant-scope into main Some checks failed Check usage of free licenses / check-licenses (push) Successful in 1m2s Details Run unit tests / unit_tests (push) Successful in 2m57s Details Build Nginx-based docker image / build-static-assets (push) Failing after 15m23s Details Reviewed-on: #159	2024-12-02 19:35:36 +00:00
Manuel Bustillo	a96be2a79e	Do not require a tenant scope for running tests All checks were successful Check usage of free licenses / check-licenses (pull_request) Successful in 47s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m35s Details Run unit tests / unit_tests (pull_request) Successful in 2m24s Details	2024-12-02 20:33:05 +01:00
Manuel Bustillo	3ea1d1e7ec	Add copyright notice Some checks failed Check usage of free licenses / check-licenses (pull_request) Successful in 1m39s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m56s Details Run unit tests / unit_tests (pull_request) Failing after 2m44s Details	2024-12-02 08:05:46 +00:00
Manuel Bustillo	3fca449461	Limit visibility per tenant Some checks failed Add copyright notice / copyright_notice (pull_request) Successful in 57s Details Check usage of free licenses / check-licenses (pull_request) Successful in 1m29s Details Run unit tests / unit_tests (pull_request) Failing after 3m28s Details	2024-12-02 09:04:48 +01:00
Manuel Bustillo	ef573c5f73	Require a tenant to be configured for all queries	2024-12-02 08:57:10 +01:00