2 files changed, 27 insertions, 5 deletions
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 44d687d8e..8dd3c3b54 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -346,4 +346,11 @@ defmodule Pleroma.Web.OStatusTest do
 
     assert {:ok, %User{}} = OStatus.insert_or_update_user(data)
   end
+
+  test "it doesn't add nil in the do field" do
+    incoming = File.read!("test/fixtures/nil_mention_entry.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["to"] == ["http://localhost:4001/users/atarifrosch@social.stopwatchingus-heidelberg.de/followers", "https://www.w3.org/ns/activitystreams#Public"]
+  end
 end
diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs
index 495d3d50b..38640b6d3 100644
--- a/test/web/web_finger/web_finger_test.exs
+++ b/test/web/web_finger/web_finger_test.exs
@@ -31,17 +31,32 @@ defmodule Pleroma.Web.WebFingerTest do
     test "returns the info for a user" do
       user = "shp@social.heldscal.la"
 
-      getter = fn(_url, _headers, [params: [resource: ^user]]) ->
-        {:ok, %{status_code: 200, body: File.read!("test/fixtures/webfinger.xml")}}
-      end
-
-      {:ok, data} = WebFinger.finger(user, getter)
+      {:ok, data} = WebFinger.finger(user)
 
       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
+
+    test "it works for friendica" do
+      user = "lain@squeet.me"
+
+      {:ok, data} = WebFinger.finger(user)
+
+    end
+
+    test "it gets the xrd endpoint" do
+      {:ok, template} = WebFinger.find_lrdd_template("social.heldscal.la")
+
+      assert template == "https://social.heldscal.la/.well-known/webfinger?resource={uri}"
+    end
+
+    test "it gets the xrd endpoint for hubzilla" do
+      {:ok, template} = WebFinger.find_lrdd_template("macgirvin.com")
+
+      assert template == "https://macgirvin.com/xrd/?uri={uri}"
+    end
   end
 
   describe "ensure_keys_present" do