From 8aa639a450c94fc3fb8ea812b334892324ffd51a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 21 Mar 2018 17:58:31 +0000 Subject: webfinger: support JSON output --- test/web/web_finger/web_finger_test.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/web') diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs index ccca737f0..0be424c7a 100644 --- a/test/web/web_finger/web_finger_test.exs +++ b/test/web/web_finger/web_finger_test.exs @@ -15,14 +15,14 @@ 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 -- cgit v1.2.3 From ff7afc04654e4306f84f469634590a25831e997f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 21 Mar 2018 19:23:09 +0000 Subject: tests: webfinger: test quering a JSON response for activitypub actor URI --- test/web/web_finger/web_finger_test.exs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'test/web') diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs index 0be424c7a..ff60391fd 100644 --- a/test/web/web_finger/web_finger_test.exs +++ b/test/web/web_finger/web_finger_test.exs @@ -28,7 +28,7 @@ defmodule Pleroma.Web.WebFingerTest do 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" -- cgit v1.2.3 From 32ae9188430349e22721b81baec825b3cebfe8e5 Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 22 Mar 2018 12:44:32 +0100 Subject: Clear caches on test. --- test/web/mastodon_api/status_view_test.exs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'test/web') 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) -- cgit v1.2.3