diff options
author | kaniini <ariadne@dereferenced.org> | 2019-10-05 15:51:19 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-10-05 15:51:19 +0000 |
commit | 0ee6100c8d7d21eb0c7cdd1c098a5071c0b9682f (patch) | |
tree | 3c97ab34e7c6d7a99d6a81bcc16ad266a8540dc9 /test | |
parent | e51c20f28a91028b06a5783601e4ce09536bba5b (diff) | |
parent | 276a52016307707fa6a2f91bd9a3038dcfb71ba7 (diff) | |
download | pleroma-0ee6100c8d7d21eb0c7cdd1c098a5071c0b9682f.tar.gz |
Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
Diffstat (limited to 'test')
-rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 2 | ||||
-rw-r--r-- | test/web/common_api/common_api_test.exs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 6c208bdc0..475313316 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -546,6 +546,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(update_data) + assert data["id"] == update_data["id"] + user = User.get_cached_by_ap_id(data["actor"]) assert user.name == "gargle" diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 2d3c41e82..83df44c36 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -14,6 +14,8 @@ defmodule Pleroma.Web.CommonAPITest do import Pleroma.Factory + require Pleroma.Constants + clear_config([:instance, :safe_dm_mentions]) clear_config([:instance, :limit]) clear_config([:instance, :max_pinned_statuses]) @@ -96,11 +98,13 @@ defmodule Pleroma.Web.CommonAPITest do test "it adds emoji when updating profiles" do user = insert(:user, %{name: ":firefox:"}) - CommonAPI.update(user) + {:ok, activity} = CommonAPI.update(user) user = User.get_cached_by_ap_id(user.ap_id) [firefox] = user.info.source_data["tag"] assert firefox["name"] == ":firefox:" + + assert Pleroma.Constants.as_public() in activity.recipients end describe "posting" do |