From b0a9a02af3edb28002b633030b3f6d63ae2309bf Mon Sep 17 00:00:00 2001 From: Haelwenn Date: Sun, 29 Mar 2020 19:18:22 +0000 Subject: Merge branch 'feature/funkwhale-audio' into 'develop' Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287 --- test/support/http_request_mock.ex | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'test/support') diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index e72638814..79ab129fd 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -1273,6 +1273,21 @@ defmodule HttpRequestMock do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/rin.json")}} end + def get( + "https://channels.tests.funkwhale.audio/federation/music/uploads/42342395-0208-4fee-a38d-259a6dae0871", + _, + _, + _ + ) do + {:ok, + %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/funkwhale_audio.json")}} + end + + def get("https://channels.tests.funkwhale.audio/federation/actors/compositions", _, _, _) do + {:ok, + %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/funkwhale_channel.json")}} + end + def get("http://example.com/rel_me/error", _, _, _) do {:ok, %Tesla.Env{status: 404, body: ""}} end -- cgit v1.2.3