Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...

[akkoma] / test / web / common_api / common_api_test.exs

diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 59beb312021b05df1bd454c0083b19cedce6e688..7d5ceb3982c7dad0e4f646156fc952f14dec3d2d 100644 (file)
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -97,9 +97,9 @@ defmodule Pleroma.Web.CommonAPI.Test do
     end
   end
 
-  describe "pinned posts" do
-    test "pin post" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+  describe "pinned statuses" do
+    test "pin status" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -107,8 +107,8 @@ defmodule Pleroma.Web.CommonAPI.Test do
       assert {:ok, ^activity} = CommonAPI.pin(activity.id, user)
     end
 
-    test "max pinned posts" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "max pinned statuses" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity_one} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -116,14 +116,14 @@ defmodule Pleroma.Web.CommonAPI.Test do
 
       assert {:ok, ^activity_one} = CommonAPI.pin(activity_one.id, user)
 
-      user = User.get_by_ap_id(user.ap_id)
+      user = refresh_record(user)
 
-      assert {:error, "You have already pinned the maximum number of toots"} =
+      assert {:error, "You have already pinned the maximum number of statuses"} =
                CommonAPI.pin(activity_two.id, user)
     end
 
-    test "unpin post" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "unpin status" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})