diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-19 17:44:18 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-19 17:44:18 -0700 |
| commit | bc2668bb63aee2c42cdea48782ba5ef291c17b45 (patch) | |
| tree | 838d334208c4dadf23b974181c0ad4c17b199f8c /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | 5469fb9561bb886deb8434e545dfb711eb20f341 (diff) | |
| parent | 41b0ecef959df0a1cda71e56e256cacebe48d56f (diff) | |
| download | pleroma-bc2668bb63aee2c42cdea48782ba5ef291c17b45.tar.gz pleroma-bc2668bb63aee2c42cdea48782ba5ef291c17b45.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
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 |