diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
commit | a92c713d9c761563c72d0f660574878aa569249a (patch) | |
tree | ce88697749dbe26331b255883b4fa9631002e8b4 /test/plugs/legacy_authentication_plug_test.exs | |
parent | 270c3fe446a374202b6d64ce487f7df29ecb1c14 (diff) | |
parent | 0dd863f8f53d30d37e35d4ec2c4e34d09a266a85 (diff) | |
download | pleroma-a92c713d9c761563c72d0f660574878aa569249a.tar.gz pleroma-a92c713d9c761563c72d0f660574878aa569249a.zip |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'test/plugs/legacy_authentication_plug_test.exs')
-rw-r--r-- | test/plugs/legacy_authentication_plug_test.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/plugs/legacy_authentication_plug_test.exs b/test/plugs/legacy_authentication_plug_test.exs index 7559de7d3..3b8c07627 100644 --- a/test/plugs/legacy_authentication_plug_test.exs +++ b/test/plugs/legacy_authentication_plug_test.exs @@ -8,6 +8,8 @@ defmodule Pleroma.Plugs.LegacyAuthenticationPlugTest do import Pleroma.Factory alias Pleroma.Plugs.LegacyAuthenticationPlug + alias Pleroma.Plugs.OAuthScopesPlug + alias Pleroma.Plugs.PlugHelper alias Pleroma.User setup do @@ -36,7 +38,8 @@ defmodule Pleroma.Plugs.LegacyAuthenticationPlugTest do end @tag :skip_on_mac - test "it authenticates the auth_user if present and password is correct and resets the password", + test "if `auth_user` is present and password is correct, " <> + "it authenticates the user, resets the password, marks OAuthScopesPlug as skipped", %{ conn: conn, user: user @@ -49,6 +52,7 @@ defmodule Pleroma.Plugs.LegacyAuthenticationPlugTest do conn = LegacyAuthenticationPlug.call(conn, %{}) assert conn.assigns.user.id == user.id + assert PlugHelper.plug_skipped?(conn, OAuthScopesPlug) end @tag :skip_on_mac |