summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/notification_controller_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-18 14:08:21 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-18 14:08:21 +0300
commitf9ecb513faec53758371f6d6efd78668997a1d15 (patch)
tree879353fbffb02a8b8efbc940c19838cfa7a99d53 /test/web/mastodon_api/controllers/notification_controller_test.exs
parentbf474ca3c154544b54720ea23c06191e68f32522 (diff)
parent69341cbcbac2459faa43bb924577e84dac353982 (diff)
downloadpleroma-f9ecb513faec53758371f6d6efd78668997a1d15.tar.gz
pleroma-f9ecb513faec53758371f6d6efd78668997a1d15.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/mastodon_api/controllers/notification_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/notification_controller_test.exs8
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 0f0a060d2..4f6a88950 100644
--- a/test/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/web/mastodon_api/controllers/notification_controller_test.exs
@@ -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