Commit 5c6d4761 authored by Maksim's avatar Maksim
Browse files

all tests passed

parent a9e4a975
......@@ -14,7 +14,7 @@ def request(
res
else
{_, r} = error ->
Logger.warn(r)
#Logger.warn(r)
error
end
end
......@@ -22,6 +22,25 @@ def request(
# GET Requests
#
def get(url, query \\ [], body \\ [], headers \\ [])
def get("https://osada.macgirvin.com/channel/mike", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!(
"test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json"
)
}}
end
def get("https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com", _, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json")
}}
end
def get("https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/29191",
_, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
......@@ -90,14 +109,6 @@ def get("https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@s
}}
end
def get("http://gs.example.org:4040/index.php/user/1", _, _, Accept: "application/activity+json") do
{:ok,
%Tesla.Env{
status: 200,
body: "{\"id\": 1}"
}}
end
def get("https://squeet.me/xrd/?uri=lain@squeet.me", _, _,
Accept: "application/xrd+xml,application/jrd+json"
) do
......
......@@ -4,7 +4,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
alias Pleroma.Web.ActivityPub.{UserView, ObjectView}
alias Pleroma.{Repo, User}
alias Pleroma.Activity
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
describe "/relay" do
test "with the relay active, it returns the relay user", %{conn: conn} do
res =
......
......@@ -5,6 +5,11 @@ defmodule Pleroma.Web.FederatorTest do
import Pleroma.Factory
import Mock
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
test "enqueues an element according to priority" do
queue = [%{item: 1, priority: 2}]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment