Use Phoenix.Flash module

musicglue · Oct 10, 2022 · b38b1d5 · b38b1d5
1 parent 25e962d
commit b38b1d5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/guides/lock_users.md b/guides/lock_users.md
@@ -282,7 +282,7 @@ defmodule MyAppWeb.Admin.UserControllerTest do
 
       conn = post(conn, Routes.admin_user_path(conn, :lock, user.id))
 
-      assert get_flash(conn, :info) == "User has been locked."
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) == "User has been locked."
       assert redirected_to(conn) == "/"
     end
 
@@ -291,7 +291,7 @@ defmodule MyAppWeb.Admin.UserControllerTest do
 
       conn = post(conn, Routes.admin_user_path(conn, :lock, user.id))
 
-      assert get_flash(conn, :error) == "User couldn't be locked."
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) == "User couldn't be locked."
       assert redirected_to(conn) == "/"
     end
   end
@@ -345,7 +345,7 @@ defmodule MyAppWeb.EnsureUserNotLockedPlugTest do
       |> Pow.Plug.assign_current_user(@locked_user, @pow_config)
       |> EnsureUserNotLockedPlug.call(opts)
 
-    assert get_flash(conn, :error) == "Sorry, your account is locked."
+    assert Phoenix.Flash.get(conn.assigns.flash, :error) == "Sorry, your account is locked."
     assert redirected_to(conn) == Routes.pow_session_path(conn, :new)
   end
 
@@ -377,7 +377,7 @@ defmodule MyAppWeb.ResetPasswordControllerTest do
 
       conn = post(conn, Routes.reset_password_path(conn, :create, @valid_params))
 
-      assert get_flash(conn, :info)
+      assert Phoenix.Flash.get(conn.assigns.flash, :info)
       assert redirected_to(conn) == Routes.pow_session_path(conn, :new)
 
       assert count_reset_password_tokens_for_user(conn, user) == 1
@@ -388,7 +388,7 @@ defmodule MyAppWeb.ResetPasswordControllerTest do
 
       conn = post(conn, Routes.reset_password_path(conn, :create, @valid_params))
 
-      assert get_flash(conn, :info)
+      assert Phoenix.Flash.get(conn.assigns.flash, :info)
       assert redirected_to(conn) == Routes.pow_session_path(conn, :new)
 
       assert count_reset_password_tokens_for_user(conn, user) == 0

diff --git a/guides/multitenancy.md b/guides/multitenancy.md
@@ -311,7 +311,7 @@ defmodule MyAppWeb.AccountControllerTest do
     test "with valid params", %{conn: conn} do
       conn = post(conn, Routes.account_path(conn, :create, @valid_params))
 
-      assert get_flash(conn, :info) == "Welcome!"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) == "Welcome!"
       assert redirected_to(conn) == Routes.page_path(conn, :index)
 
       assert Pow.Plug.current_user(conn)

diff --git a/test/pow/phoenix/controllers/plug_error_handler_test.exs b/test/pow/phoenix/controllers/plug_error_handler_test.exs
@@ -2,7 +2,8 @@ defmodule Pow.Phoenix.PlugErrorHandlerTest do
   use ExUnit.Case
   doctest Pow.Phoenix.PlugErrorHandler
 
-  import Phoenix.ConnTest
+  import Phoenix.ConnTest, except: [get_flash: 2]
+  import Pow.Test.Phoenix.ConnCase, only: [get_flash: 2]
 
   alias Plug.Conn
   alias Pow.Phoenix.{Messages, PlugErrorHandler}
@@ -17,7 +18,8 @@ defmodule Pow.Phoenix.PlugErrorHandlerTest do
   defp prepare_conn(conn) do
     conn
     |> Conn.put_private(:pow_config, messages_backend: Messages)
-    |> Conn.put_private(:phoenix_flash, %{})
+    |> Conn.put_private(:phoenix_flash, %{}) # TODO: Remove when Phoenix 1.7 is required
+    |> Map.update(:assigns, %{}, & Map.put(&1, :flash, %{}))
     |> Conn.put_private(:phoenix_router, Pow.Test.Phoenix.Router)
     |> Conn.fetch_query_params()
   end

diff --git a/test/support/extensions/mocks.ex b/test/support/extensions/mocks.ex
@@ -165,7 +165,8 @@ defmodule Pow.Test.ExtensionMocks do
       using do
         quote do
           import Plug.Conn
-          import Phoenix.ConnTest
+          import Phoenix.ConnTest, except: [get_flash: 2]
+          import Pow.Test.Phoenix.ConnCase, only: [get_flash: 2]
           import ControllerAssertions
 
           alias Router.Helpers, as: Routes

diff --git a/test/support/phoenix/conn_case.ex b/test/support/phoenix/conn_case.ex
@@ -8,7 +8,8 @@ defmodule Pow.Test.Phoenix.ConnCase do
   using do
     quote do
       import Plug.Conn
-      import Phoenix.ConnTest
+      import Phoenix.ConnTest, except: [get_flash: 2]
+      import unquote(__MODULE__), only: [get_flash: 2]
       import ControllerAssertions
 
       alias Router.Helpers, as: Routes
@@ -22,4 +23,11 @@ defmodule Pow.Test.Phoenix.ConnCase do
 
     {:ok, conn: Phoenix.ConnTest.build_conn(), ets: EtsCacheMock}
   end
+
+  # TODO: Remove when Phoenix 1.7 is required
+  if Code.ensure_loaded?(Phoenix.Flash) do
+    def get_flash(conn, key), do: Phoenix.Flash.get(conn.assigns.flash, key)
+  else
+    defdelegate get_flash(conn, key), to: Phoenix.Controller
+  end
 end
diff --git a/test/support/phoenix/controller_assertions.ex b/test/support/phoenix/controller_assertions.ex
@@ -1,6 +1,7 @@
 defmodule Pow.Test.Phoenix.ControllerAssertions do
   @moduledoc false
-  import Phoenix.ConnTest
+  import Phoenix.ConnTest, except: [get_flash: 2]
+  import Pow.Test.Phoenix.ConnCase, only: [get_flash: 2]
 
   alias Pow.Phoenix.{Messages, Routes}