diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:28:21 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:28:21 +0000 |
| commit | 931c4974ee4a5e5e806433ce7b367928e4210e0c (patch) | |
| tree | 453b14e77c37a00da1ed35eb6dd781cb46055d70 /test/support/http_request_mock.ex | |
| parent | acd20914ec5a2cedfcd6a7405a22b6453d951164 (diff) | |
| parent | b20020da160404f6f668eec2a2a42aaa2b6a09b2 (diff) | |
| download | pleroma-931c4974ee4a5e5e806433ce7b367928e4210e0c.tar.gz pleroma-931c4974ee4a5e5e806433ce7b367928e4210e0c.zip | |
Merge branch 'fix/put-correct-activity-url' into 'develop'
Show the url advertised in the Activity in the Status JSON response
Closes #1077
See merge request pleroma/pleroma!1485
Diffstat (limited to 'test/support/http_request_mock.ex')
| -rw-r--r-- | test/support/http_request_mock.ex | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 31c085e0d..55cfc1e00 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -301,6 +301,22 @@ defmodule HttpRequestMock do }} end + def get("https://wedistribute.org/wp-json/pterotype/v1/object/85810", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/tesla_mock/wedistribute-article.json") + }} + end + + def get("https://wedistribute.org/wp-json/pterotype/v1/actor/-blog", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/tesla_mock/wedistribute-user.json") + }} + end + def get("http://mastodon.example.org/users/admin", _, _, Accept: "application/activity+json") do {:ok, %Tesla.Env{ |