diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
commit | 3d25fe042679e7f5b9095983feb22f46e24c3033 (patch) | |
tree | 18b57e7abf4f3edf55f057efd6eb47da698bf0f6 /spec/services/delete_account_service_spec.rb | |
parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
parent | 0db101ede2eb9f8869932135785b0d83cd05560e (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.
Diffstat (limited to 'spec/services/delete_account_service_spec.rb')
-rw-r--r-- | spec/services/delete_account_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb index b1da97036..9c785fc17 100644 --- a/spec/services/delete_account_service_spec.rb +++ b/spec/services/delete_account_service_spec.rb @@ -90,7 +90,7 @@ RSpec.describe DeleteAccountService, type: :service do let!(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) } let!(:local_follower) { Fabricate(:account) } - it 'sends a reject follow to follwer inboxes' do + it 'sends a reject follow to follower inboxes' do subject.call expect(a_request(:post, account.inbox_url)).to have_been_made.once end |