summaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
Diffstat (limited to 'test/web')
-rw-r--r--test/web/mastodon_api/status_view_test.exs5
-rw-r--r--test/web/web_finger/web_finger_test.exs12
2 files changed, 10 insertions, 7 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index 9e2bc3c18..a58f729a6 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -58,10 +58,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
# a user with this ap id might be in the cache.
recipient = "https://pleroma.soykaf.com/users/lain"
- user = User.get_cached_by_ap_id(recipient) || insert(:user, %{ap_id: recipient})
-
- # invalidate the cache
- User.invalidate_cache(user)
+ user = insert(:user, %{ap_id: recipient})
{:ok, [activity]} = OStatus.handle_incoming(incoming)
diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs
index ccca737f0..ff60391fd 100644
--- a/test/web/web_finger/web_finger_test.exs
+++ b/test/web/web_finger/web_finger_test.exs
@@ -15,20 +15,20 @@ defmodule Pleroma.Web.WebFingerTest do
test "works for fqns" do
user = insert(:user)
- {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}")
+ {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}", "XML")
assert is_binary(result)
end
test "works for ap_ids" do
user = insert(:user)
- {:ok, result} = WebFinger.webfinger(user.ap_id)
+ {:ok, result} = WebFinger.webfinger(user.ap_id, "XML")
assert is_binary(result)
end
end
describe "fingering" do
- test "returns the info for a user" do
+ test "returns the info for an OStatus user" do
user = "shp@social.heldscal.la"
{:ok, data} = WebFinger.finger(user)
@@ -39,6 +39,12 @@ defmodule Pleroma.Web.WebFingerTest do
assert data["salmon"] == "https://social.heldscal.la/main/salmon/user/29191"
end
+ test "returns the ActivityPub actor URI for an ActivityPub user" do
+ user = "framasoft@framatube.org"
+
+ {:ok, _data} = WebFinger.finger(user)
+ end
+
test "it works for friendica" do
user = "lain@squeet.me"