diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-02-03 13:05:20 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-02-03 13:05:20 +0000 |
| commit | 61c16193decca80c4021039a674edb77c7bf6158 (patch) | |
| tree | a3b7b01400f4981f3d49cf77f207f4ab0d296422 /test/web/twitter_api | |
| parent | 9a9766d6489024fb725197af1461944252aae9ed (diff) | |
| parent | c8a29315495190c27f86b7331aa18c24e8fe9fcc (diff) | |
| download | pleroma-61c16193decca80c4021039a674edb77c7bf6158.tar.gz pleroma-61c16193decca80c4021039a674edb77c7bf6158.zip | |
Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
Diffstat (limited to 'test/web/twitter_api')
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index e68230a86..d5d2f0adc 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -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, |