diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:57 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:57 -0500 |
commit | 2cfe2dc81b82f0ab30d82763f2874010966acae6 (patch) | |
tree | 5797622349e3abd454014ff3a755cb31a55f331f /test/web | |
parent | eead2276e79f29c4d0e10d23eb7524a9ee5f5045 (diff) | |
parent | 6f17aea066498bf070f0decb3ac0508c6b04e3b8 (diff) | |
download | pleroma-2cfe2dc81b82f0ab30d82763f2874010966acae6.tar.gz pleroma-2cfe2dc81b82f0ab30d82763f2874010966acae6.zip |
Merge branch 'develop' into feld-2168-media-preview-proxy
Diffstat (limited to 'test/web')
-rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 2 | ||||
-rw-r--r-- | test/web/web_finger/web_finger_test.exs | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index 8e0e58538..2f6a808f1 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -219,7 +219,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do expected = %{ id: to_string(notification.id), - pleroma: %{is_seen: false, is_muted: true}, + pleroma: %{is_seen: true, is_muted: true}, type: "favourite", account: AccountView.render("show.json", %{user: another_user, for: user}), status: StatusView.render("show.json", %{activity: create_activity, for: user}), diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs index f4884e0a2..96fc0bbaa 100644 --- a/test/web/web_finger/web_finger_test.exs +++ b/test/web/web_finger/web_finger_test.exs @@ -40,6 +40,11 @@ defmodule Pleroma.Web.WebFingerTest do end describe "fingering" do + test "returns error for nonsensical input" do + assert {:error, _} = WebFinger.finger("bliblablu") + assert {:error, _} = WebFinger.finger("pleroma.social") + end + test "returns error when fails parse xml or json" do user = "invalid_content@social.heldscal.la" assert {:error, %Jason.DecodeError{}} = WebFinger.finger(user) |