summaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-16 15:31:11 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-16 18:19:04 +0200
commit70024632ba32121bd63a439b2d708d4b4ff1a190 (patch)
tree7bcdcf637337997cd17d0d6d38d8bce2a77d4752 /test/web
parent423194520e3fd1d2b285e7cf34a8ad7476276f5d (diff)
downloadpleroma-70024632ba32121bd63a439b2d708d4b4ff1a190.tar.gz
pleroma-70024632ba32121bd63a439b2d708d4b4ff1a190.zip
AP refactoring.
Diffstat (limited to 'test/web')
-rw-r--r--test/web/activity_pub/activity_pub_test.exs3
-rw-r--r--test/web/salmon/salmon_test.exs2
2 files changed, 3 insertions, 2 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 2e361ad38..8e7473591 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -1,6 +1,7 @@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
use Pleroma.DataCase
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.{Activity, Object, User}
alias Pleroma.Builders.ActivityBuilder
@@ -216,7 +217,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
follower = Repo.get_by(User, ap_id: activity.data["actor"])
followed = Repo.get_by(User, ap_id: activity.data["object"])
- assert activity == ActivityPub.fetch_latest_follow(follower, followed)
+ assert activity == Utils.fetch_latest_follow(follower, followed)
end
end
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index ed26ccf83..65d81e44f 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -71,7 +71,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
mentioned_user = insert(:user, user_data)
note = insert(:note)
activity_data = %{
- "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id,
+ "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
"type" => "Create",
"actor" => note.data["actor"],
"to" => note.data["to"] ++ [mentioned_user.ap_id],