diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
| commit | 7fcbda702e76b6390076c28832f5aea80086d15a (patch) | |
| tree | 265bf6acf11ad7987850c8733ea1b36248cc8c24 /test/web/activity_pub | |
| parent | 6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6 (diff) | |
| parent | 3cefdc62e0dda75985221853fb123572d6fc068b (diff) | |
| download | pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.tar.gz pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.zip | |
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 6bb81a054..7d301b0d4 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -946,7 +946,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do test "it strips internal fields" do user = insert(:user) - {:ok, activity} = CommonAPI.post(user, %{"status" => "#2hu :moominmamma:"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "#2hu :firefox:"}) {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data) |