summaryrefslogtreecommitdiff
path: root/test/activity_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
committerlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
commitf012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (patch)
treea3847182efa357bce56c12d6253492dc0cc2b894 /test/activity_test.exs
parent1d18721a3c60aa0acc7d1ba858a92277e544a54a (diff)
parent081d1d3f48f2264ee329f7ff7af7c2f88fe0a654 (diff)
downloadpleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.tar.gz
pleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 = %{