diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-21 11:05:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-21 11:05:09 +0300 |
| commit | a11a7176d59deafa08a865d6e0950b9b9c540f18 (patch) | |
| tree | 9a5004f4de7bfa4bf515adaddab65e290d8e38e7 /test/support | |
| parent | 75da202ab74489af15e086f06810e22211d52d33 (diff) | |
| parent | 2ebe8c416a72b512feaba87040982da5bcf865cf (diff) | |
| download | pleroma-a11a7176d59deafa08a865d6e0950b9b9c540f18.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/http_request_mock.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 7d65209fb..eba22c40b 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -348,6 +348,14 @@ defmodule HttpRequestMock do }} end + def get("http://mastodon.example.org/users/relay", _, _, Accept: "application/activity+json") do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/tesla_mock/relay@mastdon.example.org.json") + }} + end + def get("http://mastodon.example.org/users/gargron", _, _, Accept: "application/activity+json") do {:error, :nxdomain} end |