diff options
author | kaniini <nenolod@gmail.com> | 2019-05-20 18:17:42 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-05-20 18:17:42 +0000 |
commit | 943d1b2f269eaa1fc29702fed45eb8a11164598b (patch) | |
tree | 987eb9e5a5c85796de422dce0335ddf3aede256f /test | |
parent | 643b56347879698a60c206ffb6f4e1e70011c552 (diff) | |
parent | daeae8e2e7c506b72c66dea6ac790408f948ec16 (diff) | |
download | pleroma-943d1b2f269eaa1fc29702fed45eb8a11164598b.tar.gz pleroma-943d1b2f269eaa1fc29702fed45eb8a11164598b.zip |
Merge branch 'feature/user-configurable-mascot' into 'develop'
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
Diffstat (limited to 'test')
-rw-r--r-- | test/fixtures/sound.mp3 | bin | 0 -> 521 bytes | |||
-rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 66 |
2 files changed, 66 insertions, 0 deletions
diff --git a/test/fixtures/sound.mp3 b/test/fixtures/sound.mp3 Binary files differnew file mode 100644 index 000000000..9f0f661a3 --- /dev/null +++ b/test/fixtures/sound.mp3 diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index cbff141c8..1d9f5a816 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1455,6 +1455,72 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert object.data["actor"] == User.ap_id(user) end + test "mascot upload", %{conn: conn} do + user = insert(:user) + + non_image_file = %Plug.Upload{ + content_type: "audio/mpeg", + path: Path.absname("test/fixtures/sound.mp3"), + filename: "sound.mp3" + } + + conn = + conn + |> assign(:user, user) + |> put("/api/v1/pleroma/mascot", %{"file" => non_image_file}) + + assert json_response(conn, 415) + + file = %Plug.Upload{ + content_type: "image/jpg", + path: Path.absname("test/fixtures/image.jpg"), + filename: "an_image.jpg" + } + + conn = + build_conn() + |> assign(:user, user) + |> put("/api/v1/pleroma/mascot", %{"file" => file}) + + assert %{"id" => _, "type" => image} = json_response(conn, 200) + end + + test "mascot retrieving", %{conn: conn} do + user = insert(:user) + # When user hasn't set a mascot, we should just get pleroma tan back + conn = + conn + |> assign(:user, user) + |> get("/api/v1/pleroma/mascot") + + assert %{"url" => url} = json_response(conn, 200) + assert url =~ "pleroma-fox-tan-smol" + + # When a user sets their mascot, we should get that back + file = %Plug.Upload{ + content_type: "image/jpg", + path: Path.absname("test/fixtures/image.jpg"), + filename: "an_image.jpg" + } + + conn = + build_conn() + |> assign(:user, user) + |> put("/api/v1/pleroma/mascot", %{"file" => file}) + + assert json_response(conn, 200) + + user = User.get_cached_by_id(user.id) + + conn = + build_conn() + |> assign(:user, user) + |> get("/api/v1/pleroma/mascot") + + assert %{"url" => url, "type" => "image"} = json_response(conn, 200) + assert url =~ "an_image" + end + test "hashtag timeline", %{conn: conn} do following = insert(:user) |