From: Francis Dinh <normandy@firemail.cc>
Date: Wed, 25 Apr 2018 05:58:50 +0000 (-0400)
Subject: Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature... 
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=2d775bf1be5ddf0a8c5553ef15dde55c2483c1d4;p=akkoma

Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
---

2d775bf1be5ddf0a8c5553ef15dde55c2483c1d4
diff --cc test/web/activity_pub/activity_pub_test.exs
index d9f00613a,208cc42d2..7735e1bf8
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@@ -295,9 -293,8 +295,9 @@@ defmodule Pleroma.Web.ActivityPub.Activ
                 User.ap_followers(user),
                 announce_activity.data["actor"]
               ]
- 
++      
        assert unannounce_activity.data["type"] == "Undo"
-       assert unannounce_activity.data["object"] == announce_activity.data["id"]
+       assert unannounce_activity.data["object"] == announce_activity.data
        assert unannounce_activity.data["actor"] == user.ap_id
        assert unannounce_activity.data["context"] == announce_activity.data["context"]