inhji/chiya
inhji/chiya
1
1
Fork 0
Code Issues 8 Pull requests 9 Activity

rename /users routes to /user

Browse source
This commit is contained in:
Inhji 2023-03-07 21:15:26 +01:00
parent 1c9a1a6d1c
commit ed676c59d3
21 changed files with 116 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/chiya/accounts.ex
View file

@ -179,7 +179,7 @@ defmodule Chiya.Accounts do
## Examples
iex> deliver_user_update_email_instructions(user, current_email, &url(~p"/users/settings/confirm_email/#{&1})")
iex> deliver_user_update_email_instructions(user, current_email, &url(~p"/user/settings/confirm_email/#{&1})")
{:ok, %{to: ..., body: ...}}
"""
@ -276,10 +276,10 @@ defmodule Chiya.Accounts do
## Examples
iex> deliver_user_confirmation_instructions(user, &url(~p"/users/confirm/#{&1}"))
iex> deliver_user_confirmation_instructions(user, &url(~p"/user/confirm/#{&1}"))
{:ok, %{to: ..., body: ...}}
iex> deliver_user_confirmation_instructions(confirmed_user, &url(~p"/users/confirm/#{&1}"))
iex> deliver_user_confirmation_instructions(confirmed_user, &url(~p"/user/confirm/#{&1}"))
{:error, :already_confirmed}
"""
@ -323,7 +323,7 @@ defmodule Chiya.Accounts do
## Examples
iex> deliver_user_reset_password_instructions(user, &url(~p"/users/reset_password/#{&1}"))
iex> deliver_user_reset_password_instructions(user, &url(~p"/user/reset_password/#{&1}"))
{:ok, %{to: ..., body: ...}}
"""

8
lib/chiya_web/components/layouts/root.html.heex
View file

@ -19,7 +19,7 @@
</li>
<li>
<.link
href={~p"/users/settings"}
href={~p"/user/settings"}
class="text-xs leading-6 text-zinc-100 font-semibold hover:text-zinc-300"
>
Settings
@ -27,7 +27,7 @@
</li>
<li>
<.link
href={~p"/users/log_out"}
href={~p"/user/log_out"}
method="delete"
class="text-xs leading-6 text-zinc-100 font-semibold hover:text-zinc-300"
>
@ -37,7 +37,7 @@
<% else %>
<li>
<.link
href={~p"/users/register"}
href={~p"/user/register"}
class="text-xs leading-6 text-zinc-100 font-semibold hover:text-zinc-300"
>
Register
@ -45,7 +45,7 @@
</li>
<li>
<.link
href={~p"/users/log_in"}
href={~p"/user/log_in"}
class="text-xs leading-6 text-zinc-100 font-semibold hover:text-zinc-300"
>
Log in

4
lib/chiya_web/controllers/user_session_controller.ex
View file

@ -10,7 +10,7 @@ defmodule ChiyaWeb.UserSessionController do
def create(conn, %{"_action" => "password_updated"} = params) do
conn
|> put_session(:user_return_to, ~p"/users/settings")
|> put_session(:user_return_to, ~p"/user/settings")
|> create(params, "Password updated successfully!")
end
@ -30,7 +30,7 @@ defmodule ChiyaWeb.UserSessionController do
conn
|> put_flash(:error, "Invalid email or password")
|> put_flash(:email, String.slice(email, 0, 160))
|> redirect(to: ~p"/users/log_in")
|> redirect(to: ~p"/user/log_in")
end
end

6
lib/chiya_web/live/user_confirmation_instructions_live.ex
View file

@ -15,9 +15,9 @@ defmodule ChiyaWeb.UserConfirmationInstructionsLive do
</.simple_form>
<p>
<.link href={~p"/users/register"}>Register</.link>
<.link href={~p"/user/register"}>Register</.link>
|
<.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/user/log_in"}>Log in</.link>
</p>
"""
end
@ -30,7 +30,7 @@ defmodule ChiyaWeb.UserConfirmationInstructionsLive do
if user = Accounts.get_user_by_email(email) do
Accounts.deliver_user_confirmation_instructions(
user,
&url(~p"/users/confirm/#{&1}")
&url(~p"/user/confirm/#{&1}")
)
end

4
lib/chiya_web/live/user_confirmation_live.ex
View file

@ -16,9 +16,9 @@ defmodule ChiyaWeb.UserConfirmationLive do
</.simple_form>
<p class="text-center mt-4">
<.link href={~p"/users/register"}>Register</.link>
<.link href={~p"/user/register"}>Register</.link>
|
<.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/user/log_in"}>Log in</.link>
</p>
</div>
"""

6
lib/chiya_web/live/user_forgot_password_live.ex
View file

@ -20,9 +20,9 @@ defmodule ChiyaWeb.UserForgotPasswordLive do
</:actions>
</.simple_form>
<p class="text-center mt-4">
<.link href={~p"/users/register"}>Register</.link>
<.link href={~p"/user/register"}>Register</.link>
|
<.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/user/log_in"}>Log in</.link>
</p>
</div>
"""
@ -36,7 +36,7 @@ defmodule ChiyaWeb.UserForgotPasswordLive do
if user = Accounts.get_user_by_email(email) do
Accounts.deliver_user_reset_password_instructions(
user,
&url(~p"/users/reset_password/#{&1}")
&url(~p"/user/reset_password/#{&1}")
)
end

6
lib/chiya_web/live/user_login_live.ex
View file

@ -8,20 +8,20 @@ defmodule ChiyaWeb.UserLoginLive do
Sign in to account
<:subtitle>
Don't have an account?
<.link navigate={~p"/users/register"} class="font-semibold text-brand hover:underline">
<.link navigate={~p"/user/register"} class="font-semibold text-brand hover:underline">
Sign up
</.link>
for an account now.
</:subtitle>
</.header>
<.simple_form for={@form} id="login_form" action={~p"/users/log_in"} phx-update="ignore">
<.simple_form for={@form} id="login_form" action={~p"/user/log_in"} phx-update="ignore">
<.input field={@form[:email]} type="email" label="Email" required />
<.input field={@form[:password]} type="password" label="Password" required />
<:actions>
<.input field={@form[:remember_me]} type="checkbox" label="Keep me logged in" />
<.link href={~p"/users/reset_password"} class="text-sm font-semibold">
<.link href={~p"/user/reset_password"} class="text-sm font-semibold">
Forgot your password?
</.link>
</:actions>

6
lib/chiya_web/live/user_registration_live.ex
View file

@ -11,7 +11,7 @@ defmodule ChiyaWeb.UserRegistrationLive do
Register for an account
<:subtitle>
Already registered?
<.link navigate={~p"/users/log_in"} class="font-semibold text-brand hover:underline">
<.link navigate={~p"/user/log_in"} class="font-semibold text-brand hover:underline">
Sign in
</.link>
to your account now.
@ -24,7 +24,7 @@ defmodule ChiyaWeb.UserRegistrationLive do
phx-submit="save"
phx-change="validate"
phx-trigger-action={@trigger_submit}
action={~p"/users/log_in?_action=registered"}
action={~p"/user/log_in?_action=registered"}
method="post"
>
<.error :if={@check_errors}>
@ -66,7 +66,7 @@ defmodule ChiyaWeb.UserRegistrationLive do
{:ok, _} =
Accounts.deliver_user_confirmation_instructions(
user,
&url(~p"/users/confirm/#{&1}")
&url(~p"/user/confirm/#{&1}")
)
changeset = Accounts.change_user_registration(user)

6
lib/chiya_web/live/user_reset_password_live.ex
View file

@ -31,9 +31,9 @@ defmodule ChiyaWeb.UserResetPasswordLive do
</.simple_form>
<p class="text-center mt-4">
<.link href={~p"/users/register"}>Register</.link>
<.link href={~p"/user/register"}>Register</.link>
|
<.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/user/log_in"}>Log in</.link>
</p>
</div>
"""
@ -62,7 +62,7 @@ defmodule ChiyaWeb.UserResetPasswordLive do
{:noreply,
socket
|> put_flash(:info, "Password reset successfully.")
|> redirect(to: ~p"/users/log_in")}
|> redirect(to: ~p"/user/log_in")}
{:error, changeset} ->
{:noreply, assign_form(socket, Map.put(changeset, :action, :insert))}

6
lib/chiya_web/live/user_settings_live.ex
View file

@ -63,7 +63,7 @@ defmodule ChiyaWeb.UserSettingsLive do
<.simple_form
for={@password_form}
id="password_form"
action={~p"/users/log_in?_action=password_updated"}
action={~p"/user/log_in?_action=password_updated"}
method="post"
phx-change="validate_password"
phx-submit="update_password"
@ -102,7 +102,7 @@ defmodule ChiyaWeb.UserSettingsLive do
put_flash(socket, :error, "Email change link is invalid or it has expired.")
end
{:ok, push_navigate(socket, to: ~p"/users/settings")}
{:ok, push_navigate(socket, to: ~p"/user/settings")}
end
def mount(_params, _session, socket) do
@ -175,7 +175,7 @@ defmodule ChiyaWeb.UserSettingsLive do
Accounts.deliver_user_update_email_instructions(
applied_user,
user.email,
&url(~p"/users/settings/confirm_email/#{&1}")
&url(~p"/user/settings/confirm_email/#{&1}")
)
info = "A link to confirm your email change has been sent to the new address."

20
lib/chiya_web/router.ex
View file

@ -61,13 +61,13 @@ defmodule ChiyaWeb.Router do
live_session :redirect_if_user_is_authenticated,
on_mount: [{ChiyaWeb.UserAuth, :redirect_if_user_is_authenticated}] do
live "/users/register", UserRegistrationLive, :new
live "/users/log_in", UserLoginLive, :new
live "/users/reset_password", UserForgotPasswordLive, :new
live "/users/reset_password/:token", UserResetPasswordLive, :edit
live "/user/register", UserRegistrationLive, :new
live "/user/log_in", UserLoginLive, :new
live "/user/reset_password", UserForgotPasswordLive, :new
live "/user/reset_password/:token", UserResetPasswordLive, :edit
end
post "/users/log_in", UserSessionController, :create
post "/user/log_in", UserSessionController, :create
end
scope "/", ChiyaWeb do
@ -75,20 +75,20 @@ defmodule ChiyaWeb.Router do
live_session :require_authenticated_user,
on_mount: [{ChiyaWeb.UserAuth, :ensure_authenticated}] do
live "/users/settings", UserSettingsLive, :edit
live "/users/settings/confirm_email/:token", UserSettingsLive, :confirm_email
live "/user/settings", UserSettingsLive, :edit
live "/user/settings/confirm_email/:token", UserSettingsLive, :confirm_email
end
end
scope "/", ChiyaWeb do
pipe_through [:browser]
delete "/users/log_out", UserSessionController, :delete
delete "/user/log_out", UserSessionController, :delete
live_session :current_user,
on_mount: [{ChiyaWeb.UserAuth, :mount_current_user}] do
live "/users/confirm/:token", UserConfirmationLive, :edit
live "/users/confirm", UserConfirmationInstructionsLive, :new
live "/user/confirm/:token", UserConfirmationLive, :edit
live "/user/confirm", UserConfirmationInstructionsLive, :new
end
end
end

4
lib/chiya_web/user_auth.ex
View file

@ -156,7 +156,7 @@ defmodule ChiyaWeb.UserAuth do
socket =
socket
|> Phoenix.LiveView.put_flash(:error, "You must log in to access this page.")
|> Phoenix.LiveView.redirect(to: ~p"/users/log_in")
|> Phoenix.LiveView.redirect(to: ~p"/user/log_in")
{:halt, socket}
end
@ -206,7 +206,7 @@ defmodule ChiyaWeb.UserAuth do
conn
|> put_flash(:error, "You must log in to access this page.")
|> maybe_store_return_to()
|> redirect(to: ~p"/users/log_in")
|> redirect(to: ~p"/user/log_in")
|> halt()
end
end

28
test/chiya_web/controllers/user_session_controller_test.exs
View file

@ -7,10 +7,10 @@ defmodule ChiyaWeb.UserSessionControllerTest do
%{user: user_fixture()}
end
describe "POST /users/log_in" do
describe "POST /user/log_in" do
test "logs the user in", %{conn: conn, user: user} do
conn =
post(conn, ~p"/users/log_in", %{
post(conn, ~p"/user/log_in", %{
"user" => %{"email" => user.email, "password" => valid_user_password()}
})
@ -21,13 +21,13 @@ defmodule ChiyaWeb.UserSessionControllerTest do
conn = get(conn, ~p"/")
response = html_response(conn, 200)
assert response =~ user.email
assert response =~ ~p"/users/settings"
assert response =~ ~p"/users/log_out"
assert response =~ ~p"/user/settings"
assert response =~ ~p"/user/log_out"
end
test "logs the user in with remember me", %{conn: conn, user: user} do
conn =
post(conn, ~p"/users/log_in", %{
post(conn, ~p"/user/log_in", %{
"user" => %{
"email" => user.email,
"password" => valid_user_password(),
@ -43,7 +43,7 @@ defmodule ChiyaWeb.UserSessionControllerTest do
conn =
conn
|> init_test_session(user_return_to: "/foo/bar")
|> post(~p"/users/log_in", %{
|> post(~p"/user/log_in", %{
"user" => %{
"email" => user.email,
"password" => valid_user_password()
@ -57,7 +57,7 @@ defmodule ChiyaWeb.UserSessionControllerTest do
test "login following registration", %{conn: conn, user: user} do
conn =
conn
|> post(~p"/users/log_in", %{
|> post(~p"/user/log_in", %{
"_action" => "registered",
"user" => %{
"email" => user.email,
@ -72,7 +72,7 @@ defmodule ChiyaWeb.UserSessionControllerTest do
test "login following password update", %{conn: conn, user: user} do
conn =
conn
|> post(~p"/users/log_in", %{
|> post(~p"/user/log_in", %{
"_action" => "password_updated",
"user" => %{
"email" => user.email,
@ -80,31 +80,31 @@ defmodule ChiyaWeb.UserSessionControllerTest do
}
})
assert redirected_to(conn) == ~p"/users/settings"
assert redirected_to(conn) == ~p"/user/settings"
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Password updated successfully"
end
test "redirects to login page with invalid credentials", %{conn: conn} do
conn =
post(conn, ~p"/users/log_in", %{
post(conn, ~p"/user/log_in", %{
"user" => %{"email" => "invalid@email.com", "password" => "invalid_password"}
})
assert Phoenix.Flash.get(conn.assigns.flash, :error) == "Invalid email or password"
assert redirected_to(conn) == ~p"/users/log_in"
assert redirected_to(conn) == ~p"/user/log_in"
end
end
describe "DELETE /users/log_out" do
describe "DELETE /user/log_out" do
test "logs the user out", %{conn: conn, user: user} do
conn = conn |> log_in_user(user) |> delete(~p"/users/log_out")
conn = conn |> log_in_user(user) |> delete(~p"/user/log_out")
assert redirected_to(conn) == ~p"/"
refute get_session(conn, :user_token)
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Logged out successfully"
end
test "succeeds even if the user is not logged in", %{conn: conn} do
conn = delete(conn, ~p"/users/log_out")
conn = delete(conn, ~p"/user/log_out")
assert redirected_to(conn) == ~p"/"
refute get_session(conn, :user_token)
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Logged out successfully"

8
test/chiya_web/live/user_confirmation_instructions_live_test.exs
View file

@ -13,12 +13,12 @@ defmodule ChiyaWeb.UserConfirmationInstructionsLiveTest do
describe "Resend confirmation" do
test "renders the resend confirmation page", %{conn: conn} do
{:ok, _lv, html} = live(conn, ~p"/users/confirm")
{:ok, _lv, html} = live(conn, ~p"/user/confirm")
assert html =~ "Resend confirmation instructions"
end
test "sends a new confirmation token", %{conn: conn, user: user} do
{:ok, lv, _html} = live(conn, ~p"/users/confirm")
{:ok, lv, _html} = live(conn, ~p"/user/confirm")
{:ok, conn} =
lv
@ -35,7 +35,7 @@ defmodule ChiyaWeb.UserConfirmationInstructionsLiveTest do
test "does not send confirmation token if user is confirmed", %{conn: conn, user: user} do
Repo.update!(Accounts.User.confirm_changeset(user))
{:ok, lv, _html} = live(conn, ~p"/users/confirm")
{:ok, lv, _html} = live(conn, ~p"/user/confirm")
{:ok, conn} =
lv
@ -50,7 +50,7 @@ defmodule ChiyaWeb.UserConfirmationInstructionsLiveTest do
end
test "does not send confirmation token if email is invalid", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/confirm")
{:ok, lv, _html} = live(conn, ~p"/user/confirm")
{:ok, conn} =
lv

10
test/chiya_web/live/user_confirmation_live_test.exs
View file

@ -13,7 +13,7 @@ defmodule ChiyaWeb.UserConfirmationLiveTest do
describe "Confirm user" do
test "renders confirmation page", %{conn: conn} do
{:ok, _lv, html} = live(conn, ~p"/users/confirm/some-token")
{:ok, _lv, html} = live(conn, ~p"/user/confirm/some-token")
assert html =~ "Confirm Account"
end
@ -23,7 +23,7 @@ defmodule ChiyaWeb.UserConfirmationLiveTest do
Accounts.deliver_user_confirmation_instructions(user, url)
end)
{:ok, lv, _html} = live(conn, ~p"/users/confirm/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/confirm/#{token}")
result =
lv
@ -41,7 +41,7 @@ defmodule ChiyaWeb.UserConfirmationLiveTest do
assert Repo.all(Accounts.UserToken) == []
# when not logged in
{:ok, lv, _html} = live(conn, ~p"/users/confirm/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/confirm/#{token}")
result =
lv
@ -58,7 +58,7 @@ defmodule ChiyaWeb.UserConfirmationLiveTest do
{:ok, lv, _html} =
build_conn()
|> log_in_user(user)
|> live(~p"/users/confirm/#{token}")
|> live(~p"/user/confirm/#{token}")
result =
lv
@ -71,7 +71,7 @@ defmodule ChiyaWeb.UserConfirmationLiveTest do
end
test "does not confirm email with invalid token", %{conn: conn, user: user} do
{:ok, lv, _html} = live(conn, ~p"/users/confirm/invalid-token")
{:ok, lv, _html} = live(conn, ~p"/user/confirm/invalid-token")
{:ok, conn} =
lv

12
test/chiya_web/live/user_forgot_password_live_test.exs
View file

@ -9,18 +9,18 @@ defmodule ChiyaWeb.UserForgotPasswordLiveTest do
describe "Forgot password page" do
test "renders email page", %{conn: conn} do
{:ok, lv, html} = live(conn, ~p"/users/reset_password")
{:ok, lv, html} = live(conn, ~p"/user/reset_password")
assert html =~ "Forgot your password?"
assert has_element?(lv, ~s|a[href="#{~p"/users/register"}"]|, "Register")
assert has_element?(lv, ~s|a[href="#{~p"/users/log_in"}"]|, "Log in")
assert has_element?(lv, ~s|a[href="#{~p"/user/register"}"]|, "Register")
assert has_element?(lv, ~s|a[href="#{~p"/user/log_in"}"]|, "Log in")
end
test "redirects if already logged in", %{conn: conn} do
result =
conn
|> log_in_user(user_fixture())
|> live(~p"/users/reset_password")
|> live(~p"/user/reset_password")
|> follow_redirect(conn, ~p"/")
assert {:ok, _conn} = result
@ -33,7 +33,7 @@ defmodule ChiyaWeb.UserForgotPasswordLiveTest do
end
test "sends a new reset password token", %{conn: conn, user: user} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password")
{:ok, conn} =
lv
@ -48,7 +48,7 @@ defmodule ChiyaWeb.UserForgotPasswordLiveTest do
end
test "does not send reset password token if email is invalid", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password")
{:ok, conn} =
lv

18
test/chiya_web/live/user_login_live_test.exs
View file

@ -6,7 +6,7 @@ defmodule ChiyaWeb.UserLoginLiveTest do
describe "Log in page" do
test "renders log in page", %{conn: conn} do
{:ok, _lv, html} = live(conn, ~p"/users/log_in")
{:ok, _lv, html} = live(conn, ~p"/user/log_in")
assert html =~ "Log in"
assert html =~ "Register"
@ -17,7 +17,7 @@ defmodule ChiyaWeb.UserLoginLiveTest do
result =
conn
|> log_in_user(user_fixture())
|> live(~p"/users/log_in")
|> live(~p"/user/log_in")
|> follow_redirect(conn, "/")
assert {:ok, _conn} = result
@ -29,7 +29,7 @@ defmodule ChiyaWeb.UserLoginLiveTest do
password = "123456789abcd"
user = user_fixture(%{password: password})
{:ok, lv, _html} = live(conn, ~p"/users/log_in")
{:ok, lv, _html} = live(conn, ~p"/user/log_in")
form =
form(lv, "#login_form", user: %{email: user.email, password: password, remember_me: true})
@ -42,7 +42,7 @@ defmodule ChiyaWeb.UserLoginLiveTest do
test "redirects to login page with a flash error if there are no valid credentials", %{
conn: conn
} do
{:ok, lv, _html} = live(conn, ~p"/users/log_in")
{:ok, lv, _html} = live(conn, ~p"/user/log_in")
form =
form(lv, "#login_form",
@ -53,19 +53,19 @@ defmodule ChiyaWeb.UserLoginLiveTest do
assert Phoenix.Flash.get(conn.assigns.flash, :error) == "Invalid email or password"
assert redirected_to(conn) == "/users/log_in"
assert redirected_to(conn) == "/user/log_in"
end
end
describe "login navigation" do
test "redirects to registration page when the Register button is clicked", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/log_in")
{:ok, lv, _html} = live(conn, ~p"/user/log_in")
{:ok, _login_live, login_html} =
lv
|> element(~s|main a:fl-contains("Sign up")|)
|> render_click()
|> follow_redirect(conn, ~p"/users/register")
|> follow_redirect(conn, ~p"/user/register")
assert login_html =~ "Register"
end
@ -73,13 +73,13 @@ defmodule ChiyaWeb.UserLoginLiveTest do
test "redirects to forgot password page when the Forgot Password button is clicked", %{
conn: conn
} do
{:ok, lv, _html} = live(conn, ~p"/users/log_in")
{:ok, lv, _html} = live(conn, ~p"/user/log_in")
{:ok, conn} =
lv
|> element(~s|main a:fl-contains("Forgot your password?")|)
|> render_click()
|> follow_redirect(conn, ~p"/users/reset_password")
|> follow_redirect(conn, ~p"/user/reset_password")
assert conn.resp_body =~ "Forgot your password?"
end

14
test/chiya_web/live/user_registration_live_test.exs
View file

@ -6,7 +6,7 @@ defmodule ChiyaWeb.UserRegistrationLiveTest do
describe "Registration page" do
test "renders registration page", %{conn: conn} do
{:ok, _lv, html} = live(conn, ~p"/users/register")
{:ok, _lv, html} = live(conn, ~p"/user/register")
assert html =~ "Register"
assert html =~ "Log in"
@ -16,14 +16,14 @@ defmodule ChiyaWeb.UserRegistrationLiveTest do
result =
conn
|> log_in_user(user_fixture())
|> live(~p"/users/register")
|> live(~p"/user/register")
|> follow_redirect(conn, "/")
assert {:ok, _conn} = result
end
test "renders errors for invalid data", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/register")
{:ok, lv, _html} = live(conn, ~p"/user/register")
result =
lv
@ -38,7 +38,7 @@ defmodule ChiyaWeb.UserRegistrationLiveTest do
describe "register user" do
test "creates account and logs the user in", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/register")
{:ok, lv, _html} = live(conn, ~p"/user/register")
email = unique_user_email()
form = form(lv, "#registration_form", user: valid_user_attributes(email: email))
@ -58,7 +58,7 @@ defmodule ChiyaWeb.UserRegistrationLiveTest do
describe "register another user" do
test "renders errors if another user already exists", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/register")
{:ok, lv, _html} = live(conn, ~p"/user/register")
_user = user_fixture(%{email: "test@email.com"})
@ -75,13 +75,13 @@ defmodule ChiyaWeb.UserRegistrationLiveTest do
describe "registration navigation" do
test "redirects to login page when the Log in button is clicked", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/register")
{:ok, lv, _html} = live(conn, ~p"/user/register")
{:ok, _login_live, login_html} =
lv
|> element(~s|main a:fl-contains("Sign in")|)
|> render_click()
|> follow_redirect(conn, ~p"/users/log_in")
|> follow_redirect(conn, ~p"/user/log_in")
assert login_html =~ "Log in"
end

20
test/chiya_web/live/user_reset_password_live_test.exs
View file

@ -19,13 +19,13 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
describe "Reset password page" do
test "renders reset password with valid token", %{conn: conn, token: token} do
{:ok, _lv, html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, _lv, html} = live(conn, ~p"/user/reset_password/#{token}")
assert html =~ "Reset Password"
end
test "does not render reset password with invalid token", %{conn: conn} do
{:error, {:redirect, to}} = live(conn, ~p"/users/reset_password/invalid")
{:error, {:redirect, to}} = live(conn, ~p"/user/reset_password/invalid")
assert to == %{
flash: %{"error" => "Reset password link is invalid or it has expired."},
@ -34,7 +34,7 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
end
test "renders errors for invalid data", %{conn: conn, token: token} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password/#{token}")
result =
lv
@ -50,7 +50,7 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
describe "Reset Password" do
test "resets password once", %{conn: conn, token: token, user: user} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password/#{token}")
{:ok, conn} =
lv
@ -61,7 +61,7 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
}
)
|> render_submit()
|> follow_redirect(conn, ~p"/users/log_in")
|> follow_redirect(conn, ~p"/user/log_in")
refute get_session(conn, :user_token)
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Password reset successfully"
@ -69,7 +69,7 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
end
test "does not reset password on invalid data", %{conn: conn, token: token} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password/#{token}")
result =
lv
@ -89,13 +89,13 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
describe "Reset password navigation" do
test "redirects to login page when the Log in button is clicked", %{conn: conn, token: token} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password/#{token}")
{:ok, conn} =
lv
|> element(~s|main a:fl-contains("Log in")|)
|> render_click()
|> follow_redirect(conn, ~p"/users/log_in")
|> follow_redirect(conn, ~p"/user/log_in")
assert conn.resp_body =~ "Log in"
end
@ -104,13 +104,13 @@ defmodule ChiyaWeb.UserResetPasswordLiveTest do
conn: conn,
token: token
} do
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
{:ok, lv, _html} = live(conn, ~p"/user/reset_password/#{token}")
{:ok, conn} =
lv
|> element(~s|main a:fl-contains("Register")|)
|> render_click()
|> follow_redirect(conn, ~p"/users/register")
|> follow_redirect(conn, ~p"/user/register")
assert conn.resp_body =~ "Register"
end

36
test/chiya_web/live/user_settings_live_test.exs
View file

@ -10,17 +10,17 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
{:ok, _lv, html} =
conn
|> log_in_user(user_fixture())
|> live(~p"/users/settings")
|> live(~p"/user/settings")
assert html =~ "Change Email"
assert html =~ "Change Password"
end
test "redirects if user is not logged in", %{conn: conn} do
assert {:error, redirect} = live(conn, ~p"/users/settings")
assert {:error, redirect} = live(conn, ~p"/user/settings")
assert {:redirect, %{to: path, flash: flash}} = redirect
assert path == ~p"/users/log_in"
assert path == ~p"/user/log_in"
assert %{"error" => "You must log in to access this page."} = flash
end
end
@ -35,7 +35,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
test "updates the user email", %{conn: conn, password: password, user: user} do
new_email = unique_user_email()
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
result =
lv
@ -50,7 +50,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
end
test "renders errors with invalid data (phx-change)", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
result =
lv
@ -66,7 +66,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
end
test "renders errors with invalid data (phx-submit)", %{conn: conn, user: user} do
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
result =
lv
@ -92,7 +92,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
test "updates the user password", %{conn: conn, user: user, password: password} do
new_password = valid_user_password()
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
form =
form(lv, "#password_form", %{
@ -108,7 +108,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
new_password_conn = follow_trigger_action(form, conn)
assert redirected_to(new_password_conn) == ~p"/users/settings"
assert redirected_to(new_password_conn) == ~p"/user/settings"
assert get_session(new_password_conn, :user_token) != get_session(conn, :user_token)
@ -119,7 +119,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
end
test "renders errors with invalid data (phx-change)", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
result =
lv
@ -138,7 +138,7 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
end
test "renders errors with invalid data (phx-submit)", %{conn: conn} do
{:ok, lv, _html} = live(conn, ~p"/users/settings")
{:ok, lv, _html} = live(conn, ~p"/user/settings")
result =
lv
@ -172,27 +172,27 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
end
test "updates the user email once", %{conn: conn, user: user, token: token, email: email} do
{:error, redirect} = live(conn, ~p"/users/settings/confirm_email/#{token}")
{:error, redirect} = live(conn, ~p"/user/settings/confirm_email/#{token}")
assert {:live_redirect, %{to: path, flash: flash}} = redirect
assert path == ~p"/users/settings"
assert path == ~p"/user/settings"
assert %{"info" => message} = flash
assert message == "Email changed successfully."
refute Accounts.get_user_by_email(user.email)
assert Accounts.get_user_by_email(email)
# use confirm token again
{:error, redirect} = live(conn, ~p"/users/settings/confirm_email/#{token}")
{:error, redirect} = live(conn, ~p"/user/settings/confirm_email/#{token}")
assert {:live_redirect, %{to: path, flash: flash}} = redirect
assert path == ~p"/users/settings"
assert path == ~p"/user/settings"
assert %{"error" => message} = flash
assert message == "Email change link is invalid or it has expired."
end
test "does not update email with invalid token", %{conn: conn, user: user} do
{:error, redirect} = live(conn, ~p"/users/settings/confirm_email/oops")
{:error, redirect} = live(conn, ~p"/user/settings/confirm_email/oops")
assert {:live_redirect, %{to: path, flash: flash}} = redirect
assert path == ~p"/users/settings"
assert path == ~p"/user/settings"
assert %{"error" => message} = flash
assert message == "Email change link is invalid or it has expired."
assert Accounts.get_user_by_email(user.email)
@ -200,9 +200,9 @@ defmodule ChiyaWeb.UserSettingsLiveTest do
test "redirects if user is not logged in", %{token: token} do
conn = build_conn()
{:error, redirect} = live(conn, ~p"/users/settings/confirm_email/#{token}")
{:error, redirect} = live(conn, ~p"/user/settings/confirm_email/#{token}")
assert {:redirect, %{to: path, flash: flash}} = redirect
assert path == ~p"/users/log_in"
assert path == ~p"/user/log_in"
assert %{"error" => message} = flash
assert message == "You must log in to access this page."
end

2
test/chiya_web/user_auth_test.exs
View file

@ -231,7 +231,7 @@ defmodule ChiyaWeb.UserAuthTest do
conn = conn |> fetch_flash() |> UserAuth.require_authenticated_user([])
assert conn.halted
assert redirected_to(conn) == ~p"/users/log_in"
assert redirected_to(conn) == ~p"/user/log_in"
assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
"You must log in to access this page."