diff options
author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
---|---|---|
committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
commit | a8aa91753024dbd211e5e3952f5b305debaa8b55 (patch) | |
tree | 01088f8cec46c4b437b338cb78aaaee65e5d8bc7 /test/web/mastodon_api/controllers/notification_controller_test.exs | |
parent | c1fd4f665335ba67336bd1b2fab2d9df5e247e08 (diff) | |
parent | 952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff) | |
download | pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.tar.gz pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.zip |
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
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 |