diff options
| author | feld <feld@feld.me> | 2020-08-24 17:03:18 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-08-24 17:03:18 +0000 |
| commit | d39abd02acf75d5f653052b0d4b579164a7fde5b (patch) | |
| tree | ab65cec2cd95b8449e31e48ad545a442ccedbaf1 /test/web/activity_pub | |
| parent | e1c8c599ff12699692ec7f06efc44064ee5ecb0b (diff) | |
| parent | 13f6029b4b7aad145c68fe804d34fbff9a371d36 (diff) | |
| download | pleroma-d39abd02acf75d5f653052b0d4b579164a7fde5b.tar.gz pleroma-d39abd02acf75d5f653052b0d4b579164a7fde5b.zip | |
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index ed900d8f8..57988dc1e 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -533,7 +533,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do end) :ok = Mix.Tasks.Pleroma.Relay.run(["list"]) - assert_receive {:mix_shell, :info, ["relay.mastodon.host"]} + assert_receive {:mix_shell, :info, ["https://relay.mastodon.host/actor"]} end @tag capture_log: true |