X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fobject_test.exs;h=198d3b1cf1ac969016e0ca5effc2f0000ee9210b;hb=b87b798ca1660224a3192c32b035c19b18e11587;hp=75f192da2fab2bbb000f31e188752acc9c3849cf;hpb=4f8c3462a8821ffcf83f8b65edf48e55eff7080c;p=akkoma

diff --git a/test/object_test.exs b/test/object_test.exs
index 75f192da2..198d3b1cf 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.ObjectTest do
@@ -74,8 +74,8 @@ defmodule Pleroma.ObjectTest do
   end
 
   describe "delete attachments" do
-    clear_config([Pleroma.Upload])
-    clear_config([:instance, :cleanup_attachments])
+    setup do: clear_config([Pleroma.Upload])
+    setup do: clear_config([:instance, :cleanup_attachments])
 
     test "Disabled via config" do
       Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
@@ -380,7 +380,8 @@ defmodule Pleroma.ObjectTest do
 
       user = insert(:user)
       activity = Activity.get_create_by_object_ap_id(object.data["id"])
-      {:ok, _activity, object} = CommonAPI.favorite(activity.id, user)
+      {:ok, activity} = CommonAPI.favorite(user, activity.id)
+      object = Object.get_by_ap_id(activity.data["object"])
 
       assert object.data["like_count"] == 1