projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'pleroma/develop' into moderators
[akkoma]
/
test
/
pleroma
/
web
/
admin_api
/
controllers
/
user_controller_test.exs
diff --git
a/test/pleroma/web/admin_api/controllers/user_controller_test.exs
b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
index 3cee9532098da046b38b2833e0b1725010b71954..d9da34f6ed5209d49d4253a0dfa23eecb18043ed 100644
(file)
--- a/
test/pleroma/web/admin_api/controllers/user_controller_test.exs
+++ b/
test/pleroma/web/admin_api/controllers/user_controller_test.exs
@@
-908,7
+908,8
@@
defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"is_approved" => true,
"url" => user.ap_id,
"registration_reason" => nil,
- "actor_type" => "Person"
+ "actor_type" => "Person",
+ "created_at" => CommonAPI.Utils.to_masto_date(user.inserted_at)
}
|> Map.merge(attrs)
end