diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-01 23:48:55 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-01 23:48:55 +0000 |
| commit | 3c7280934e3bdca8d5a870dc932406ccd9915d64 (patch) | |
| tree | 35c7f885e4003bb09de30f42afda05abbfcabc2d /test/support | |
| parent | e4079abab8245c5b5a0987fbce9ab7cfd724f2d5 (diff) | |
| parent | 03e92977cb95ccc81b92c927049a3e4421917cd2 (diff) | |
| download | pleroma-3c7280934e3bdca8d5a870dc932406ccd9915d64.tar.gz pleroma-3c7280934e3bdca8d5a870dc932406ccd9915d64.zip | |
Merge branch 'security/activitypub-spoofing' into 'develop'
security: activitypub spoofing
See merge request pleroma/pleroma!321
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 4ee2feb95..7057f30fb 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://info.pleroma.site/activity.json", _, _) do + {:ok, + %Response{ + status_code: 200, + body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity.json") + }} + end + def get("https://puckipedia.com/", [Accept: "application/activity+json"], _) do {:ok, %Response{ |