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 'origin/develop' into feature/bbs
[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 2f9b2af0127a918af8c4831378b4fc557214958d..74526673c2959034b72b84618bbc194be36fd1ad 100644
(file)
--- a/
test/web/twitter_api/views/user_view_test.exs
+++ b/
test/web/twitter_api/views/user_view_test.exs
@@
-32,7
+32,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
test "A user with emoji in username" do
expected =
test "A user with emoji in username" do
expected =
- "<img
height=\"32px\" width=\"32px
\" alt=\"karjalanpiirakka\" title=\"karjalanpiirakka\" src=\"/file.png\" /> man"
+ "<img
class=\"emoji
\" alt=\"karjalanpiirakka\" title=\"karjalanpiirakka\" src=\"/file.png\" /> man"
user =
insert(:user, %{
user =
insert(:user, %{
@@
-100,7
+100,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
- }
+ },
+ "rights" => %{"admin" => false, "delete_others_notice" => false},
+ "role" => "member"
}
assert represented == UserView.render("show.json", %{user: user})
}
assert represented == UserView.render("show.json", %{user: user})
@@
-151,7
+153,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
- }
+ },
+ "rights" => %{"admin" => false, "delete_others_notice" => false},
+ "role" => "member"
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
@@
-194,7
+198,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
- }
+ },
+ "rights" => %{"admin" => false, "delete_others_notice" => false},
+ "role" => "member"
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
@@
-274,7
+280,9
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
"pleroma" => %{
"confirmation_pending" => false,
"tags" => []
- }
+ },
+ "rights" => %{"admin" => false, "delete_others_notice" => false},
+ "role" => "member"
}
blocker = User.get_cached_by_id(blocker.id)
}
blocker = User.get_cached_by_id(blocker.id)