From 8b11816cc8e5ab03a61ac2b49d5bf117a6686bc7 Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Mon, 15 Dec 2025 15:20:28 +0000 Subject: [PATCH] Better name for `#hide`, which perhaps should not exist --- app/models/user.rb | 4 +++- test/controllers/confirmations_controller_test.rb | 4 ++-- test/integration/oauth2_test.rb | 2 +- test/models/user_test.rb | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4db537ee3..53d70464c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -229,7 +229,9 @@ class User < ApplicationRecord end # Mark the account as deleted but keep all data intact - event :hide do + # Only to be used in tests. There's currently no production + # use for this transition. + event :mark_deleted do before do close_open_issues end diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index ebe2e12ce..d5ac542a3 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -177,7 +177,7 @@ class ConfirmationsControllerTest < ActionDispatch::IntegrationTest post users_path, :params => { :user => user.attributes } confirm_string = User.find_by(:email => user.email).generate_token_for(:new_user) - User.find_by(:display_name => user.display_name).hide! + User.find_by(:display_name => user.display_name).mark_deleted! # Get the confirmation page get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string } @@ -212,7 +212,7 @@ class ConfirmationsControllerTest < ActionDispatch::IntegrationTest user = build(:user, :pending) post users_path, :params => { :user => user.attributes } - User.find_by(:display_name => user.display_name).hide! + User.find_by(:display_name => user.display_name).mark_deleted! assert_no_difference "ActionMailer::Base.deliveries.size" do perform_enqueued_jobs do diff --git a/test/integration/oauth2_test.rb b/test/integration/oauth2_test.rb index 67e0a1807..7f03e0d00 100644 --- a/test/integration/oauth2_test.rb +++ b/test/integration/oauth2_test.rb @@ -246,7 +246,7 @@ class OAuth2Test < ActionDispatch::IntegrationTest get api_user_preferences_path, :headers => auth_header assert_response :forbidden - user.hide! + user.mark_deleted! get api_user_preferences_path, :headers => auth_header assert_response :forbidden diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 520d91cdf..1b4b4d548 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -432,16 +432,16 @@ class UserTest < ActiveSupport::TestCase assert_equal "resolved", issue.reload.status end - def test_hide + def test_mark_deleted user = create(:user) - user.hide + user.mark_deleted assert_equal "deleted", user.status end - def test_hide_closes_issues + def test_mark_deleted_closes_issues user = create(:user) issue = create(:issue, :reportable => user) - user.hide + user.mark_deleted assert_equal "deleted", user.status assert_equal "resolved", issue.reload.status end -- 2.39.5