summaryrefslogtreecommitdiff
path: root/test/activity_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
committerlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
commitda550be066a15108ceef7874c3b2549c049a7f88 (patch)
tree8b9f59c625da682d54c462ee31c125bd4e444814 /test/activity_test.exs
parent6706cdce65f8b2dda55380dbfdad5e41e600af2d (diff)
parentfbe3d3aa5fe07a89c52a16b7bf0626e323366597 (diff)
downloadpleroma-da550be066a15108ceef7874c3b2549c049a7f88.tar.gz
pleroma-da550be066a15108ceef7874c3b2549c049a7f88.zip
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests See merge request pleroma/pleroma!2524
Diffstat (limited to 'test/activity_test.exs')
-rw-r--r--test/activity_test.exs7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/activity_test.exs b/test/activity_test.exs
index 507027e5a..2a92327d1 100644
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -11,6 +11,11 @@ defmodule Pleroma.ActivityTest do
alias Pleroma.ThreadMute
import Pleroma.Factory
+ setup_all do
+ Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
+
test "returns an activity by it's AP id" do
activity = insert(:note_activity)
found_activity = Activity.get_by_ap_id(activity.data["id"])
@@ -107,8 +112,6 @@ defmodule Pleroma.ActivityTest do
describe "search" do
setup do
- Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-
user = insert(:user)
params = %{