Various refactoring and typespec improvements
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -249,11 +249,11 @@ defmodule Mobilizon.Federation.ActivityPub.AudienceTest do
|
||||
end
|
||||
|
||||
test "reply to a remote comment" do
|
||||
%Actor{id: remote_actor_id, url: remote_actor_url} =
|
||||
%Actor{} =
|
||||
remote_actor =
|
||||
insert(:actor, domain: "somewhere.else", url: "https://somewhere.else/@someone")
|
||||
|
||||
%Actor{id: remote_group_id, url: remote_group_url} =
|
||||
%Actor{} =
|
||||
remote_group =
|
||||
insert(:group, domain: "somewhere.else", url: "https://somewhere.else/@somegroup")
|
||||
|
||||
|
||||
@@ -88,10 +88,10 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.DeleteTest do
|
||||
%Actor{url: url} =
|
||||
actor = insert(:actor, url: "https://framapiaf.org/users/admin", domain: "framapiaf.org")
|
||||
|
||||
%Event{url: event1_url} = event1 = insert(:event, organizer_actor: actor)
|
||||
%Event{} = event1 = insert(:event, organizer_actor: actor)
|
||||
insert(:event, organizer_actor: actor)
|
||||
|
||||
%Comment{url: comment1_url} = comment1 = insert(:comment, actor: actor)
|
||||
%Comment{} = comment1 = insert(:comment, actor: actor)
|
||||
insert(:comment, actor: actor)
|
||||
|
||||
data =
|
||||
|
||||
@@ -24,7 +24,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.InviteTest do
|
||||
|> Map.put("object", group_url)
|
||||
|> Map.put("target", invitee_url)
|
||||
|
||||
assert {:ok, activity, %Member{}} = Transmogrifier.handle_incoming(invite_data)
|
||||
assert {:ok, _activity, %Member{}} = Transmogrifier.handle_incoming(invite_data)
|
||||
assert %Member{} = member = Actors.get_member_by_url(invite_data["id"])
|
||||
assert member.actor.id == invitee_id
|
||||
assert member.parent.id == group_id
|
||||
@@ -49,7 +49,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.InviteTest do
|
||||
|> Map.put("object", group_url)
|
||||
|> Map.put("target", invitee_url)
|
||||
|
||||
assert {:ok, activity, %Member{}} = Transmogrifier.handle_incoming(invite_data)
|
||||
assert {:ok, _activity, %Member{}} = Transmogrifier.handle_incoming(invite_data)
|
||||
assert %Member{} = member = Actors.get_member_by_url(invite_data["id"])
|
||||
assert member.actor.id == invitee_id
|
||||
assert member.parent.id == group_id
|
||||
|
||||
@@ -120,7 +120,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.UpdateTest do
|
||||
)
|
||||
|
||||
group = insert(:group)
|
||||
%Member{} = member = insert(:member, actor: remote_actor, parent: group, role: :moderator)
|
||||
%Member{} = _member = insert(:member, actor: remote_actor, parent: group, role: :moderator)
|
||||
%Post{} = post = insert(:post, attributed_to: group)
|
||||
|
||||
data = Convertible.model_to_as(post)
|
||||
@@ -157,7 +157,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.UpdateTest do
|
||||
)
|
||||
|
||||
group = insert(:group)
|
||||
%Member{} = member = insert(:member, actor: remote_actor, parent: group)
|
||||
%Member{} = _member = insert(:member, actor: remote_actor, parent: group)
|
||||
%Post{} = post = insert(:post, attributed_to: group)
|
||||
|
||||
data = Convertible.model_to_as(post)
|
||||
|
||||
@@ -173,7 +173,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
get_or_fetch_actor_by_url: fn url ->
|
||||
case url do
|
||||
@mobilizon_group_url -> {:ok, group}
|
||||
actor_url -> {:ok, actor}
|
||||
^actor_url -> {:ok, actor}
|
||||
end
|
||||
end do
|
||||
activity = %{
|
||||
@@ -279,7 +279,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
get_or_fetch_actor_by_url: fn url ->
|
||||
case url do
|
||||
@mobilizon_group_url -> {:ok, group}
|
||||
actor_url -> {:ok, actor}
|
||||
^actor_url -> {:ok, actor}
|
||||
end
|
||||
end do
|
||||
activity = %{
|
||||
@@ -379,7 +379,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
}
|
||||
}
|
||||
|
||||
assert {:ok, %Activity{data: data, local: false}, %Resource{} = resource} =
|
||||
assert {:ok, %Activity{data: _data, local: false}, %Resource{} = resource} =
|
||||
Transmogrifier.handle_incoming(activity)
|
||||
|
||||
assert resource.actor_id == group.id
|
||||
@@ -420,7 +420,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
}
|
||||
}
|
||||
|
||||
assert {:ok, %Activity{data: data, local: false}, %Resource{} = resource} =
|
||||
assert {:ok, %Activity{data: _data, local: false}, %Resource{} = resource} =
|
||||
Transmogrifier.handle_incoming(activity)
|
||||
|
||||
assert resource.actor_id == group.id
|
||||
@@ -475,7 +475,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
}
|
||||
}
|
||||
|
||||
assert {:ok, %Activity{data: data, local: false}, %Resource{} = resource} =
|
||||
assert {:ok, %Activity{data: _data, local: false}, %Resource{} = resource} =
|
||||
Transmogrifier.handle_incoming(activity)
|
||||
|
||||
assert resource.actor_id == group.id
|
||||
@@ -643,7 +643,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
|
||||
|
||||
Mock
|
||||
|> expect(:call, fn
|
||||
%{method: :get, url: actor_url}, _opts ->
|
||||
%{method: :get, url: ^actor_url}, _opts ->
|
||||
{:ok, %Tesla.Env{status: 200, body: actor_data}}
|
||||
end)
|
||||
|
||||
|
||||
@@ -406,7 +406,7 @@ defmodule Mobilizon.Federation.ActivityPub.Types.EventsTest do
|
||||
%Actor{url: organizer_group_url, members_url: members_url, followers_url: followers_url} =
|
||||
organizer_group = insert(:group, domain: nil)
|
||||
|
||||
%Actor{url: organizer_actor_url} =
|
||||
%Actor{url: _organizer_actor_url} =
|
||||
organizer_actor =
|
||||
insert(:actor, domain: "somewhere.else", url: "https://somewhere.else/@someone")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user