mirror of
https://github.com/mastodon/mastodon.git
synced 2026-07-28 12:27:28 -05:00
Rename ASSOCIATIONS_ON_SUSPEND to ASSOCIATIONS_ON_PURGE (#39831)
This commit is contained in:
parent
49426e7153
commit
bb4af880b2
|
|
@ -3,7 +3,7 @@
|
|||
class DeleteAccountService < BaseService
|
||||
include Payloadable
|
||||
|
||||
ASSOCIATIONS_ON_SUSPEND = %w(
|
||||
ASSOCIATIONS_ON_PURGE = %w(
|
||||
account_notes
|
||||
account_pins
|
||||
active_relationships
|
||||
|
|
@ -304,9 +304,9 @@ class DeleteAccountService < BaseService
|
|||
|
||||
def associations_for_destruction
|
||||
if keep_account_record?
|
||||
ASSOCIATIONS_ON_SUSPEND
|
||||
ASSOCIATIONS_ON_PURGE
|
||||
else
|
||||
ASSOCIATIONS_ON_SUSPEND + ASSOCIATIONS_ON_DESTROY
|
||||
ASSOCIATIONS_ON_PURGE + ASSOCIATIONS_ON_DESTROY
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -63,6 +63,12 @@ RSpec.describe DeleteAccountService do
|
|||
end
|
||||
end
|
||||
|
||||
describe 'ASSOCIATIONS_WITHOUT_SIDE_EFFECTS' do
|
||||
it 'is a subset of ASSOCIATIONS_ON_PURGE' do
|
||||
expect(described_class::ASSOCIATIONS_WITHOUT_SIDE_EFFECTS - described_class::ASSOCIATIONS_ON_PURGE).to eq []
|
||||
end
|
||||
end
|
||||
|
||||
describe '#call on local account', :inline_jobs do
|
||||
before do
|
||||
stub_request(:post, remote_alice.inbox_url).to_return(status: 201)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user