diff options
author | kaniini <nenolod@gmail.com> | 2018-09-27 20:25:35 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-09-27 20:25:35 +0000 |
commit | 6258ddaa607c5b103c65c7febbd9d200084ab67a (patch) | |
tree | bd7e808282eec8489cb55d2db295bcde0de69dd5 /test/support | |
parent | 3de12c194fb32f23c1937af0274756963767ca83 (diff) | |
parent | c739737998538632f595c03fcedbdb5178ad83b6 (diff) | |
download | pleroma-6258ddaa607c5b103c65c7febbd9d200084ab67a.tar.gz |
Merge branch 'bugfix/kroeg' into 'develop'
More kroeg bugfixes
See merge request pleroma/pleroma!353
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/httpoison_mock.ex | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex index 7057f30fb..d8b79abef 100644 --- a/test/support/httpoison_mock.ex +++ b/test/support/httpoison_mock.ex @@ -404,6 +404,17 @@ defmodule HTTPoisonMock do }} end + def get("http://mastodon.example.org/users/admin/statuses/100787282858396771", _, _) do + {:ok, + %Response{ + status_code: 200, + body: + File.read!( + "test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json" + ) + }} + end + def get( "https://pawoo.net/.well-known/webfinger", [Accept: "application/xrd+xml,application/jrd+json"], |