diff options
author | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
commit | c1d51944c71ff90650b1a631241daf0d8be5b861 (patch) | |
tree | 2e78efaeb892c4b09cac0439f268d6a60637b4dc /test/web/mastodon_api/controllers | |
parent | 199ad47c22e5d72741f5809eb015bac9b00cca03 (diff) | |
parent | 5722b0e2e5e7113f0422798a6ea8cc40d1953291 (diff) | |
download | pleroma-c1d51944c71ff90650b1a631241daf0d8be5b861.tar.gz pleroma-c1d51944c71ff90650b1a631241daf0d8be5b861.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'test/web/mastodon_api/controllers')
-rw-r--r-- | test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs | 4 | ||||
-rw-r--r-- | test/web/mastodon_api/controllers/timeline_controller_test.exs | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs index b888e4c71..2e6704726 100644 --- a/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs +++ b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs @@ -214,6 +214,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do assert user_data = json_response_and_validate_schema(conn, 200) assert user_data["display_name"] == "markorepairs" + + update_activity = Repo.one(Pleroma.Activity) + assert update_activity.data["type"] == "Update" + assert update_activity.data["object"]["name"] == "markorepairs" end test "updates the user's avatar", %{user: user, conn: conn} do diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/web/mastodon_api/controllers/timeline_controller_test.exs index 50e0d783d..71bac99f7 100644 --- a/test/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs @@ -445,6 +445,23 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do assert length(json_response(res_conn, 200)) == 2 end + test "with default settings on private instances, returns 403 for unauthenticated users", %{ + conn: conn, + base_uri: base_uri, + error_response: error_response + } do + clear_config([:instance, :public], false) + clear_config([:restrict_unauthenticated, :timelines]) + + for local <- [true, false] do + res_conn = get(conn, "#{base_uri}?local=#{local}") + + assert json_response(res_conn, :unauthorized) == error_response + end + + ensure_authenticated_access(base_uri) + end + test "with `%{local: true, federated: true}`, returns 403 for unauthenticated users", %{ conn: conn, base_uri: base_uri, |