summaryrefslogtreecommitdiff
path: root/test/object
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-04 11:23:46 +0200
committerlain <lain@soykaf.club>2019-06-04 11:23:46 +0200
commit4cab98b7bfc2117055c97a36369759047083cef9 (patch)
tree6efe9dc26579efdec95e0e2f593383f7443fcfc0 /test/object
parent25198d48f7e799ff350c8c7c57518b6ee49e6f8d (diff)
parentd977d73b91dbf8e9129de0478c51114d7d462edf (diff)
downloadpleroma-4cab98b7bfc2117055c97a36369759047083cef9.tar.gz
pleroma-4cab98b7bfc2117055c97a36369759047083cef9.zip
Merge remote-tracking branch 'origin/develop' into explicit-addressing
Diffstat (limited to 'test/object')
-rw-r--r--test/object/containment_test.exs5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/object/containment_test.exs b/test/object/containment_test.exs
index 452064093..a7a046203 100644
--- 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 = %{