hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/twitter_api/fields' into 'develop'

Browse source 
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360
This commit is contained in:
Haelwenn 2018-09-28 09:25:27 +00:00
commit 34b6d444d6
2 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
test/web/twitter_api/views/user_view_test.exs
View file

@ -88,7 +88,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true,
"locked" => false,
"default_scope" => "public",
"no_rich_text" => false
"no_rich_text" => false,
"fields" => []
}
assert represented == UserView.render("show.json", %{user: user})
@ -128,7 +129,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true,
"locked" => false,
"default_scope" => "public",
"no_rich_text" => false
"no_rich_text" => false,
"fields" => []
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
@ -169,7 +171,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true,
"locked" => false,
"default_scope" => "public",
"no_rich_text" => false
"no_rich_text" => false,
"fields" => []
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
@ -217,10 +220,37 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true,
"locked" => false,
"default_scope" => "public",
"no_rich_text" => false
"no_rich_text" => false,
"fields" => []
}
blocker = Repo.get(User, blocker.id)
assert represented == UserView.render("show.json", %{user: user, for: blocker})
end
test "a user with mastodon fields" do
fields = [
%{
"name" => "Pronouns",
"value" => "she/her"
},
%{
"name" => "Website",
"value" => "https://example.org/"
}
]
user =
insert(:user, %{
info: %{
"source_data" => %{
"attachment" =>
Enum.map(fields, fn field -> Map.put(field, "type", "PropertyValue") end)
}
}
})
userview = UserView.render("show.json", %{user: user})
assert userview["fields"] == fields
end
end