diff options
| author | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 | 
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 | 
| commit | ee35bb5ac287e0ff913685256a826e759add3fb9 (patch) | |
| tree | 971031903f987e4b70768ac1f91666fdfe6a10b4 /test/web/mastodon_api/views | |
| parent | 578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff (diff) | |
| parent | ec470c4c7717dc9479df9e7b70f9805dcf2f5e08 (diff) | |
| download | pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.tar.gz pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/web/mastodon_api/views')
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/status_view_test.exs | 4 | 
2 files changed, 3 insertions, 3 deletions
| diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index 8db6a2379..384fe7253 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -104,7 +104,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do      user = insert(:user)      another_user = insert(:user)      {:ok, create_activity} = CommonAPI.post(user, %{status: "hey"}) -    {:ok, reblog_activity, _object} = CommonAPI.repeat(create_activity.id, another_user) +    {:ok, reblog_activity} = CommonAPI.repeat(create_activity.id, another_user)      {:ok, [notification]} = Notification.create_notifications(reblog_activity)      reblog_activity = Activity.get_by_id(create_activity.id) diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 43e3bdca1..5cbadf0fc 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -442,7 +442,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do      user = insert(:user)      activity = insert(:note_activity) -    {:ok, reblog, _} = CommonAPI.repeat(activity.id, user) +    {:ok, reblog} = CommonAPI.repeat(activity.id, user)      represented = StatusView.render("show.json", %{for: user, activity: reblog}) @@ -600,7 +600,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do          status: "˙˙ɐʎns"        }) -    {:ok, activity, _object} = CommonAPI.repeat(activity.id, other_user) +    {:ok, activity} = CommonAPI.repeat(activity.id, other_user)      result = StatusView.render("show.json", %{activity: activity, for: user}) | 
