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 csaurus/pleroma-feature/mstdn-direct-api
[akkoma]
/
test
/
web
/
twitter_api
/
views
/
user_view_test.exs
diff --git
a/test/web/twitter_api/views/user_view_test.exs
b/test/web/twitter_api/views/user_view_test.exs
index a687020f0138377e41ad41a65865d022c3f3f260..9f8bf4cdcfda9fe5cd92ff31d4bb4c241b6163e1 100644
(file)
--- a/
test/web/twitter_api/views/user_view_test.exs
+++ b/
test/web/twitter_api/views/user_view_test.exs
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
test "A user with an avatar object", %{user: user} do
image = "image"
test "A user with an avatar object", %{user: user} do
image = "image"
- user = %{
user | avatar: %{ "url" => [%{"href" => image}]
}}
+ user = %{
user | avatar: %{"url" => [%{"href" => image}]
}}
represented = UserView.render("show.json", %{user: user})
assert represented["profile_image_url"] == image
end
represented = UserView.render("show.json", %{user: user})
assert represented["profile_image_url"] == image
end
@@
-31,7
+31,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
User.follow(second_follower, user)
User.follow(user, follower)
{:ok, user} = User.update_follower_count(user)
User.follow(second_follower, user)
User.follow(user, follower)
{:ok, user} = User.update_follower_count(user)
- Cachex.
se
t(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
+ Cachex.
pu
t(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
@@
-41,7
+41,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
- "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+ "created_at" => user.inserted_at |> Utils.format_naive_asctime
()
,
"favourites_count" => 0,
"statuses_count" => 1,
"friends_count" => 1,
"favourites_count" => 0,
"statuses_count" => 1,
"friends_count" => 1,
@@
-53,7
+53,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false,
"follows_you" => false,
"statusnet_blocking" => false,
"following" => false,
"follows_you" => false,
"statusnet_blocking" => false,
- "rights" => %{},
+ "rights" => %{
+ "delete_others_notice" => false
+ },
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,
@@
-74,7
+76,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
- "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+ "created_at" => user.inserted_at |> Utils.format_naive_asctime
()
,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 0,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 0,
@@
-86,7
+88,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => true,
"follows_you" => false,
"statusnet_blocking" => false,
"following" => true,
"follows_you" => false,
"statusnet_blocking" => false,
- "rights" => %{},
+ "rights" => %{
+ "delete_others_notice" => false
+ },
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,
@@
-108,7
+112,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"name" => follower.name,
"screen_name" => follower.nickname,
"description" => HtmlSanitizeEx.strip_tags(follower.bio),
"name" => follower.name,
"screen_name" => follower.nickname,
"description" => HtmlSanitizeEx.strip_tags(follower.bio),
- "created_at" => follower.inserted_at |> Utils.format_naive_asctime,
+ "created_at" => follower.inserted_at |> Utils.format_naive_asctime
()
,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 1,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 1,
@@
-120,7
+124,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false,
"follows_you" => true,
"statusnet_blocking" => false,
"following" => false,
"follows_you" => true,
"statusnet_blocking" => false,
- "rights" => %{},
+ "rights" => %{
+ "delete_others_notice" => false
+ },
"statusnet_profile_url" => follower.ap_id,
"cover_photo" => banner,
"background_image" => nil,
"statusnet_profile_url" => follower.ap_id,
"cover_photo" => banner,
"background_image" => nil,
@@
-130,6
+136,13
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
assert represented == UserView.render("show.json", %{user: follower, for: user})
end
assert represented == UserView.render("show.json", %{user: follower, for: user})
end
+ test "a user that is a moderator" do
+ user = insert(:user, %{info: %{"is_moderator" => true}})
+ represented = UserView.render("show.json", %{user: user, for: user})
+
+ assert represented["rights"]["delete_others_notice"]
+ end
+
test "A blocked user for the blocker" do
user = insert(:user)
blocker = insert(:user)
test "A blocked user for the blocker" do
user = insert(:user)
blocker = insert(:user)
@@
-142,7
+155,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
"name" => user.name,
"screen_name" => user.nickname,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
- "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+ "created_at" => user.inserted_at |> Utils.format_naive_asctime
()
,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 0,
"favourites_count" => 0,
"statuses_count" => 0,
"friends_count" => 0,
@@
-154,7
+167,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false,
"follows_you" => false,
"statusnet_blocking" => true,
"following" => false,
"follows_you" => false,
"statusnet_blocking" => true,
- "rights" => %{},
+ "rights" => %{
+ "delete_others_notice" => false
+ },
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil,