pleroma

commit: 59f6e794e1cbc1e5e4d9fd9ff7df23186740f83a
parent: 9d2563a3deb0904b8c7a480479179f10e7849c12
Author: kaniini <nenolod@gmail.com>
Date:   Tue,  4 Jun 2019 05:46:20 +0000

Merge branch 'fix/mock-errors-in-tests' into 'develop'

Add missing HTTP Request mocks

See merge request pleroma/pleroma!1231
Diffstat:
M
test/object/containment_test.exs
5
+++++
M
test/support/http_request_mock.ex
21
+++++++++++++++++++++

2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/test/object/containment_test.exs b/test/object/containment_test.exs
@@ -6,6 +6,11 @@ defmodule Pleroma.Object.ContainmentTest do
 
   import Pleroma.Factory
 
+  setup_all do
+    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
   describe "general origin containment" do
     test "contain_origin_from_id() catches obvious spoofing attempts" do
       data = %{
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
@@ -243,6 +243,14 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("https://n1u.moe/users/rye", _, _, Accept: "application/activity+json") do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/httpoison_mock/rye.json")
+     }}
+  end
+
   def get("http://mastodon.example.org/users/admin/statuses/100787282858396771", _, _, _) do
     {:ok,
      %Tesla.Env{
@@ -302,6 +310,10 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("http://mastodon.example.org/users/gargron", _, _, Accept: "application/activity+json") do
+    {:error, :nxdomain}
+  end
+
   def get(
         "http://mastodon.example.org/@admin/99541947525187367",
         _,
@@ -546,6 +558,15 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get(
+        "http://gs.example.org:4040/index.php/user/1",
+        _,
+        _,
+        Accept: "application/activity+json"
+      ) do
+    {:ok, %Tesla.Env{status: 406, body: ""}}
+  end
+
   def get("http://gs.example.org/index.php/api/statuses/user_timeline/1.atom", _, _, _) do
     {:ok,
      %Tesla.Env{