Merge branch 'develop' into dtluna/pleroma-refactor/1

[akkoma] / test / web / web_finger / web_finger_test.exs

diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs
index e5347a2b0fddd17505280a261ae3f013f3f4726b..495d3d50b4c80e558d94b0ae88229048b5101ff3 100644 (file)
--- a/test/web/web_finger/web_finger_test.exs
+++ b/test/web/web_finger/web_finger_test.exs
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.WebFingerTest do
   use Pleroma.DataCase
   alias Pleroma.Web.WebFinger
+  import Pleroma.Factory
 
   describe "host meta" do
     test "returns a link to the xml lrdd" do
@@ -10,6 +11,22 @@ defmodule Pleroma.Web.WebFingerTest do
     end
   end
 
+  describe "incoming webfinger request" do
+    test "works for fqns" do
+      user = insert(:user)
+
+      {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}")
+      assert is_binary(result)
+    end
+
+    test "works for ap_ids" do
+      user = insert(:user)
+
+      {:ok, result} = WebFinger.webfinger(user.ap_id)
+      assert is_binary(result)
+    end
+  end
+
   describe "fingering" do
     test "returns the info for a user" do
       user = "shp@social.heldscal.la"
@@ -20,10 +37,25 @@ defmodule Pleroma.Web.WebFingerTest do
 
       {:ok, data} = WebFinger.finger(user, getter)
 
-      assert data.magic_key == "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB"
-      assert data.topic == "https://social.heldscal.la/api/statuses/user_timeline/29191.atom"
-      assert data.subject == "acct:shp@social.heldscal.la"
-      assert data.salmon == "https://social.heldscal.la/main/salmon/user/29191"
+      assert data["magic_key"] == "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB"
+      assert data["topic"] == "https://social.heldscal.la/api/statuses/user_timeline/29191.atom"
+      assert data["subject"] == "acct:shp@social.heldscal.la"
+      assert data["salmon"] == "https://social.heldscal.la/main/salmon/user/29191"
+    end
+  end
+
+  describe "ensure_keys_present" do
+    test "it creates keys for a user and stores them in info" do
+      user = insert(:user)
+      refute is_binary(user.info["keys"])
+      {:ok, user} = WebFinger.ensure_keys_present(user)
+      assert is_binary(user.info["keys"])
+    end
+
+    test "it doesn't create keys if there already are some" do
+      user = insert(:user, %{info: %{"keys" => "xxx"}})
+      {:ok, user} = WebFinger.ensure_keys_present(user)
+      assert user.info["keys"] == "xxx"
     end
   end
 end