Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[akkoma] / test / user_test.exs

diff --git a/test/user_test.exs b/test/user_test.exs
index 1331ac97177ee1fee6ac0340e08888ba397f57f6..e6de4a5cd731076d05c4fbff17f9c6c6050b44f5 100644 (file)
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -1,9 +1,12 @@
 defmodule Pleroma.UserTest do
   alias Pleroma.Builders.UserBuilder
-  alias Pleroma.User
+  alias Pleroma.{User, Repo}
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.Websub.WebsubClientSubscription
   use Pleroma.DataCase
 
   import Pleroma.Factory
+  import Ecto.Query
 
   test "ap_id returns the activity pub id for the user" do
     host =
@@ -13,7 +16,7 @@ defmodule Pleroma.UserTest do
 
     user = UserBuilder.build
 
-    expected_ap_id = "https://#{host}/users/#{user.nickname}"
+    expected_ap_id = "#{Pleroma.Web.base_url}/users/#{user.nickname}"
 
     assert expected_ap_id == User.ap_id(user)
   end
@@ -30,18 +33,34 @@ defmodule Pleroma.UserTest do
     user = insert(:user)
     followed = insert(:user)
 
-    {:ok, user } = User.follow(user, followed)
+    {:ok, user} = User.follow(user, followed)
 
     user = Repo.get(User, user.id)
 
     assert user.following == [User.ap_followers(followed)]
   end
 
+  test "following a remote user will ensure a websub subscription is present" do
+    user = insert(:user)
+    {:ok, followed} = OStatus.make_user("shp@social.heldscal.la")
+
+    assert followed.local == false
+
+    {:ok, user} = User.follow(user, followed)
+    assert user.following == [User.ap_followers(followed)]
+
+    query = from w in WebsubClientSubscription,
+    where: w.topic == ^followed.info["topic"]
+    websub = Repo.one(query)
+
+    assert websub
+  end
+
   test "unfollow takes a user and another user" do
     followed = insert(:user)
     user = insert(:user, %{following: [User.ap_followers(followed)]})
 
-    {:ok, user } = User.unfollow(user, followed)
+    {:ok, user, _activity } = User.unfollow(user, followed)
 
     user = Repo.get(User, user.id)
 
@@ -95,7 +114,6 @@ defmodule Pleroma.UserTest do
       assert user == fetched_user
     end
 
-    # TODO: Make the test local.
     test "fetches an external user via ostatus if no user exists" do
       fetched_user = User.get_or_fetch_by_nickname("shp@social.heldscal.la")
       assert fetched_user.nickname == "shp@social.heldscal.la"
@@ -111,5 +129,15 @@ defmodule Pleroma.UserTest do
       assert fetched_user == nil
     end
   end
+
+  test "returns an ap_id for a user" do
+    user = insert(:user)
+    assert User.ap_id(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
+  end
+
+  test "returns an ap_followers link for a user" do
+    user = insert(:user)
+    assert User.ap_followers(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname) <> "/followers"
+  end
 end