summaryrefslogtreecommitdiff
path: root/test/activity_test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-07-09 20:00:37 +0000
committerrinpatch <rinpatch@sdf.org>2019-07-09 20:00:37 +0000
commit81f1017b84bbe1a493aaf6f43687af2f2546b6a1 (patch)
treebb2d77d97f46f51c7d3b3e719fe29faac41432af /test/activity_test.exs
parent2bb945cb70751bc8e72c036040130bb54c32f391 (diff)
parent8a41d34673532c03cf99a2334399b9436e245f1b (diff)
downloadpleroma-81f1017b84bbe1a493aaf6f43687af2f2546b6a1.tar.gz
pleroma-81f1017b84bbe1a493aaf6f43687af2f2546b6a1.zip
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'
[#878] Refactored assumptions on embedded object presence in tests Closes #878 See merge request pleroma/pleroma!1390
Diffstat (limited to 'test/activity_test.exs')
-rw-r--r--test/activity_test.exs8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/activity_test.exs b/test/activity_test.exs
index 7ba4363c8..b27f6fd36 100644
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -6,6 +6,7 @@ defmodule Pleroma.ActivityTest do
use Pleroma.DataCase
alias Pleroma.Activity
alias Pleroma.Bookmark
+ alias Pleroma.Object
alias Pleroma.ThreadMute
import Pleroma.Factory
@@ -18,15 +19,18 @@ defmodule Pleroma.ActivityTest do
test "returns activities by it's objects AP ids" do
activity = insert(:note_activity)
- [found_activity] = Activity.get_all_create_by_object_ap_id(activity.data["object"]["id"])
+ object_data = Object.normalize(activity).data
+
+ [found_activity] = Activity.get_all_create_by_object_ap_id(object_data["id"])
assert activity == found_activity
end
test "returns the activity that created an object" do
activity = insert(:note_activity)
+ object_data = Object.normalize(activity).data
- found_activity = Activity.get_create_by_object_ap_id(activity.data["object"]["id"])
+ found_activity = Activity.get_create_by_object_ap_id(object_data["id"])
assert activity == found_activity
end