forked from shibao/cannery
fix credo
This commit is contained in:
@ -304,9 +304,9 @@ defmodule Cannery.AccountsTest do
|
||||
end
|
||||
|
||||
test "deletes all tokens for the given user", %{user: user} do
|
||||
_ = Accounts.generate_user_session_token(user)
|
||||
_token = Accounts.generate_user_session_token(user)
|
||||
|
||||
{:ok, _} =
|
||||
{:ok, _user} =
|
||||
Accounts.update_user_password(user, valid_user_password(), %{
|
||||
"password" => "new valid password"
|
||||
})
|
||||
@ -501,8 +501,8 @@ defmodule Cannery.AccountsTest do
|
||||
end
|
||||
|
||||
test "deletes all tokens for the given user", %{user: user} do
|
||||
_ = Accounts.generate_user_session_token(user)
|
||||
{:ok, _} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
|
||||
_token = Accounts.generate_user_session_token(user)
|
||||
{:ok, _user} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
|
||||
refute Repo.get_by(UserToken, user_id: user.id)
|
||||
end
|
||||
end
|
||||
|
@ -116,7 +116,7 @@ defmodule CanneryWeb.UserAuthTest do
|
||||
end
|
||||
|
||||
test "does not authenticate if data is missing", %{conn: conn, current_user: current_user} do
|
||||
_ = Accounts.generate_user_session_token(current_user)
|
||||
_token = Accounts.generate_user_session_token(current_user)
|
||||
conn = UserAuth.fetch_current_user(conn, [])
|
||||
refute get_session(conn, :user_token)
|
||||
refute conn.assigns.current_user
|
||||
|
@ -5,8 +5,7 @@ defmodule CanneryWeb.UserConfirmationControllerTest do
|
||||
|
||||
use CanneryWeb.ConnCase, async: true
|
||||
import CanneryWeb.Gettext
|
||||
alias Cannery.Accounts
|
||||
alias Cannery.Repo
|
||||
alias Cannery.{Accounts, Repo}
|
||||
|
||||
@moduletag :user_confirmation_controller_test
|
||||
|
||||
|
@ -51,7 +51,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#ammo_group-form", ammo_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#ammo_group-form", ammo_group: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -75,7 +75,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#ammo_group-form", ammo_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#ammo_group-form",
|
||||
ammo_group: @create_attrs |> Map.put("multiplier", to_string(multiplier))
|
||||
@ -135,7 +135,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#shot_group-form", shot_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "is invalid")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#shot-group-form", shot_group: @shot_group_create_attrs)
|
||||
|> render_submit()
|
||||
@ -158,7 +158,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#ammo_group-form", ammo_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#ammo_group-form", ammo_group: @update_attrs)
|
||||
|> render_submit()
|
||||
@ -204,7 +204,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#ammo_group-form", ammo_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
show_live
|
||||
|> form("#ammo_group-form", ammo_group: @update_attrs)
|
||||
|> render_submit()
|
||||
@ -226,7 +226,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#shot_group-form", shot_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "is invalid")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#shot-group-form", shot_group: @shot_group_create_attrs)
|
||||
|> render_submit()
|
||||
@ -251,7 +251,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
|
||||
# |> form("#shot_group-form", shot_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "is invalid")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#shot-group-form", shot_group: @shot_group_update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -62,7 +62,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
|
||||
# |> form("#ammo_type-form", ammo_type: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#ammo_type-form", ammo_type: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -86,7 +86,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
|
||||
# |> form("#ammo_type-form", ammo_type: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#ammo_type-form", ammo_type: @update_attrs)
|
||||
|> render_submit()
|
||||
@ -128,7 +128,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
|
||||
# |> form("#ammo_type-form", ammo_type: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
show_live
|
||||
|> form("#ammo_type-form", ammo_type: @update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -52,7 +52,7 @@ defmodule CanneryWeb.ContainerLiveTest do
|
||||
# |> form("#container-form", container: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#container-form", container: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -78,7 +78,7 @@ defmodule CanneryWeb.ContainerLiveTest do
|
||||
# |> form("#container-form", container: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#container-form", container: @update_attrs)
|
||||
|> render_submit()
|
||||
@ -123,7 +123,7 @@ defmodule CanneryWeb.ContainerLiveTest do
|
||||
# |> form("#container-form", container: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
show_live
|
||||
|> form("#container-form", container: @update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -40,7 +40,7 @@ defmodule CanneryWeb.InviteLiveTest do
|
||||
# |> form("#invite-form", invite: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#invite-form", invite: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -63,7 +63,7 @@ defmodule CanneryWeb.InviteLiveTest do
|
||||
# |> form("#invite-form", invite: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#invite-form", invite: @update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -49,7 +49,7 @@ defmodule CanneryWeb.RangeLiveTest do
|
||||
# |> form("#shot_group-form", shot_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "is invalid")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#shot-group-form", shot_group: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -71,7 +71,7 @@ defmodule CanneryWeb.RangeLiveTest do
|
||||
# |> form("#shot_group-form", shot_group: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "is invalid")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#shot-group-form", shot_group: @update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -53,7 +53,7 @@ defmodule CanneryWeb.TagLiveTest do
|
||||
# |> form("#tag-form", tag: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#tag-form", tag: @create_attrs)
|
||||
|> render_submit()
|
||||
@ -75,7 +75,7 @@ defmodule CanneryWeb.TagLiveTest do
|
||||
# |> form("#tag-form", tag: @invalid_attrs)
|
||||
# |> render_change() =~ dgettext("errors", "can't be blank")
|
||||
|
||||
{:ok, _, html} =
|
||||
{:ok, _view, html} =
|
||||
index_live
|
||||
|> form("#tag-form", tag: @update_attrs)
|
||||
|> render_submit()
|
||||
|
@ -5,12 +5,11 @@ defmodule CanneryWeb.ErrorViewTest do
|
||||
|
||||
use CanneryWeb.ConnCase, async: true
|
||||
import CanneryWeb.Gettext
|
||||
|
||||
@moduletag :error_view_test
|
||||
|
||||
# Bring render/3 and render_to_string/3 for testing custom views
|
||||
import Phoenix.View
|
||||
|
||||
@moduletag :error_view_test
|
||||
|
||||
test "renders 404.html" do
|
||||
assert render_to_string(CanneryWeb.ErrorView, "404.html", []) =~
|
||||
dgettext("errors", "Not found")
|
||||
|
@ -25,6 +25,7 @@ defmodule CanneryWeb.ConnCase do
|
||||
# Import conveniences for testing with connections
|
||||
import Plug.Conn
|
||||
import Phoenix.ConnTest
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import Cannery.Fixtures
|
||||
import CanneryWeb.ConnCase
|
||||
|
||||
|
@ -22,10 +22,8 @@ defmodule Cannery.DataCase do
|
||||
alias Cannery.Repo
|
||||
|
||||
import Ecto
|
||||
import Ecto.Changeset
|
||||
import Ecto.Query
|
||||
import Cannery.DataCase
|
||||
import Cannery.Fixtures
|
||||
import Ecto.{Changeset, Query}
|
||||
import Cannery.{DataCase, Fixtures}
|
||||
end
|
||||
end
|
||||
|
||||
@ -45,7 +43,7 @@ defmodule Cannery.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 _content, key ->
|
||||
opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
|
||||
end)
|
||||
end)
|
||||
|
Reference in New Issue
Block a user