summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/notification_view_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-04-02 16:10:38 +0200
committerlain <lain@soykaf.club>2019-04-02 16:10:38 +0200
commit39bcf93007a5a52ba374099d6b04692361e7fa9b (patch)
tree358becb7f089c62d9f2a2634ca766ee7e7bad3f3 /test/web/mastodon_api/notification_view_test.exs
parentfd07745d1b18e2a1eeb88a99eaa9d5e728d1aa71 (diff)
parent180b87257cae481d4d9ffc9f03a06268ad8df569 (diff)
downloadpleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.tar.gz
pleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.zip
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
Diffstat (limited to 'test/web/mastodon_api/notification_view_test.exs')
-rw-r--r--test/web/mastodon_api/notification_view_test.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/notification_view_test.exs b/test/web/mastodon_api/notification_view_test.exs
index b826a7e61..f2c1eb76c 100644
--- a/test/web/mastodon_api/notification_view_test.exs
+++ b/test/web/mastodon_api/notification_view_test.exs
@@ -21,7 +21,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
mentioned_user = insert(:user)
{:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{mentioned_user.nickname}"})
{:ok, [notification]} = Notification.create_notifications(activity)
- user = Repo.get(User, user.id)
+ user = User.get_by_id(user.id)
expected = %{
id: to_string(notification.id),
@@ -44,7 +44,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
{:ok, create_activity} = CommonAPI.post(user, %{"status" => "hey"})
{:ok, favorite_activity, _object} = CommonAPI.favorite(create_activity.id, another_user)
{:ok, [notification]} = Notification.create_notifications(favorite_activity)
- create_activity = Repo.get(Activity, create_activity.id)
+ create_activity = Activity.get_by_id(create_activity.id)
expected = %{
id: to_string(notification.id),
@@ -66,7 +66,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
{:ok, create_activity} = CommonAPI.post(user, %{"status" => "hey"})
{:ok, reblog_activity, _object} = CommonAPI.repeat(create_activity.id, another_user)
{:ok, [notification]} = Notification.create_notifications(reblog_activity)
- reblog_activity = Repo.get(Activity, create_activity.id)
+ reblog_activity = Activity.get_by_id(create_activity.id)
expected = %{
id: to_string(notification.id),