diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-29 19:18:22 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-29 19:18:22 +0000 |
| commit | e999c67cee65cfe07de6dc76ad18f213c0252bb3 (patch) | |
| tree | 8c90fce63d4392ad146e83f2300de3d33eeb83a1 /test/web/oauth/oauth_controller_test.exs | |
| parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
| parent | 863ec33ba2a90708d199f18683ffe0c4658c710a (diff) | |
| download | pleroma-e999c67cee65cfe07de6dc76ad18f213c0252bb3.tar.gz | |
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
Diffstat (limited to 'test/web/oauth/oauth_controller_test.exs')
| -rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index 0b0972b17..f2f98d768 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -575,7 +575,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do # In case scope param is missing, expecting _all_ app-supported scopes to be granted for user <- [non_admin, admin], {requested_scopes, expected_scopes} <- - %{scopes_subset => scopes_subset, nil => app_scopes} do + %{scopes_subset => scopes_subset, nil: app_scopes} do conn = post( build_conn(), |