diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 | 
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 | 
| commit | 35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch) | |
| tree | 0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /test/web/oauth | |
| parent | 7aceaa517be7b109a9acc15fb4914535b536b66c (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.zip  | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'test/web/oauth')
| -rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index 4d0741d14..41aaf6189 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -557,7 +557,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do              "password" => "test",              "client_id" => app.client_id,              "redirect_uri" => redirect_uri, -            "scope" => "read write", +            "scope" => "read:subscope write",              "state" => "statepassed"            }          }) @@ -570,7 +570,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do        assert %{"state" => "statepassed", "code" => code} = query        auth = Repo.get_by(Authorization, token: code)        assert auth -      assert auth.scopes == ["read", "write"] +      assert auth.scopes == ["read:subscope", "write"]      end      test "returns 401 for wrong credentials", %{conn: conn} do @@ -627,7 +627,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do        assert result =~ "This action is outside the authorized scopes"      end -    test "returns 401 for scopes beyond app scopes", %{conn: conn} do +    test "returns 401 for scopes beyond app scopes hierarchy", %{conn: conn} do        user = insert(:user)        app = insert(:oauth_app, scopes: ["read", "write"])        redirect_uri = OAuthController.default_redirect_uri(app)  | 
