Merge remote-tracking branch 'parent/main' into upstream-20240109

2025-01-09 13:20:56 +09:00 · 2025-01-09 13:20:56 +09:00 · d35fa72842
commit d35fa72842
parent 088207ae9f 3c7f3b190c
333 changed files with 4444 additions and 2541 deletions
--- a/spec/controllers/admin/export_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@ -6,7 +6,7 @@ RSpec.describe Admin::ExportDomainBlocksController do
  render_views

  before do
-    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+    sign_in Fabricate(:admin_user), scope: :user
  end

  describe 'GET #new' do