improve invites, record usage
This commit is contained in:
@ -23,10 +23,11 @@ defmodule MemexWeb.ConnCase do
|
||||
using do
|
||||
quote do
|
||||
# Import conveniences for testing with connections
|
||||
import Plug.Conn
|
||||
import Phoenix.ConnTest
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import Memex.Fixtures
|
||||
import MemexWeb.ConnCase
|
||||
import Phoenix.ConnTest
|
||||
import Plug.Conn
|
||||
|
||||
alias MemexWeb.Router.Helpers, as: Routes
|
||||
|
||||
@ -50,10 +51,10 @@ defmodule MemexWeb.ConnCase do
|
||||
test context.
|
||||
"""
|
||||
@spec register_and_log_in_user(%{conn: Plug.Conn.t()}) ::
|
||||
%{conn: Plug.Conn.t(), user: User.t()}
|
||||
%{conn: Plug.Conn.t(), current_user: User.t()}
|
||||
def register_and_log_in_user(%{conn: conn}) do
|
||||
user = user_fixture() |> confirm_user()
|
||||
%{conn: log_in_user(conn, user), user: user}
|
||||
current_user = user_fixture() |> confirm_user()
|
||||
%{conn: log_in_user(conn, current_user), current_user: current_user}
|
||||
end
|
||||
|
||||
@spec confirm_user(User.t()) :: User.t()
|
||||
|
@ -22,10 +22,8 @@ defmodule Memex.DataCase do
|
||||
alias Memex.Repo
|
||||
|
||||
import Ecto
|
||||
import Ecto.Changeset
|
||||
import Ecto.Query
|
||||
import Memex.DataCase
|
||||
import Memex.Fixtures
|
||||
import Ecto.{Changeset, Query}
|
||||
import Memex.{DataCase, Fixtures}
|
||||
end
|
||||
end
|
||||
|
||||
@ -45,7 +43,7 @@ defmodule Memex.DataCase do
|
||||
"""
|
||||
def errors_on(changeset) do
|
||||
Ecto.Changeset.traverse_errors(changeset, fn {message, opts} ->
|
||||
Regex.replace(~r"%{(\w+)}", message, fn _, key ->
|
||||
Regex.replace(~r"%{(\w+)}", message, fn _capture, key ->
|
||||
opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
|
||||
end)
|
||||
end)
|
||||
|
Reference in New Issue
Block a user