add setup onboarding page, dashboard launch checklist, provider registry
- new /setup page with three-section onboarding (account, provider, payments) - dashboard launch checklist with progress bar, go-live, dismiss - provider registry on Provider module (single source of truth for metadata) - payments registry for Stripe - setup context made provider-agnostic (provider_connected, theme_customised, etc.) - admin provider pages now fully registry-driven (no hardcoded provider names) - auth flow: fresh installs redirect to /setup, signed_in_path respects setup state - removed old /admin/setup wizard - 840 tests, 0 failures Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -18,7 +18,7 @@ defmodule BerrypodWeb.UserSessionControllerTest do
|
||||
})
|
||||
|
||||
assert get_session(conn, :user_token)
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
|
||||
# Now do a logged in request and assert on the page content
|
||||
conn = get(conn, ~p"/admin/settings")
|
||||
@@ -39,7 +39,7 @@ defmodule BerrypodWeb.UserSessionControllerTest do
|
||||
})
|
||||
|
||||
assert conn.resp_cookies["_berrypod_web_user_remember_me"]
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
end
|
||||
|
||||
test "logs the user in with return to", %{conn: conn, user: user} do
|
||||
@@ -80,7 +80,7 @@ defmodule BerrypodWeb.UserSessionControllerTest do
|
||||
})
|
||||
|
||||
assert get_session(conn, :user_token)
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
|
||||
# Now do a logged in request and assert on the page content
|
||||
conn = get(conn, ~p"/admin/settings")
|
||||
@@ -99,7 +99,7 @@ defmodule BerrypodWeb.UserSessionControllerTest do
|
||||
})
|
||||
|
||||
assert get_session(conn, :user_token)
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "User confirmed successfully."
|
||||
|
||||
assert Accounts.get_user!(user.id).confirmed_at
|
||||
|
||||
@@ -18,14 +18,61 @@ defmodule BerrypodWeb.Admin.DashboardTest do
|
||||
end
|
||||
end
|
||||
|
||||
describe "redirects to setup when not live" do
|
||||
describe "launch checklist" do
|
||||
setup %{conn: conn, user: user} do
|
||||
%{conn: log_in_user(conn, user)}
|
||||
end
|
||||
|
||||
test "redirects to /admin/setup when site not live", %{conn: conn} do
|
||||
{:error, redirect} = live(conn, ~p"/admin")
|
||||
assert {:live_redirect, %{to: "/admin/setup"}} = redirect
|
||||
test "shows checklist when site not live", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/admin")
|
||||
|
||||
assert html =~ "Launch checklist"
|
||||
assert html =~ "Sync your products"
|
||||
assert html =~ "Customise your theme"
|
||||
assert html =~ "Go live"
|
||||
end
|
||||
|
||||
test "hides checklist when site is live", %{conn: conn} do
|
||||
{:ok, _} = Berrypod.Settings.set_site_live(true)
|
||||
{:ok, _view, html} = live(conn, ~p"/admin")
|
||||
|
||||
refute html =~ "Launch checklist"
|
||||
end
|
||||
|
||||
test "dismiss checklist hides it", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/admin")
|
||||
assert has_element?(view, "button", "Dismiss")
|
||||
|
||||
html = render_click(view, "dismiss_checklist")
|
||||
|
||||
refute html =~ "Launch checklist"
|
||||
end
|
||||
|
||||
test "go live button works", %{conn: conn} do
|
||||
# Need provider + products + stripe for go live to be enabled
|
||||
{:ok, conn_record} =
|
||||
Berrypod.Products.create_provider_connection(%{
|
||||
name: "Test",
|
||||
provider_type: "printify",
|
||||
api_key: "test_key"
|
||||
})
|
||||
|
||||
{:ok, _} =
|
||||
Berrypod.Products.create_product(%{
|
||||
title: "Test product",
|
||||
provider_product_id: "ext-1",
|
||||
provider_connection_id: conn_record.id,
|
||||
status: "active"
|
||||
})
|
||||
|
||||
{:ok, _} = Berrypod.Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin")
|
||||
|
||||
html = render_click(view, "go_live")
|
||||
|
||||
assert html =~ "Your shop is live"
|
||||
assert Berrypod.Settings.site_live?()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -30,13 +30,6 @@ defmodule BerrypodWeb.Admin.LayoutTest do
|
||||
refute has_element?(view, ~s(a.active[href="/admin/settings"]))
|
||||
end
|
||||
|
||||
test "highlights setup on setup page", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
assert has_element?(view, ~s(a.active[href="/admin/setup"]))
|
||||
refute has_element?(view, ~s(a.active[href="/admin/orders"]))
|
||||
end
|
||||
|
||||
test "highlights correct link on different pages", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/settings")
|
||||
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
defmodule BerrypodWeb.Admin.SetupTest do
|
||||
use BerrypodWeb.ConnCase, async: false
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Berrypod.AccountsFixtures
|
||||
import Berrypod.ProductsFixtures
|
||||
|
||||
setup do
|
||||
user = user_fixture()
|
||||
%{user: user}
|
||||
end
|
||||
|
||||
describe "unauthenticated" do
|
||||
test "redirects to login", %{conn: conn} do
|
||||
{:error, redirect} = live(conn, ~p"/admin/setup")
|
||||
assert {:redirect, %{to: path}} = redirect
|
||||
assert path == ~p"/users/log-in"
|
||||
end
|
||||
end
|
||||
|
||||
describe "setup stepper" do
|
||||
setup %{conn: conn, user: user} do
|
||||
%{conn: log_in_user(conn, user)}
|
||||
end
|
||||
|
||||
test "shows stepper with printify form when nothing connected", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
assert html =~ "Setup steps"
|
||||
assert html =~ "Connect to Printify"
|
||||
assert html =~ "Printify API token"
|
||||
assert html =~ "Connect Stripe"
|
||||
assert html =~ "Go live"
|
||||
end
|
||||
|
||||
test "shows stripe form when printify is done", %{conn: conn} do
|
||||
conn_fixture = provider_connection_fixture(%{provider_type: "printify"})
|
||||
_product = product_fixture(%{provider_connection: conn_fixture})
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
# Printify step should be completed
|
||||
assert has_element?(view, "li:first-child [class*='bg-green-500']")
|
||||
# Stripe step should be active with form
|
||||
assert has_element?(view, "label", "Secret key")
|
||||
end
|
||||
|
||||
test "shows go live button when all services connected", %{conn: conn} do
|
||||
conn_fixture = provider_connection_fixture(%{provider_type: "printify"})
|
||||
_product = product_fixture(%{provider_connection: conn_fixture})
|
||||
{:ok, _} = Berrypod.Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
assert has_element?(view, "button", "Go live")
|
||||
end
|
||||
|
||||
test "go live shows celebration", %{conn: conn} do
|
||||
conn_fixture = provider_connection_fixture(%{provider_type: "printify"})
|
||||
_product = product_fixture(%{provider_connection: conn_fixture})
|
||||
{:ok, _} = Berrypod.Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
html = view |> element("button", "Go live") |> render_click()
|
||||
|
||||
assert html =~ "Your shop is live!"
|
||||
assert html =~ "Go to dashboard"
|
||||
assert html =~ "View your shop"
|
||||
assert html =~ "Customise theme"
|
||||
end
|
||||
|
||||
test "redirects to /admin when site is live", %{conn: conn} do
|
||||
{:ok, _} = Berrypod.Settings.set_site_live(true)
|
||||
{:error, redirect} = live(conn, ~p"/admin/setup")
|
||||
assert {:live_redirect, %{to: "/admin"}} = redirect
|
||||
end
|
||||
|
||||
test "completed steps show summary and are collapsible", %{conn: conn} do
|
||||
conn_fixture = provider_connection_fixture(%{provider_type: "printify"})
|
||||
_product = product_fixture(%{provider_connection: conn_fixture})
|
||||
|
||||
{:ok, _view, html} = live(conn, ~p"/admin/setup")
|
||||
|
||||
assert html =~ "products synced"
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -64,7 +64,7 @@ defmodule BerrypodWeb.Auth.ConfirmationTest do
|
||||
assert Accounts.get_user!(user.id).confirmed_at
|
||||
# we are logged in now
|
||||
assert get_session(conn, :user_token)
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
|
||||
# log out, new conn
|
||||
conn = build_conn()
|
||||
|
||||
@@ -9,7 +9,7 @@ defmodule BerrypodWeb.Auth.LoginTest do
|
||||
{:ok, _lv, html} = live(conn, ~p"/users/log-in")
|
||||
|
||||
assert html =~ "Log in"
|
||||
assert html =~ "Sign up"
|
||||
assert html =~ "Set up your shop"
|
||||
assert html =~ "Log in with email"
|
||||
end
|
||||
end
|
||||
@@ -56,7 +56,7 @@ defmodule BerrypodWeb.Auth.LoginTest do
|
||||
|
||||
conn = submit_form(form, conn)
|
||||
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
end
|
||||
|
||||
test "redirects to login page with a flash error if credentials are invalid", %{
|
||||
@@ -76,16 +76,16 @@ defmodule BerrypodWeb.Auth.LoginTest do
|
||||
end
|
||||
|
||||
describe "login navigation" do
|
||||
test "redirects to registration page when the Register button is clicked", %{conn: conn} do
|
||||
test "redirects to setup page when the setup link is clicked", %{conn: conn} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/log-in")
|
||||
|
||||
{:ok, _login_live, login_html} =
|
||||
{:ok, _setup_live, setup_html} =
|
||||
lv
|
||||
|> element("main a", "Sign up")
|
||||
|> element("main a", "Set up your shop")
|
||||
|> render_click()
|
||||
|> follow_redirect(conn, ~p"/users/register")
|
||||
|> follow_redirect(conn, ~p"/setup")
|
||||
|
||||
assert login_html =~ "Register"
|
||||
assert setup_html =~ "Set up your shop"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -5,11 +5,8 @@ defmodule BerrypodWeb.Auth.RegistrationTest do
|
||||
import Berrypod.AccountsFixtures
|
||||
|
||||
describe "Registration page" do
|
||||
test "renders registration page when no admin exists", %{conn: conn} do
|
||||
{:ok, _lv, html} = live(conn, ~p"/users/register")
|
||||
|
||||
assert html =~ "Register"
|
||||
assert html =~ "Log in"
|
||||
test "redirects to setup when no admin exists (fresh install)", %{conn: conn} do
|
||||
assert {:error, {:redirect, %{to: "/setup"}}} = live(conn, ~p"/users/register")
|
||||
end
|
||||
|
||||
test "redirects to login when admin already exists", %{conn: conn} do
|
||||
@@ -25,66 +22,9 @@ defmodule BerrypodWeb.Auth.RegistrationTest do
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/users/register")
|
||||
|> follow_redirect(conn, ~p"/admin/setup")
|
||||
|> follow_redirect(conn, ~p"/setup")
|
||||
|
||||
assert {:ok, _conn} = result
|
||||
end
|
||||
|
||||
test "renders errors for invalid data", %{conn: conn} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/register")
|
||||
|
||||
result =
|
||||
lv
|
||||
|> element("#registration_form")
|
||||
|> render_change(user: %{"email" => "with spaces"})
|
||||
|
||||
assert result =~ "Register"
|
||||
assert result =~ "must have the @ sign and no spaces"
|
||||
end
|
||||
end
|
||||
|
||||
describe "register user" do
|
||||
test "creates account but does not log in", %{conn: conn} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/register")
|
||||
|
||||
email = unique_user_email()
|
||||
form = form(lv, "#registration_form", user: valid_user_attributes(email: email))
|
||||
|
||||
{:ok, _lv, html} =
|
||||
render_submit(form)
|
||||
|> follow_redirect(conn, ~p"/users/log-in")
|
||||
|
||||
assert html =~
|
||||
~r/An email was sent to .*, please access it to confirm your account/
|
||||
end
|
||||
|
||||
test "renders errors for duplicated email", %{conn: conn} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/register")
|
||||
|
||||
user = user_fixture(%{email: "test@email.com"})
|
||||
|
||||
result =
|
||||
lv
|
||||
|> form("#registration_form",
|
||||
user: %{"email" => user.email}
|
||||
)
|
||||
|> render_submit()
|
||||
|
||||
assert result =~ "has already been taken"
|
||||
end
|
||||
end
|
||||
|
||||
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, _login_live, login_html} =
|
||||
lv
|
||||
|> element("main a", "Log in")
|
||||
|> render_click()
|
||||
|> follow_redirect(conn, ~p"/users/log-in")
|
||||
|
||||
assert login_html =~ "Log in"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
116
test/berrypod_web/live/setup/onboarding_test.exs
Normal file
116
test/berrypod_web/live/setup/onboarding_test.exs
Normal file
@@ -0,0 +1,116 @@
|
||||
defmodule BerrypodWeb.Setup.OnboardingTest do
|
||||
use BerrypodWeb.ConnCase, async: false
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Berrypod.AccountsFixtures
|
||||
|
||||
alias Berrypod.{Products, Settings}
|
||||
|
||||
describe "access rules" do
|
||||
test "accessible on fresh install (no admin)", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/setup")
|
||||
assert html =~ "Set up your shop"
|
||||
assert html =~ "Create admin account"
|
||||
end
|
||||
|
||||
test "redirects to /admin when setup is complete", %{conn: conn} do
|
||||
user = user_fixture()
|
||||
conn = log_in_user(conn, user)
|
||||
|
||||
{:ok, _} =
|
||||
Products.create_provider_connection(%{
|
||||
name: "Test",
|
||||
provider_type: "printify",
|
||||
api_key: "test_key"
|
||||
})
|
||||
|
||||
{:ok, _} = Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
|
||||
{:error, redirect} = live(conn, ~p"/setup")
|
||||
assert {:live_redirect, %{to: "/admin"}} = redirect
|
||||
end
|
||||
|
||||
test "redirects to login when admin exists but not logged in", %{conn: conn} do
|
||||
_user = user_fixture()
|
||||
|
||||
{:error, redirect} = live(conn, ~p"/setup")
|
||||
assert {:live_redirect, %{to: "/users/log-in"}} = redirect
|
||||
end
|
||||
|
||||
test "redirects to / when site is already live", %{conn: conn} do
|
||||
user = user_fixture()
|
||||
conn = log_in_user(conn, user)
|
||||
|
||||
{:ok, _} =
|
||||
Products.create_provider_connection(%{
|
||||
name: "Test",
|
||||
provider_type: "printify",
|
||||
api_key: "test_key"
|
||||
})
|
||||
|
||||
{:ok, _} = Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
{:ok, _} = Settings.set_site_live(true)
|
||||
|
||||
{:error, redirect} = live(conn, ~p"/setup")
|
||||
assert {:live_redirect, %{to: "/"}} = redirect
|
||||
end
|
||||
end
|
||||
|
||||
describe "sections" do
|
||||
test "shows all three sections on fresh install", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/setup")
|
||||
|
||||
assert html =~ "Create admin account"
|
||||
assert html =~ "Connect a print provider"
|
||||
assert html =~ "Connect payments"
|
||||
end
|
||||
|
||||
test "shows provider cards", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/setup")
|
||||
|
||||
assert html =~ "Printify"
|
||||
assert html =~ "Printful"
|
||||
assert html =~ "Gelato"
|
||||
assert html =~ "Coming soon"
|
||||
end
|
||||
|
||||
test "selecting a provider shows the API key form", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/setup")
|
||||
|
||||
html =
|
||||
view
|
||||
|> element(~s(button[phx-value-type="printify"]))
|
||||
|> render_click()
|
||||
|
||||
assert html =~ "API token"
|
||||
assert html =~ "Printify"
|
||||
end
|
||||
end
|
||||
|
||||
describe "stripe section" do
|
||||
test "shows stripe form", %{conn: conn} do
|
||||
{:ok, _view, html} = live(conn, ~p"/setup")
|
||||
|
||||
assert html =~ "Secret key"
|
||||
assert html =~ "Connect Stripe"
|
||||
end
|
||||
end
|
||||
|
||||
describe "completion" do
|
||||
setup :register_and_log_in_user
|
||||
|
||||
test "redirects to dashboard when all three steps done", %{conn: conn} do
|
||||
{:ok, _} =
|
||||
Products.create_provider_connection(%{
|
||||
name: "Test",
|
||||
provider_type: "printify",
|
||||
api_key: "test_key"
|
||||
})
|
||||
|
||||
{:ok, _} = Settings.put_secret("stripe_api_key", "sk_test_123")
|
||||
|
||||
{:error, redirect} = live(conn, ~p"/setup")
|
||||
assert {:live_redirect, %{to: "/admin"}} = redirect
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -51,9 +51,9 @@ defmodule BerrypodWeb.Shop.ComingSoonTest do
|
||||
assert html =~ "Shop the collection"
|
||||
end
|
||||
|
||||
test "redirects to registration on fresh install (no admin)", %{conn: conn} do
|
||||
# No admin created — redirect to registration
|
||||
assert {:error, {:redirect, %{to: "/users/register"}}} = live(conn, ~p"/")
|
||||
test "redirects to setup on fresh install (no admin)", %{conn: conn} do
|
||||
# No admin created — redirect to setup
|
||||
assert {:error, {:redirect, %{to: "/setup"}}} = live(conn, ~p"/")
|
||||
end
|
||||
|
||||
test "redirects when session token is stale (user deleted)", %{conn: conn} do
|
||||
@@ -63,7 +63,7 @@ defmodule BerrypodWeb.Shop.ComingSoonTest do
|
||||
# Delete the user — session cookie is now stale
|
||||
Berrypod.Repo.delete!(user)
|
||||
|
||||
assert {:error, {:redirect, %{to: "/users/register"}}} = live(conn, ~p"/")
|
||||
assert {:error, {:redirect, %{to: "/setup"}}} = live(conn, ~p"/")
|
||||
end
|
||||
|
||||
test "gates all public shop routes", %{conn: conn} do
|
||||
|
||||
@@ -25,7 +25,7 @@ defmodule BerrypodWeb.UserAuthTest do
|
||||
conn = UserAuth.log_in_user(conn, user)
|
||||
assert token = get_session(conn, :user_token)
|
||||
assert get_session(conn, :live_socket_id) == "users_sessions:#{Base.url_encode64(token)}"
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
assert Accounts.get_user_by_session_token(token)
|
||||
end
|
||||
|
||||
@@ -80,7 +80,7 @@ defmodule BerrypodWeb.UserAuthTest do
|
||||
|> assign(:current_scope, Scope.for_user(user))
|
||||
|> UserAuth.log_in_user(user)
|
||||
|
||||
assert redirected_to(conn) == ~p"/admin/setup"
|
||||
assert redirected_to(conn) == ~p"/setup"
|
||||
end
|
||||
|
||||
test "writes a cookie if remember_me was set in previous session", %{conn: conn, user: user} do
|
||||
|
||||
Reference in New Issue
Block a user