hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/767-multiple-use-invite-token' into 'develop'

Browse source 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
This commit is contained in:
lambda 2019-04-10 10:10:08 +00:00
commit e5d553aa45
14 changed files with 1003 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/support/http_request_mock.ex
View file

@ -716,6 +716,10 @@ defmodule HttpRequestMock do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.atom")}}
end
def get("https://mastodon.social/users/lambadalambda", _, _, _) do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.json")}}
end
def get("https://social.heldscal.la/user/23211", _, _, Accept: "application/activity+json") do
{:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)}
end