summaryrefslogtreecommitdiff
path: root/test/web/ostatus/ostatus_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-09-30 13:58:14 +0200
committerlain <lain@soykaf.club>2019-09-30 13:58:14 +0200
commita7f22c6e93308710f45fa6a8c2ecadff1a748d90 (patch)
tree3686be67abf9656afb47f8e00967cd74482ef912 /test/web/ostatus/ostatus_controller_test.exs
parentb923842e96e821afeb7bbfa0d098b9c5698281c5 (diff)
parent3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff)
downloadpleroma-a7f22c6e93308710f45fa6a8c2ecadff1a748d90.tar.gz
pleroma-a7f22c6e93308710f45fa6a8c2ecadff1a748d90.zip
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'test/web/ostatus/ostatus_controller_test.exs')
-rw-r--r--test/web/ostatus/ostatus_controller_test.exs6
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"] == [