diff options
author | rinpatch <rinpatch@sdf.org> | 2020-03-18 10:12:50 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-18 10:12:50 +0000 |
commit | 69341cbcbac2459faa43bb924577e84dac353982 (patch) | |
tree | e60c796ea7a1746ce63042a37b631a7a397b40d1 /test/web/mastodon_api/controllers/notification_controller_test.exs | |
parent | e4380afc18a8c9af5aff986b0f5f6e422714d1c1 (diff) | |
parent | f3791add99014c4e5f1c51c06f8ace84b254cec2 (diff) | |
download | pleroma-69341cbcbac2459faa43bb924577e84dac353982.tar.gz pleroma-69341cbcbac2459faa43bb924577e84dac353982.zip |
Merge branch 'feature/1530-removing-with_move' into 'develop'
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
Diffstat (limited to 'test/web/mastodon_api/controllers/notification_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/notification_controller_test.exs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/web/mastodon_api/controllers/notification_controller_test.exs b/test/web/mastodon_api/controllers/notification_controller_test.exs index d452ddbdd..dbe9a7fd7 100644 --- a/test/web/mastodon_api/controllers/notification_controller_test.exs +++ b/test/web/mastodon_api/controllers/notification_controller_test.exs @@ -407,7 +407,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do assert length(json_response(conn, 200)) == 1 end - 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"]) @@ -416,11 +416,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 |