diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-17 08:46:43 +0300 | 
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-17 08:46:43 +0300 | 
| commit | af9dfdce6b502d3a33db7a496879dda56719f56e (patch) | |
| tree | dc42177041881f52a28d506963d63cf4d7d43508 /test/web/mastodon_api/controllers/media_controller_test.exs | |
| parent | d96f8f17e82147c50b3413c3739f5023a5daa834 (diff) | |
| download | pleroma-af9dfdce6b502d3a33db7a496879dda56719f56e.tar.gz pleroma-af9dfdce6b502d3a33db7a496879dda56719f56e.zip  | |
MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
Diffstat (limited to 'test/web/mastodon_api/controllers/media_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/media_controller_test.exs | 14 | 
1 files changed, 11 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/media_controller_test.exs b/test/web/mastodon_api/controllers/media_controller_test.exs index 7ba1727f2..98ec239b1 100644 --- a/test/web/mastodon_api/controllers/media_controller_test.exs +++ b/test/web/mastodon_api/controllers/media_controller_test.exs @@ -9,9 +9,9 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do    alias Pleroma.User    alias Pleroma.Web.ActivityPub.ActivityPub -  setup do: oauth_access(["write:media"]) -    describe "Upload media" do +    setup do: oauth_access(["write:media"]) +      setup do        image = %Plug.Upload{          content_type: "image/jpg", @@ -42,7 +42,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do        assert object.data["actor"] == User.ap_id(conn.assigns[:user])      end -    test "/api/v2/media", %{conn: conn, image: image} do +    test "/api/v2/media", %{conn: conn, user: user, image: image} do        desc = "Description of the image"        response = @@ -53,6 +53,8 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do        assert media_id = response["id"] +      %{conn: conn} = oauth_access(["read:media"], user: user) +        media =          conn          |> get("/api/v1/media/#{media_id}") @@ -62,11 +64,15 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do        assert media["description"] == desc        assert media["id"]        object = Object.get_by_id(media["id"]) + +      # TODO: clarify: if this EP allows access to non-owned objects, the following may be false:        assert object.data["actor"] == User.ap_id(conn.assigns[:user])      end    end    describe "Update media description" do +    setup do: oauth_access(["write:media"]) +      setup %{user: actor} do        file = %Plug.Upload{          content_type: "image/jpg", @@ -97,6 +103,8 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do    end    describe "Get media by id" do +    setup do: oauth_access(["read:media"]) +      setup %{user: actor} do        file = %Plug.Upload{          content_type: "image/jpg",  | 
