diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-16 15:20:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:20:15 +0000 |
| commit | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (patch) | |
| tree | a2045791b4c0027b0c41c6a14ab504fcb3099956 /test/support | |
| parent | 38361e7b5e24cbbd4654bd76fce4b3c66562ab59 (diff) | |
| parent | 805844367475af3929b059d46f88cc31132fac1b (diff) | |
| download | pleroma-5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e.tar.gz | |
Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg
See merge request pleroma/pleroma!272
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/httpoison_mock.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex index a52d44ed6..527c2e1f7 100644 --- a/test/support/httpoison_mock.ex +++ b/test/support/httpoison_mock.ex @@ -3,6 +3,14 @@ defmodule HTTPoisonMock do def get(url, body \\ [], headers \\ []) + def get("https://puckipedia.com/", [Accept: "application/activity+json"], _) do + {:ok, + %Response{ + status_code: 200, + body: File.read!("test/fixtures/httpoison_mock/puckipedia.com.json") + }} + end + def get( "https://gerzilla.de/.well-known/webfinger?resource=acct:kaniini@gerzilla.de", [Accept: "application/xrd+xml,application/jrd+json"], |