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

Add a default profile picture and banner.

Browse source 
This removes the placehold.it dependency.
This commit is contained in:
eal 2018-01-15 22:18:17 +02:00
commit 14b086eec2
8 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/web/mastodon_api/account_view_test.exs
View file

@ -19,10 +19,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
statuses_count: 5,
note: user.bio,
url: user.ap_id,
avatar: "https://placehold.it/48x48",
avatar_static: "https://placehold.it/48x48",
header: "https://placehold.it/700x335",
header_static: "https://placehold.it/700x335",
avatar: "http://localhost:4001/static/avi.png",
avatar_static: "http://localhost:4001/static/avi.png",
header: "http://localhost:4001/static/banner.png",
header_static: "http://localhost:4001/static/banner.png",
source: %{
note: "",
privacy: "public",

1
test/web/ostatus/user_representer_test.exs
View file

@ -21,6 +21,7 @@ defmodule Pleroma.Web.OStatus.UserRepresenterTest do
<summary>#{user.bio}</summary>
<name>#{user.nickname}</name>
<link rel="avatar" href="#{User.avatar_url(user)}" />
<link rel="header" href="#{User.banner_url(user)}" />
"""
assert clean(res) == clean(expected)

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

@ -33,7 +33,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
{:ok, user} = User.update_follower_count(user)
Cachex.set(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
image = "https://placehold.it/48x48"
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
represented = %{
"id" => user.id,
@ -54,7 +55,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"statusnet_blocking" => false,
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => nil,
"cover_photo" => banner,
"background_image" => nil
}
@ -64,7 +65,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
test "A user for a given other follower", %{user: user} do
{:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
{:ok, user} = User.update_follower_count(user)
image = "https://placehold.it/48x48"
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
represented = %{
"id" => user.id,
"name" => user.name,
@ -84,7 +87,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"statusnet_blocking" => false,
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => nil,
"cover_photo" => banner,
"background_image" => nil
}
@ -95,7 +98,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
{:ok, user} = User.update_follower_count(user)
image = "https://placehold.it/48x48"
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
represented = %{
"id" => follower.id,
"name" => follower.name,
@ -115,7 +120,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"statusnet_blocking" => false,
"rights" => %{},
"statusnet_profile_url" => follower.ap_id,
"cover_photo" => nil,
"cover_photo" => banner,
"background_image" => nil
}
@ -126,7 +131,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
user = insert(:user)
blocker = insert(:user)
User.block(blocker, user)
image = "https://placehold.it/48x48"
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
represented = %{
"id" => user.id,
"name" => user.name,
@ -146,7 +153,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"statusnet_blocking" => true,
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => nil,
"cover_photo" => banner,
"background_image" => nil
}