Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock

1 files changed, 30 insertions, 0 deletions

diff --git a/test/object_test.exs b/test/object_test.exs
index 5eb9b7530..909605560 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -19,4 +19,34 @@ defmodule Pleroma.ObjectTest do
       {:error, _result} = Repo.insert(cs)
     end
   end
+
+  describe "deletion function" do
+    test "deletes an object" do
+      object = insert(:note)
+      found_object = Object.get_by_ap_id(object.data["id"])
+
+      assert object == found_object
+
+      Object.delete(found_object)
+
+      found_object = Object.get_by_ap_id(object.data["id"])
+
+      refute object == found_object
+    end
+
+    test "ensures cache is cleared for the object" do
+      object = insert(:note)
+      cached_object = Object.get_cached_by_ap_id(object.data["id"])
+
+      assert object == cached_object
+
+      Object.delete(cached_object)
+
+      {:ok, nil} = Cachex.get(:object_cache, "object:#{object.data["id"]}")
+
+      cached_object = Object.get_cached_by_ap_id(object.data["id"])
+
+      refute object == cached_object
+    end
+  end
 end