X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fweb_finger%2Fweb_finger_test.exs;h=335c95b18ba14e8fa10433aa220b0b14c5c17d86;hb=ad5263c647aea65dbeb4c329825671895e0a8863;hp=ff60391fdba9e7dada7f20a2b2f96090f81965ab;hpb=b72a25f5b1ce18698b1b3aff6487157898dc7846;p=akkoma

diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs
index ff60391fd..335c95b18 100644
--- a/test/web/web_finger/web_finger_test.exs
+++ b/test/web/web_finger/web_finger_test.exs
@@ -1,13 +1,23 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.WebFingerTest do
   use Pleroma.DataCase
   alias Pleroma.Web.WebFinger
   import Pleroma.Factory
+  import Tesla.Mock
+
+  setup do
+    mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
 
   describe "host meta" do
     test "returns a link to the xml lrdd" do
       host_info = WebFinger.host_meta()
 
-      assert String.contains?(host_info, Pleroma.Web.base_url)
+      assert String.contains?(host_info, Pleroma.Web.base_url())
     end
   end
 
@@ -15,7 +25,9 @@ defmodule Pleroma.Web.WebFingerTest do
     test "works for fqns" do
       user = insert(:user)
 
-      {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}", "XML")
+      {:ok, result} =
+        WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host()}", "XML")
+
       assert is_binary(result)
     end
 
@@ -33,7 +45,9 @@ defmodule Pleroma.Web.WebFingerTest do
 
       {:ok, data} = WebFinger.finger(user)
 
-      assert data["magic_key"] == "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB"
+      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"
@@ -45,6 +59,28 @@ defmodule Pleroma.Web.WebFingerTest do
       {:ok, _data} = WebFinger.finger(user)
     end
 
+    test "returns the ActivityPub actor URI for an ActivityPub user with the ld+json mimetype" do
+      user = "kaniini@gerzilla.de"
+
+      {:ok, data} = WebFinger.finger(user)
+
+      assert data["ap_id"] == "https://gerzilla.de/channel/kaniini"
+    end
+
+    test "returns the correctly for json ostatus users" do
+      user = "winterdienst@gnusocial.de"
+
+      {:ok, data} = WebFinger.finger(user)
+
+      assert data["magic_key"] ==
+               "RSA.qfYaxztz7ZELrE4v5WpJrPM99SKI3iv9Y3Tw6nfLGk-4CRljNYqV8IYX2FXjeucC_DKhPNnlF6fXyASpcSmA_qupX9WC66eVhFhZ5OuyBOeLvJ1C4x7Hi7Di8MNBxY3VdQuQR0tTaS_YAZCwASKp7H6XEid3EJpGt0EQZoNzRd8=.AQAB"
+
+      assert data["topic"] == "https://gnusocial.de/api/statuses/user_timeline/249296.atom"
+      assert data["subject"] == "acct:winterdienst@gnusocial.de"
+      assert data["salmon"] == "https://gnusocial.de/main/salmon/user/249296"
+      assert data["subscribe_address"] == "https://gnusocial.de/main/ostatussub?profile={uri}"
+    end
+
     test "it works for friendica" do
       user = "lain@squeet.me"
 
@@ -62,20 +98,11 @@ defmodule Pleroma.Web.WebFingerTest do
 
       assert template == "https://macgirvin.com/xrd/?uri={uri}"
     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 gets the xrd endpoint for statusnet" do
+      {:ok, template} = WebFinger.find_lrdd_template("status.alpicola.com")
 
-    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"
+      assert template == "http://status.alpicola.com/main/xrd?uri={uri}"
     end
   end
 end