hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into gun

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-18 14:08:21 +03:00
commit f9ecb513fa
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
11 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/web/mastodon_api/controllers/notification_controller_test.exs
View file

@ -408,7 +408,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
end
@tag capture_log: true
test "see move notifications with `with_move` parameter" do
test "see move notifications" do
old_user = insert(:user)
new_user = insert(:user, also_known_as: [old_user.ap_id])
%{user: follower, conn: conn} = oauth_access(["read:notifications"])
@ -429,11 +429,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
Pleroma.Tests.ObanHelpers.perform_all()
ret_conn = get(conn, "/api/v1/notifications")
assert json_response(ret_conn, 200) == []
conn = get(conn, "/api/v1/notifications", %{"with_move" => "true"})
conn = get(conn, "/api/v1/notifications")
assert length(json_response(conn, 200)) == 1
end