diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
| commit | dec23500d8988c22a99f049ef1d1e49328ba075a (patch) | |
| tree | a6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /test/object_test.exs | |
| parent | ab3089d6a718d4a70b0d702307d41e64e17bc505 (diff) | |
| parent | dfde2622d0c14195392e306fadc7c729c68da273 (diff) | |
| download | pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.zip | |
Resolve merge conflict
Diffstat (limited to 'test/object_test.exs')
| -rw-r--r-- | test/object_test.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/object_test.exs b/test/object_test.exs index 0effb9505..72194975d 100644 --- a/test/object_test.exs +++ b/test/object_test.exs @@ -36,6 +36,8 @@ defmodule Pleroma.ObjectTest do found_object = Object.get_by_ap_id(object.data["id"]) refute object == found_object + + assert found_object.data["type"] == "Tombstone" end test "ensures cache is cleared for the object" do @@ -51,6 +53,8 @@ defmodule Pleroma.ObjectTest do cached_object = Object.get_cached_by_ap_id(object.data["id"]) refute object == cached_object + + assert cached_object.data["type"] == "Tombstone" end end end |