diff options
| author | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-07-19 17:42:00 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-07-19 17:42:00 +0900 |
| commit | cc9c062b553e20018e406dc605e6e504ad3134a6 (patch) | |
| tree | 9cf2a1e19697ceefa99671980f42901e0025eaa0 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | b12d17d2ce270e0d964f599efd4f16fba95b17ce (diff) | |
| parent | 41b0ecef959df0a1cda71e56e256cacebe48d56f (diff) | |
| download | pleroma-cc9c062b553e20018e406dc605e6e504ad3134a6.tar.gz pleroma-cc9c062b553e20018e406dc605e6e504ad3134a6.zip | |
merge
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index d1812457d..9e33c1d04 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -736,16 +736,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do filename: "an_image.jpg" } + desc = "Description of the image" + user = insert(:user) conn = conn |> assign(:user, user) - |> post("/api/v1/media", %{"file" => file}) + |> post("/api/v1/media", %{"file" => file, "description" => desc}) assert media = json_response(conn, 200) assert media["type"] == "image" + assert media["description"] == desc end test "hashtag timeline", %{conn: conn} do |