update test

This commit is contained in:
Maksim Pechnikov 2018-12-04 14:01:39 +03:00
parent 7ec64ac33f
commit a9e4a97586
7 changed files with 83 additions and 11 deletions

View file

@ -18,6 +18,7 @@ def request(method, url, body \\ "", headers \\ [], options \\ []) do
|> (&Tesla.request(Connection.new(), &1)).() |> (&Tesla.request(Connection.new(), &1)).()
end end
defp process_sni_options(options, nil), do: options
defp process_sni_options(options, url) do defp process_sni_options(options, url) do
uri = URI.parse(url) uri = URI.parse(url)
host = uri.host |> to_charlist() host = uri.host |> to_charlist()

View file

@ -4,6 +4,10 @@ defmodule Pleroma.FormatterTest do
use Pleroma.DataCase use Pleroma.DataCase
import Pleroma.Factory import Pleroma.Factory
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
describe ".add_hashtag_links" do describe ".add_hashtag_links" do
test "turns hashtags into links" do test "turns hashtags into links" do

View file

@ -22,6 +22,73 @@ def request(
# GET Requests # GET Requests
# #
def get(url, query \\ [], body \\ [], headers \\ []) def get(url, query \\ [], body \\ [], headers \\ [])
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,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml")
}}
end
def get("https://pawoo.net/users/pekorino.atom", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.atom")
}}
end
def get("https://pawoo.net/.well-known/webfinger?resource=acct:https://pawoo.net/users/pekorino",
_, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml")
}}
end
def get("https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/atarifrosch_feed.xml")
}}
end
def get("https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource=acct:https://social.stopwatchingus-heidelberg.de/user/18330",
_, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/atarifrosch_webfinger.xml")
}}
end
def get("https://mamot.fr/users/Skruyb.atom", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/https___mamot.fr_users_Skruyb.atom")
}}
end
def get("https://mamot.fr/.well-known/webfinger?resource=acct:https://mamot.fr/users/Skruyb",
_, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/skruyb@mamot.fr.atom")
}}
end
def get("https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la", _, _, [Accept: "application/xrd+xml,application/jrd+json"]) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml")
}}
end
def get("http://gs.example.org:4040/index.php/user/1", _, _, Accept: "application/activity+json") do def get("http://gs.example.org:4040/index.php/user/1", _, _, Accept: "application/activity+json") do
{:ok, {:ok,

View file

@ -9,6 +9,11 @@ defmodule Pleroma.UserTest do
import Pleroma.Factory import Pleroma.Factory
import Ecto.Query import Ecto.Query
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
test "ap_id returns the activity pub id for the user" do test "ap_id returns the activity pub id for the user" do
user = UserBuilder.build() user = UserBuilder.build()

View file

@ -11,11 +11,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
import Pleroma.Factory import Pleroma.Factory
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
setup_all do
import Tesla.Mock Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
setup do
mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok :ok
end end

View file

@ -4,10 +4,9 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
alias Pleroma.{User, Repo} alias Pleroma.{User, Repo}
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter alias Pleroma.Web.OStatus.ActivityRepresenter
import Tesla.Mock
setup do setup_all do
mock(fn env -> apply(HttpRequestMock, :request, [env]) end) Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok :ok
end end

View file

@ -5,10 +5,9 @@ defmodule Pleroma.Web.OStatusTest do
alias Pleroma.{Object, Repo, User, Activity} alias Pleroma.{Object, Repo, User, Activity}
import Pleroma.Factory import Pleroma.Factory
import ExUnit.CaptureLog import ExUnit.CaptureLog
import Tesla.Mock
setup do setup_all do
mock(fn env -> apply(HttpRequestMock, :request, [env]) end) Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok :ok
end end