diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-25 11:57:23 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-25 11:57:23 -0500 |
| commit | 479578b148f28f311a7d20f6da99bbc0dab1652c (patch) | |
| tree | 2b0e5bfe6bfa5c4b954b9442d4d2a1d4ad4bc8cf /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 98f8851f29f940051656caa1715820bce70f8c29 (diff) | |
| parent | 361aa22e2862c1c914baf8257fdc8b20cbc7941d (diff) | |
| download | pleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.tar.gz pleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.zip | |
Merge branch 'develop' into feld-2168-media-preview-proxy
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
| -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 |