Merge branch 'refactor/object-cache-deletion' into 'develop'

object cache deletion refactoring, part 2

See merge request pleroma/pleroma!409

2 files changed, 29 insertions, 2 deletions

diff --git a/test/object_test.exs b/test/object_test.exs
index 3e398776c..909605560 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -42,7 +42,7 @@ defmodule Pleroma.ObjectTest do
 
       Object.delete(cached_object)
 
-      {:ok, nil} = Cachex.get(:user_cache, "object:#{object.data["id"]}")
+      {:ok, nil} = Cachex.get(:object_cache, "object:#{object.data["id"]}")
 
       cached_object = Object.get_cached_by_ap_id(object.data["id"])
 
diff --git a/test/user_test.exs b/test/user_test.exs
index 05da24f8d..7dec3462f 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -511,7 +511,7 @@ defmodule Pleroma.UserTest do
     {:ok, _, _} = CommonAPI.favorite(activity.id, follower)
     {:ok, _, _} = CommonAPI.repeat(activity.id, follower)
 
-    :ok = User.delete(user)
+    {:ok, _} = User.delete(user)
 
     followed = Repo.get(User, followed.id)
     follower = Repo.get(User, follower.id)
@@ -551,4 +551,31 @@ defmodule Pleroma.UserTest do
       assert Pleroma.HTML.Scrubber.TwitterText == User.html_filter_policy(user)
     end
   end
+
+  describe "caching" do
+    test "invalidate_cache works" do
+      user = insert(:user)
+      user_info = User.get_cached_user_info(user)
+
+      User.invalidate_cache(user)
+
+      {:ok, nil} = Cachex.get(:user_cache, "ap_id:#{user.ap_id}")
+      {:ok, nil} = Cachex.get(:user_cache, "nickname:#{user.nickname}")
+      {:ok, nil} = Cachex.get(:user_cache, "user_info:#{user.id}")
+    end
+
+    test "User.delete() plugs any possible zombie objects" do
+      user = insert(:user)
+
+      {:ok, _} = User.delete(user)
+
+      {:ok, cached_user} = Cachex.get(:user_cache, "ap_id:#{user.ap_id}")
+
+      assert cached_user != user
+
+      {:ok, cached_user} = Cachex.get(:user_cache, "nickname:#{user.ap_id}")
+
+      assert cached_user != user
+    end
+  end
 end