diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
commit | 0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd (patch) | |
tree | 0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1 /test/plugs/admin_secret_authentication_plug_test.exs | |
parent | 343229465753ebcc59002a2dd604a910a8ce462d (diff) | |
parent | e0b2de63853e9a14b72faddf6e1180a098728205 (diff) | |
download | pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.tar.gz pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
Diffstat (limited to 'test/plugs/admin_secret_authentication_plug_test.exs')
-rw-r--r-- | test/plugs/admin_secret_authentication_plug_test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/plugs/admin_secret_authentication_plug_test.exs b/test/plugs/admin_secret_authentication_plug_test.exs index 506b1f609..e41ce1825 100644 --- a/test/plugs/admin_secret_authentication_plug_test.exs +++ b/test/plugs/admin_secret_authentication_plug_test.exs @@ -23,6 +23,8 @@ defmodule Pleroma.Plugs.AdminSecretAuthenticationPlugTest do end describe "when secret set it assigns an admin user" do + clear_config([:admin_token]) + test "with `admin_token` query parameter", %{conn: conn} do Pleroma.Config.put(:admin_token, "password123") |