X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fplugs%2Fuser_enabled_plug_test.exs;h=3fb7c53167e601ee15d94d453420974a353fbee4;hb=5b5f855237192499a51652bc91fc02c17ab95c85;hp=af877db76a194e73c3188957161d4d6073d60df5;hpb=045953225e04862c914b51808907cc86b11fcaf4;p=akkoma

diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs
index af877db76..3fb7c5316 100644
--- a/test/plugs/user_enabled_plug_test.exs
+++ b/test/plugs/user_enabled_plug_test.exs
@@ -1,8 +1,12 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Plugs.UserEnabledPlugTest do
   use Pleroma.Web.ConnCase, async: true
 
   alias Pleroma.Plugs.UserEnabledPlug
-  alias Pleroma.User
+  import Pleroma.Factory
 
   test "doesn't do anything if the user isn't set", %{conn: conn} do
     ret_conn =
@@ -12,19 +16,40 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do
     assert ret_conn == conn
   end
 
+  test "with a user that's not confirmed and a config requiring confirmation, it removes that user",
+       %{conn: conn} do
+    old = Pleroma.Config.get([:instance, :account_activation_required])
+    Pleroma.Config.put([:instance, :account_activation_required], true)
+
+    user = insert(:user, confirmation_pending: true)
+
+    conn =
+      conn
+      |> assign(:user, user)
+      |> UserEnabledPlug.call(%{})
+
+    assert conn.assigns.user == nil
+
+    Pleroma.Config.put([:instance, :account_activation_required], old)
+  end
+
   test "with a user that is deactivated, it removes that user", %{conn: conn} do
+    user = insert(:user, info: %{deactivated: true})
+
     conn =
       conn
-      |> assign(:user, %User{info: %{"deactivated" => true}})
+      |> assign(:user, user)
       |> UserEnabledPlug.call(%{})
 
     assert conn.assigns.user == nil
   end
 
   test "with a user that is not deactivated, it does nothing", %{conn: conn} do
+    user = insert(:user)
+
     conn =
       conn
-      |> assign(:user, %User{})
+      |> assign(:user, user)
 
     ret_conn =
       conn