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

Merge branch 'move-backend-images' into 'develop'

Browse source 
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
This commit is contained in:
lambda 2018-02-03 13:05:20 +00:00
commit 61c16193de
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,8 +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 = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
represented = %{
"id" => user.id,
@ -66,8 +66,8 @@ 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 = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
represented = %{
"id" => user.id,
@ -100,8 +100,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
{:ok, user} = User.update_follower_count(user)
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
represented = %{
"id" => follower.id,
@ -134,8 +134,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
user = insert(:user)
blocker = insert(:user)
User.block(blocker, user)
image = "http://localhost:4001/static/avi.png"
banner = "http://localhost:4001/static/banner.png"
image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/images/banner.png"
represented = %{
"id" => user.id,