projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Add YunoHost to installation guides' (#518) from ilja/akkoma...
[akkoma]
/
test
/
pleroma
/
web
/
activity_pub
/
transmogrifier
/
follow_handling_test.exs
diff --git
a/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
index 757d90941f85fd93c16d9af7696774cb63f70916..604444a4c4f6a63cbe0d95d4af263d487ed3777b 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
@@
-28,7
+28,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/osada-follow-activity.json")
data =
File.read!("test/fixtures/osada-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
@@
-47,7
+47,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
@@
-65,11
+65,11
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
end
test "with locked accounts, it does create a Follow, but not an Accept" do
end
test "with locked accounts, it does create a Follow, but not an Accept" do
- user = insert(:user, locked: true)
+ user = insert(:user,
is_
locked: true)
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
@@
-100,7
+100,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
@@
-116,7
+116,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("id", String.replace(data["id"], "2", "3"))
|> Map.put("object", user.ap_id)
|> Map.put("id", String.replace(data["id"], "2", "3"))
|> Map.put("object", user.ap_id)
@@
-133,7
+133,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
end
test "it rejects incoming follow requests from blocked users when deny_follow_blocked is enabled" do
end
test "it rejects incoming follow requests from blocked users when deny_follow_blocked is enabled" do
-
Pleroma.Config.put
([:user, :deny_follow_blocked], true)
+
clear_config
([:user, :deny_follow_blocked], true)
user = insert(:user)
{:ok, target} = User.get_or_fetch("http://mastodon.example.org/users/admin")
user = insert(:user)
{:ok, target} = User.get_or_fetch("http://mastodon.example.org/users/admin")
@@
-142,7
+142,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: %{"id" => id}}} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: %{"id" => id}}} = Transmogrifier.handle_incoming(data)
@@
-157,7
+157,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
with_mock Pleroma.User, [:passthrough], follow: fn _, _, _ -> {:error, :testing} end do
|> Map.put("object", user.ap_id)
with_mock Pleroma.User, [:passthrough], follow: fn _, _, _ -> {:error, :testing} end do
@@
-174,7
+174,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
data =
File.read!("test/fixtures/hubzilla-follow-activity.json")
data =
File.read!("test/fixtures/hubzilla-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
|> Utils.normalize_params()
|> Map.put("object", user.ap_id)
|> Utils.normalize_params()
@@
-188,11
+188,11
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
test "it works for incoming follows to locked account" do
pending_follower = insert(:user, ap_id: "http://mastodon.example.org/users/admin")
test "it works for incoming follows to locked account" do
pending_follower = insert(:user, ap_id: "http://mastodon.example.org/users/admin")
- user = insert(:user, locked: true)
+ user = insert(:user,
is_
locked: true)
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
|> Map.put("object", user.ap_id)
{:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)