Merge branch 'develop' into 'oembed_provider'

# Conflicts:
#   lib/pleroma/activity.ex

1 files changed, 7 insertions, 0 deletions

diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 9ac805f24..a7d9e6161 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -17,6 +17,13 @@ defmodule Pleroma.Web.CommonAPI.Test do
     assert activity.data["object"]["tag"] == ["2hu"]
   end
 
+  test "it adds emoji in the object" do
+    user = insert(:user)
+    {:ok, activity} = CommonAPI.post(user, %{"status" => ":moominmamma:"})
+
+    assert activity.data["object"]["emoji"]["moominmamma"]
+  end
+
   test "it adds emoji when updating profiles" do
     user = insert(:user, %{name: ":karjalanpiirakka:"})