diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 11:21:49 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 11:21:49 +0000 |
| commit | 26f66fb70ab1bd777a92daf4347aaa63b044d0af (patch) | |
| tree | 75d562e8e5d9f6a036d626e0cb9d081998242263 /test/web/ostatus/ostatus_controller_test.exs | |
| parent | 0e356cc8003665ec05a42e39b3a5c47e31ec384c (diff) | |
| parent | 0dc8f3d6d2fa18261e9a6fa8da540c434f1fa67b (diff) | |
| download | pleroma-26f66fb70ab1bd777a92daf4347aaa63b044d0af.tar.gz pleroma-26f66fb70ab1bd777a92daf4347aaa63b044d0af.zip | |
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
Diffstat (limited to 'test/web/ostatus/ostatus_controller_test.exs')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index 2b40fb47e..f06023dff 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -396,7 +396,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/upload_media" } assert response["@context"] == [ @@ -458,7 +459,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/upload_media" } assert response["@context"] == [ |