summaryrefslogtreecommitdiff
path: root/test/plugs/legacy_authentication_plug_test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-04-20 20:37:56 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-04-20 20:37:56 +0400
commit364eecc49f137ae3c7798ad240983591e27b134c (patch)
tree7ed228221db9794b0aae59fa0e548623c0aa12ae /test/plugs/legacy_authentication_plug_test.exs
parentdc8fa04192cc133749e762b78ec043e0902d046d (diff)
parent28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff)
downloadpleroma-364eecc49f137ae3c7798ad240983591e27b134c.tar.gz
pleroma-364eecc49f137ae3c7798ad240983591e27b134c.zip
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/plugs/legacy_authentication_plug_test.exs')
-rw-r--r--test/plugs/legacy_authentication_plug_test.exs6
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