Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

[akkoma] / test / pleroma / web / activity_pub / transmogrifier / user_update_handling_test.exs

diff --git a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
index 7c4d16db723cc0f7c2537a99a28ea8c773ee2951..8ed5e5e9073c101a6149952b42f78a21f579c44c 100644 (file)
--- a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
@@ -14,7 +14,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
   test "it works for incoming update activities" do
     user = insert(:user, local: false)
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
     {:ok, _activity} =
       "test/fixtures/mastodon-update.json"
       |> File.read!()
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", actor)
       |> Map.update!("object", fn object ->
         object
@@ -82,7 +82,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
 
     assert user.fields == []
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]
@@ -103,7 +103,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
              %{"name" => "foo1", "value" => "updated"}
            ]
 
-    Pleroma.Config.put([:instance, :max_remote_account_fields], 2)
+    clear_config([:instance, :max_remote_account_fields], 2)
 
     update_data =
       update_data
@@ -138,7 +138,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
   test "it works for incoming update activities which lock the account" do
     user = insert(:user, local: false)
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]