Merge remote-tracking branch 'origin/develop' into bugfix/elixir-1.15

This commit is contained in:
Mark Felder 2024-06-18 16:47:01 +00:00
commit e43e09a04c
12 changed files with 187 additions and 112 deletions

View file

@ -952,9 +952,16 @@ defmodule Pleroma.UserTest do
{:ok, user} = User.get_or_fetch_by_ap_id("http://mastodon.example.org/users/admin")
assert user.inbox
# Oban job was generated to refresh the stale user
assert_enqueued(worker: "Pleroma.Workers.UserRefreshWorker", args: %{"ap_id" => user.ap_id})
refute user.last_refreshed_at == orig_user.last_refreshed_at
# Run job to refresh the user; just capture its output instead of fetching it again
assert {:ok, updated_user} =
perform_job(Pleroma.Workers.UserRefreshWorker, %{"ap_id" => user.ap_id})
assert updated_user.inbox
refute updated_user.last_refreshed_at == orig_user.last_refreshed_at
end
test "if nicknames clash, the old user gets a prefix with the old id to the nickname" do