diff options
Diffstat (limited to 'test/web')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 25 | ||||
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 6 | 
2 files changed, 29 insertions, 2 deletions
| diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 0f8638a94..c2bcddf85 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -990,5 +990,30 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        assert UserView.render("user.json", %{user: user}) == json_response(conn, 200)      end + +    clear_config([:media_proxy]) +    clear_config([Pleroma.Upload]) + +    test "uploadMedia", %{conn: conn} do +      user = insert(:user) + +      desc = "Description of the image" + +      image = %Plug.Upload{ +        content_type: "image/jpg", +        path: Path.absname("test/fixtures/image.jpg"), +        filename: "an_image.jpg" +      } + +      conn = +        conn +        |> assign(:user, user) +        |> post("/api/ap/uploadMedia", %{"file" => image, "description" => desc}) + +      assert object = json_response(conn, :created) +      assert object["name"] == desc +      assert object["type"] == "Document" +      assert object["actor"] == user.ap_id +    end    end  end diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index ec96f0012..fc1635a2f 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -400,7 +400,8 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do                 "oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",                 "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",                 "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token", -               "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox" +               "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox", +               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"               }        assert response["@context"] == [ @@ -462,7 +463,8 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do                 "oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",                 "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",                 "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token", -               "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox" +               "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox", +               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"               }        assert response["@context"] == [ | 
