X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Factivity_pub%2Ftransmogrifier%2Fblock_handling_test.exs;h=70da06d2eec4e8da85897c33336f61de82dbac5c;hb=eb1c7d75f4456440ef63e158f50fec6ed10c8918;hp=71f1a0ed52bf2ed690c0a2a4cf7b2efdb40fdffd;hpb=073ad7e6d91884f3c972f903d936f029c7a884e6;p=akkoma

diff --git a/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
index 71f1a0ed5..70da06d2e 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
@@ -1,9 +1,9 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
-  use Pleroma.DataCase
+  use Pleroma.DataCase, async: true
 
   alias Pleroma.Activity
   alias Pleroma.User
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
 
     data =
       File.read!("test/fixtures/mastodon-block-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", user.ap_id)
 
     blocker = insert(:user, ap_id: data["actor"])
@@ -36,12 +36,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
 
     data =
       File.read!("test/fixtures/mastodon-block-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", blocked.ap_id)
       |> Map.put("actor", blocker.ap_id)
 
-    {:ok, blocker} = User.follow(blocker, blocked)
-    {:ok, blocked} = User.follow(blocked, blocker)
+    {:ok, blocker, blocked} = User.follow(blocker, blocked)
+    {:ok, blocked, blocker} = User.follow(blocked, blocker)
 
     assert User.following?(blocker, blocked)
     assert User.following?(blocked, blocker)