projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/store-statuses-data-inside-flag
[akkoma]
/
test
/
web
/
common_api
/
common_api_test.exs
diff --git
a/test/web/common_api/common_api_test.exs
b/test/web/common_api/common_api_test.exs
index 2d3c41e82042cfb2934abbd2803da2d19d109043..f88fa5ed6ccb5dac85d4dec0da2ff4cb13747e77 100644
(file)
--- a/
test/web/common_api/common_api_test.exs
+++ b/
test/web/common_api/common_api_test.exs
@@
-10,10
+10,13
@@
defmodule Pleroma.Web.CommonAPITest do
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
+ require Pleroma.Constants
+
clear_config([:instance, :safe_dm_mentions])
clear_config([:instance, :limit])
clear_config([:instance, :max_pinned_statuses])
clear_config([:instance, :safe_dm_mentions])
clear_config([:instance, :limit])
clear_config([:instance, :max_pinned_statuses])
@@
-96,11
+99,13
@@
defmodule Pleroma.Web.CommonAPITest do
test "it adds emoji when updating profiles" do
user = insert(:user, %{name: ":firefox:"})
test "it adds emoji when updating profiles" do
user = insert(:user, %{name: ":firefox:"})
- CommonAPI.update(user)
+
{:ok, activity} =
CommonAPI.update(user)
user = User.get_cached_by_ap_id(user.ap_id)
user = User.get_cached_by_ap_id(user.ap_id)
- [firefox] = user.
info.
source_data["tag"]
+ [firefox] = user.source_data["tag"]
assert firefox["name"] == ":firefox:"
assert firefox["name"] == ":firefox:"
+
+ assert Pleroma.Constants.as_public() in activity.recipients
end
describe "posting" do
end
describe "posting" do
@@
-287,7
+292,7
@@
defmodule Pleroma.Web.CommonAPITest do
id = activity.id
user = refresh_record(user)
id = activity.id
user = refresh_record(user)
- assert %User{
info: %{pinned_activities: [^id]}
} = user
+ assert %User{
pinned_activities: [^id]
} = user
end
test "unlisted statuses can be pinned", %{user: user} do
end
test "unlisted statuses can be pinned", %{user: user} do
@@
-321,7
+326,7
@@
defmodule Pleroma.Web.CommonAPITest do
user = refresh_record(user)
user = refresh_record(user)
- assert %User{
info: %{pinned_activities: []}
} = user
+ assert %User{
pinned_activities: []
} = user
end
test "should unpin when deleting a status", %{user: user, activity: activity} do
end
test "should unpin when deleting a status", %{user: user, activity: activity} do
@@
-333,7
+338,7
@@
defmodule Pleroma.Web.CommonAPITest do
user = refresh_record(user)
user = refresh_record(user)
- assert %User{
info: %{pinned_activities: []}
} = user
+ assert %User{
pinned_activities: []
} = user
end
end
end
end
@@
-381,6
+386,14
@@
defmodule Pleroma.Web.CommonAPITest do
"status_ids" => [activity.id]
}
"status_ids" => [activity.id]
}
+ note_obj = %{
+ "type" => "Note",
+ "id" => activity_ap_id,
+ "content" => "foobar",
+ "published" => activity.object.data["published"],
+ "actor" => AccountView.render("show.json", %{user: target_user})
+ }
+
assert {:ok, flag_activity} = CommonAPI.report(reporter, report_data)
assert %Activity{
assert {:ok, flag_activity} = CommonAPI.report(reporter, report_data)
assert %Activity{
@@
-388,7
+401,7
@@
defmodule Pleroma.Web.CommonAPITest do
data: %{
"type" => "Flag",
"content" => ^comment,
data: %{
"type" => "Flag",
"content" => ^comment,
- "object" => [^target_ap_id, ^
activity_ap_id
],
+ "object" => [^target_ap_id, ^
note_obj
],
"state" => "open"
}
} = flag_activity
"state" => "open"
}
} = flag_activity
@@
-408,6
+421,11
@@
defmodule Pleroma.Web.CommonAPITest do
{:ok, report} = CommonAPI.update_report_state(report_id, "resolved")
assert report.data["state"] == "resolved"
{:ok, report} = CommonAPI.update_report_state(report_id, "resolved")
assert report.data["state"] == "resolved"
+
+ [reported_user, activity_id] = report.data["object"]
+
+ assert reported_user == target_user.ap_id
+ assert activity_id == activity.data["id"]
end
test "does not update report state when state is unsupported" do
end
test "does not update report state when state is unsupported" do
@@
-464,7
+482,7
@@
defmodule Pleroma.Web.CommonAPITest do
describe "accept_follow_request/2" do
test "after acceptance, it sets all existing pending follow request states to 'accept'" do
describe "accept_follow_request/2" do
test "after acceptance, it sets all existing pending follow request states to 'accept'" do
- user = insert(:user,
info: %{locked: true}
)
+ user = insert(:user,
locked: true
)
follower = insert(:user)
follower_two = insert(:user)
follower = insert(:user)
follower_two = insert(:user)
@@
-484,7
+502,7
@@
defmodule Pleroma.Web.CommonAPITest do
end
test "after rejection, it sets all existing pending follow request states to 'reject'" do
end
test "after rejection, it sets all existing pending follow request states to 'reject'" do
- user = insert(:user,
info: %{locked: true}
)
+ user = insert(:user,
locked: true
)
follower = insert(:user)
follower_two = insert(:user)
follower = insert(:user)
follower_two = insert(:user)