diff options
author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
---|---|---|
committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
commit | dec23500d8988c22a99f049ef1d1e49328ba075a (patch) | |
tree | a6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /test/activity_test.exs | |
parent | ab3089d6a718d4a70b0d702307d41e64e17bc505 (diff) | |
parent | dfde2622d0c14195392e306fadc7c729c68da273 (diff) | |
download | pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.zip |
Resolve merge conflict
Diffstat (limited to 'test/activity_test.exs')
-rw-r--r-- | test/activity_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/activity_test.exs b/test/activity_test.exs index cf27fbbc5..36c718869 100644 --- a/test/activity_test.exs +++ b/test/activity_test.exs @@ -4,18 +4,19 @@ defmodule Pleroma.ActivityTest do use Pleroma.DataCase + alias Pleroma.Activity import Pleroma.Factory test "returns an activity by it's AP id" do activity = insert(:note_activity) - found_activity = Pleroma.Activity.get_by_ap_id(activity.data["id"]) + found_activity = Activity.get_by_ap_id(activity.data["id"]) assert activity == found_activity end test "returns activities by it's objects AP ids" do activity = insert(:note_activity) - [found_activity] = Pleroma.Activity.all_by_object_ap_id(activity.data["object"]["id"]) + [found_activity] = Activity.all_by_object_ap_id(activity.data["object"]["id"]) assert activity == found_activity end @@ -23,8 +24,7 @@ defmodule Pleroma.ActivityTest do test "returns the activity that created an object" do activity = insert(:note_activity) - found_activity = - Pleroma.Activity.get_create_activity_by_object_ap_id(activity.data["object"]["id"]) + found_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"]["id"]) assert activity == found_activity end |