From fa1fef7b628521b49b7cbfaff5cb300c1cc36df5 Mon Sep 17 00:00:00 2001 From: Owen Rees Date: Tue, 17 Nov 2026 12:55:47 +0100 Subject: [PATCH] Launch amendments: one login, crawler policy, and asset caching (#180) * lesson library shown as com,ing soon. re-enable learngin strip * replace learning strip text with a lasker quote * remove admin login endpoint * fix crawler directives and prelaunch login - noindex the authenticated scope and the 404 catch-all, and cover the mailing-list confirmation redirect - emit noindex, nofollow from the robots meta and /health, and assert public pages stay indexable and followable - stop inventing lastmod values in the sitemap - log in through /users/log-in during prelaunch now that the admin login endpoint is gone; drop create_admin/2 and its orphaned tests * update caching length to 1 year - name change will invalidate cache * remove logger * fix tablebase path breaking tests * test: check cache headers without requiring built assets CI's test job does not run mix assets.build, so /assets/css/app.css is a 404 there. Committed piece art is already content-hashed and takes the same Plug.Static cache option, so the test no longer needs a build step and passes on a fresh checkout. --- .env.example | 2 + assets/css/app.css | 5 +++ assets/css/components/_learning-strip.css | 6 ++- config/runtime.exs | 10 +++-- .../components/layouts/root.html.heex | 2 +- .../controllers/health_controller.ex | 2 +- .../controllers/page_html/home.html.heex | 29 ++++++------ .../controllers/sitemap_controller.ex | 22 +++++---- .../controllers/user_session_controller.ex | 8 ---- lib/chesstrainer_web/endpoint.ex | 8 +++- lib/chesstrainer_web/live/user_live/login.ex | 9 +--- lib/chesstrainer_web/plugs/prelaunch.ex | 2 +- lib/chesstrainer_web/router.ex | 8 ++-- test/chesstrainer/accounts_admin_test.exs | 2 - .../controllers/health_controller_test.exs | 4 +- .../controllers/page_controller_test.exs | 11 ++++- .../controllers/sitemap_controller_test.exs | 5 +-- .../user_session_controller_test.exs | 16 ------- .../crawler_directives_test.exs | 45 +++++++++++++++++++ .../chesstrainer_web/plugs/prelaunch_test.exs | 27 +++++------ test/chesstrainer_web/static_cache_test.exs | 28 ++++++++++++ 21 files changed, 157 insertions(+), 94 deletions(-) create mode 100644 test/chesstrainer_web/crawler_directives_test.exs create mode 100644 test/chesstrainer_web/static_cache_test.exs diff --git a/.env.example b/.env.example index e4ef019..09c6a93 100644 --- a/.env.example +++ b/.env.example @@ -11,6 +11,8 @@ SES_CONFIGURATION_SET=my-first-configuration-set # Optional: override the sender or send everything to one address while testing. # MAIL_FROM=no-reply@mail.innersquare.app # MAIL_REDIRECT_TO=you@example.com +# Optional: directory of local Syzygy .rtbw/.rtbz files. Ignored by the test +# suite, which always uses the committed 3-piece fixtures. TABLEBASE_PATH= MATOMO_URL=https://analytics.owenrees.eu/ diff --git a/assets/css/app.css b/assets/css/app.css index ef97a05..1b3f40d 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -43,6 +43,10 @@ .avatar-stack i:last-child { background: var(--color-deep); color: var(--color-on-deep); } .puzzle-section { width: min(1180px, calc(100% - 48px)); margin: 0 auto; padding: 110px 0 125px; } .puzzle-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 16px; } +.puzzle-coming-soon { min-height: 285px; display: grid; place-content: center; justify-items: center; gap: 10px; padding: 46px 28px; text-align: center; border: 1px dashed var(--color-hairline); border-radius: 12px; background: var(--color-canvas-raised); } +.puzzle-coming-soon .eyebrow { margin-bottom: 6px; } +.puzzle-coming-soon strong { font-family: 'DM Serif Display', serif; font-size: 30px; font-weight: 400; } +.puzzle-coming-soon p { max-width: 420px; margin: 0; color: var(--color-muted); font-size: 14px; line-height: 1.7; } .puzzle-card { display: block; position: relative; min-height: 285px; padding: 25px; text-align: left; text-decoration: none; color: inherit; cursor: pointer; border: 1px solid var(--color-hairline); border-radius: 12px; background: rgba(255,255,255,.28); overflow: hidden; transition: transform .25s, background .25s, box-shadow .25s; } .puzzle-card:hover, .puzzle-card.active { transform: translateY(-5px); background: var(--color-canvas-raised); box-shadow: 0 18px 36px rgba(23,53,45,.08); } .puzzle-card.active { border-color: var(--color-success-text); } @@ -69,6 +73,7 @@ html[data-theme="dark"] .learning-strip { box-shadow: inset 0 1px 0 var(--color- @media (max-width: 650px) { .puzzle-section { width: calc(100% - 36px); padding: 80px 0; } .puzzle-grid { grid-template-columns: 1fr; } + .puzzle-coming-soon { min-height: 255px; padding: 38px 22px; } .puzzle-card { min-height: 255px; } .progress-banner { width: calc(100% - 36px); padding: 48px 28px; flex-direction: column; align-items: flex-start; gap: 34px; } } diff --git a/assets/css/components/_learning-strip.css b/assets/css/components/_learning-strip.css index 80f0732..3261d2c 100644 --- a/assets/css/components/_learning-strip.css +++ b/assets/css/components/_learning-strip.css @@ -3,7 +3,9 @@ display: grid; grid-template-columns: 1.5fr repeat(3, 1fr); align-items: center; background: var(--color-deep); color: var(--color-on-deep); } -.learning-strip > p { max-width: 260px; color: var(--color-on-deep-muted); font-family: 'DM Serif Display', serif; font-size: 19px; line-height: 1.25; } +.learning-quote { margin: 0; max-width: 300px; } +.learning-quote blockquote { margin: 0; color: var(--color-on-deep); font-family: 'DM Serif Display', serif; font-size: 19px; line-height: 1.25; } +.learning-quote figcaption { margin-top: 10px; color: var(--color-on-deep-faint); font-size: 10px; text-transform: uppercase; letter-spacing: .09em; } .stat { padding-left: 34px; border-left: 1px solid rgba(255,255,255,.17); } .stat strong { display: block; font-family: 'DM Serif Display', serif; font-size: 28px; font-weight: 400; } @@ -15,7 +17,7 @@ @media (max-width: 650px) { .learning-strip { padding: 38px 24px; grid-template-columns: 1fr 1fr; gap: 30px 10px; } - .learning-strip > p { grid-column: 1 / -1; } + .learning-quote { grid-column: 1 / -1; } .stat { padding-left: 18px; } .stat:last-child { grid-column: 1 / -1; } } \ No newline at end of file diff --git a/config/runtime.exs b/config/runtime.exs index 25f0990..315368f 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -48,9 +48,13 @@ config :chesstrainer, :mail_redirect_to, System.get_env("MAIL_REDIRECT_TO") # Local Syzygy tablebases: set TABLEBASE_PATH to the directory holding the # .rtbw/.rtbz files. When unset, the local backend stays disabled and lookups -# fall back to Lichess. -if tablebase_path = System.get_env("TABLEBASE_PATH") do - config :chesstrainer, :tablebase_path, tablebase_path +# fall back to Lichess. Tests are always pinned to the committed 3-piece +# fixtures by config/test.exs, so an exported TABLEBASE_PATH cannot make them +# depend on whatever tables the developer happens to have downloaded. +if config_env() != :test do + if tablebase_path = System.get_env("TABLEBASE_PATH") do + config :chesstrainer, :tablebase_path, tablebase_path + end end # Tablebase cache: size and the UTC time of the daily backup. Environment diff --git a/lib/chesstrainer_web/components/layouts/root.html.heex b/lib/chesstrainer_web/components/layouts/root.html.heex index a865155..7f5b002 100644 --- a/lib/chesstrainer_web/components/layouts/root.html.heex +++ b/lib/chesstrainer_web/components/layouts/root.html.heex @@ -3,7 +3,7 @@ - + <.live_title diff --git a/lib/chesstrainer_web/controllers/health_controller.ex b/lib/chesstrainer_web/controllers/health_controller.ex index ea44d93..d6c71a5 100644 --- a/lib/chesstrainer_web/controllers/health_controller.ex +++ b/lib/chesstrainer_web/controllers/health_controller.ex @@ -10,7 +10,7 @@ defmodule ChesstrainerWeb.HealthController do status = if health.status == "down", do: :service_unavailable, else: :ok conn - |> put_resp_header("x-robots-tag", "noindex") + |> put_resp_header("x-robots-tag", "noindex, nofollow") |> put_status(status) |> json(health) end diff --git a/lib/chesstrainer_web/controllers/page_html/home.html.heex b/lib/chesstrainer_web/controllers/page_html/home.html.heex index 95aeafa..8326a04 100644 --- a/lib/chesstrainer_web/controllers/page_html/home.html.heex +++ b/lib/chesstrainer_web/controllers/page_html/home.html.heex @@ -40,8 +40,11 @@ - <%!--
-

Built for the part of chess that decides everything.

+
+
+
“The hardest game to win is a won game.”
+
— Emmanuel Lasker
+
{count_label(@puzzle_count)} puzzles @@ -50,9 +53,9 @@ {@user_count} Players improving their endgame
-
--%> +
- <%!--
+
Choose your lesson @@ -65,16 +68,16 @@ that you’ll recognise over the board.

-
- <%= for {endgame, index} <- Enum.with_index(@endgames) do %> - <.puzzle_card - endgame={endgame} - index={index} - active={@active_endgame && endgame.id == @active_endgame.id} - /> - <% end %> +
+
+ <.icon_spark /> Coming soon +
+ The lesson library is on its way. +

+ A growing set of positions, each teaching one idea. Today’s puzzle is already live. +

-
--%> +
<.mailing_list_signup :if={@mailing_list_enabled} /> diff --git a/lib/chesstrainer_web/controllers/sitemap_controller.ex b/lib/chesstrainer_web/controllers/sitemap_controller.ex index b77459f..b54cc31 100644 --- a/lib/chesstrainer_web/controllers/sitemap_controller.ex +++ b/lib/chesstrainer_web/controllers/sitemap_controller.ex @@ -6,19 +6,20 @@ defmodule ChesstrainerWeb.SitemapController do them and they render the same interactive surface with only the position differing, so listing them all would be index bloat. Revisit that if public browse pages (by Key or theme) exist and are worth ranking. + + No `` is emitted: none of these pages has a stored modification time, + and an invented date (such as "today" on every request) teaches crawlers to + distrust the sitemap. """ use ChesstrainerWeb, :controller def index(conn, _params) do - # The landing page changes every day (daily puzzle, counts), so its - # lastmod is honest. The legal pages have no stored modification time, and - # an invented lastmod is worse than none. entries = [ - {url(conn, ~p"/"), Date.utc_today()}, - {url(conn, ~p"/privacy"), nil}, - {url(conn, ~p"/terms-conditions"), nil}, - {url(conn, ~p"/mentions-legales"), nil} + url(conn, ~p"/"), + url(conn, ~p"/privacy"), + url(conn, ~p"/terms-conditions"), + url(conn, ~p"/mentions-legales") ] conn @@ -28,8 +29,8 @@ defmodule ChesstrainerWeb.SitemapController do defp render_sitemap(entries) do urls = - Enum.map_join(entries, fn {loc, lastmod} -> - " #{escape(loc)}#{lastmod_entry(lastmod)}\n" + Enum.map_join(entries, fn loc -> + " #{escape(loc)}\n" end) """ @@ -39,9 +40,6 @@ defmodule ChesstrainerWeb.SitemapController do """ end - defp lastmod_entry(nil), do: "" - defp lastmod_entry(%Date{} = date), do: "#{Date.to_iso8601(date)}" - # Templates escape automatically; this response is built as a plain string, # so XML-significant characters must be escaped here. defp escape(value) do diff --git a/lib/chesstrainer_web/controllers/user_session_controller.ex b/lib/chesstrainer_web/controllers/user_session_controller.ex index f4f3f1f..5e627aa 100644 --- a/lib/chesstrainer_web/controllers/user_session_controller.ex +++ b/lib/chesstrainer_web/controllers/user_session_controller.ex @@ -12,14 +12,6 @@ defmodule ChesstrainerWeb.UserSessionController do authenticate(conn, user_params, ~p"/users/log-in", nil) end - def create_admin(conn, %{"user" => user_params}) do - if ChesstrainerWeb.prelaunch?() do - authenticate(conn, user_params, ~p"/admin/log-in", ~p"/admin/endgames") - else - authenticate(conn, user_params, ~p"/users/log-in", nil) - end - end - defp authenticate(conn, user_params, failure_path, success_path) do %{"email" => login} = user_params address = ClientAddress.from_conn(conn) diff --git a/lib/chesstrainer_web/endpoint.ex b/lib/chesstrainer_web/endpoint.ex index c0927fd..b03cde5 100644 --- a/lib/chesstrainer_web/endpoint.ex +++ b/lib/chesstrainer_web/endpoint.ex @@ -19,12 +19,18 @@ defmodule ChesstrainerWeb.Endpoint do # # When code reloading is disabled (e.g., in production), # the `gzip` option is enabled to serve compressed - # static files generated by running `phx.digest`. + # static files generated by running `phx.digest`, and the cache headers promise + # a year. Build output is digested, and the stable-name assets (fonts, piece + # art, icons) only change when the file is renamed, so a long max-age is safe + # and keeps browsers and the CDN off the origin. Dev keeps plain `public` so + # edits show up immediately. plug Plug.Static, at: "/", from: :chesstrainer, gzip: not code_reloading?, only: ChesstrainerWeb.static_paths(), + cache_control_for_etags: + if(code_reloading?, do: "public", else: "public, max-age=31536000, immutable"), raise_on_missing_only: code_reloading? # Code reloading can be explicitly enabled under the diff --git a/lib/chesstrainer_web/live/user_live/login.ex b/lib/chesstrainer_web/live/user_live/login.ex index 1cbaf57..fd3256a 100644 --- a/lib/chesstrainer_web/live/user_live/login.ex +++ b/lib/chesstrainer_web/live/user_live/login.ex @@ -27,7 +27,7 @@ defmodule ChesstrainerWeb.UserLive.Login do :let={f} for={@form} id="login_form_password" - action={@login_action} + action={~p"/users/log-in"} phx-submit="submit_password" phx-trigger-action={@trigger_submit} > @@ -75,17 +75,12 @@ defmodule ChesstrainerWeb.UserLive.Login do get_in(socket.assigns, [:current_scope, Access.key(:user), Access.key(:email)]) form = to_form(%{"email" => email}, as: "user") - prelaunch = ChesstrainerWeb.prelaunch?() - - login_action = - if prelaunch, do: ~p"/admin/log-in", else: ~p"/users/log-in" {:ok, assign(socket, form: form, trigger_submit: false, - prelaunch: prelaunch, - login_action: login_action + prelaunch: ChesstrainerWeb.prelaunch?() )} end diff --git a/lib/chesstrainer_web/plugs/prelaunch.ex b/lib/chesstrainer_web/plugs/prelaunch.ex index 9c3897c..8b6b94c 100644 --- a/lib/chesstrainer_web/plugs/prelaunch.ex +++ b/lib/chesstrainer_web/plugs/prelaunch.ex @@ -19,6 +19,7 @@ defmodule ChesstrainerWeb.Plugs.Prelaunch do /health /robots.txt /sitemap.xml + /users/log-in /favicon.ico /favicon.svg /favicon-16x16.png @@ -40,7 +41,6 @@ defmodule ChesstrainerWeb.Plugs.Prelaunch do /assets /fonts /images - /dev ) def init(opts), do: opts diff --git a/lib/chesstrainer_web/router.ex b/lib/chesstrainer_web/router.ex index 66af034..8a26627 100644 --- a/lib/chesstrainer_web/router.ex +++ b/lib/chesstrainer_web/router.ex @@ -36,8 +36,6 @@ defmodule ChesstrainerWeb.Router do get "/terms-conditions", PageController, :terms_conditions get "/mentions-legales", PageController, :mentions_legales post "/mailing-list", MailingListController, :create - get "/mailing-list/confirm/:token", MailingListController, :confirm - post "/admin/log-in", UserSessionController, :create_admin end scope "/admin", ChesstrainerWeb do @@ -89,7 +87,7 @@ defmodule ChesstrainerWeb.Router do ## Authentication routes scope "/", ChesstrainerWeb do - pipe_through [:browser, :require_authenticated_user] + pipe_through [:browser, :noindex, :require_authenticated_user] live_session :require_authenticated_user, on_mount: [ @@ -124,12 +122,12 @@ defmodule ChesstrainerWeb.Router do live "/endgames/:public_code/play", EndgameLive.Play, :play live "/users/register", UserLive.Registration, :new live "/users/log-in", UserLive.Login, :new - live "/admin/log-in", UserLive.Login, :new live "/users/reset-password", UserLive.ResetPassword, :new live "/users/reset-password/:token", UserLive.ResetPassword, :edit end get "/users/confirm/:token", UserConfirmationController, :edit + get "/mailing-list/confirm/:token", MailingListController, :confirm post "/users/log-in", UserSessionController, :create delete "/users/log-out", UserSessionController, :delete @@ -148,7 +146,7 @@ defmodule ChesstrainerWeb.Router do # Keep this last: routes match in definition order. It gives unmatched paths a # branded 404 page with the site chrome instead of Phoenix's bare status page. scope "/", ChesstrainerWeb do - pipe_through :browser + pipe_through [:browser, :noindex] match :*, "/*path", PageController, :not_found end diff --git a/test/chesstrainer/accounts_admin_test.exs b/test/chesstrainer/accounts_admin_test.exs index c8268cb..6a41e85 100644 --- a/test/chesstrainer/accounts_admin_test.exs +++ b/test/chesstrainer/accounts_admin_test.exs @@ -1,8 +1,6 @@ defmodule Chesstrainer.AccountsAdminTest do use Chesstrainer.DataCase, async: false - require Logger - import Chesstrainer.AccountsFixtures import ExUnit.CaptureLog import Swoosh.TestAssertions diff --git a/test/chesstrainer_web/controllers/health_controller_test.exs b/test/chesstrainer_web/controllers/health_controller_test.exs index d6cae5e..e4f0d2f 100644 --- a/test/chesstrainer_web/controllers/health_controller_test.exs +++ b/test/chesstrainer_web/controllers/health_controller_test.exs @@ -10,7 +10,7 @@ defmodule ChesstrainerWeb.HealthControllerTest do assert body["db"] == "ok" assert body["tablebase"] == "local" assert body["process"] == "ok" - assert get_resp_header(conn, "x-robots-tag") == ["noindex"] + assert get_resp_header(conn, "x-robots-tag") == ["noindex, nofollow"] end test "returns degraded when local tablebases are not configured", %{conn: conn} do @@ -53,7 +53,7 @@ defmodule ChesstrainerWeb.HealthControllerTest do assert body["db"] == "down" assert body["tablebase"] == "local" assert body["process"] == "ok" - assert get_resp_header(conn, "x-robots-tag") == ["noindex"] + assert get_resp_header(conn, "x-robots-tag") == ["noindex, nofollow"] end end diff --git a/test/chesstrainer_web/controllers/page_controller_test.exs b/test/chesstrainer_web/controllers/page_controller_test.exs index bd3f18d..c80f197 100644 --- a/test/chesstrainer_web/controllers/page_controller_test.exs +++ b/test/chesstrainer_web/controllers/page_controller_test.exs @@ -68,10 +68,17 @@ defmodule ChesstrainerWeb.PageControllerTest do assert LazyHTML.text(LazyHTML.query(document, "title")) =~ Branding.home_title() refute html =~ "Phoenix Framework" - eyebrow = LazyHTML.query(document, ".eyebrow") + eyebrow = LazyHTML.query(document, ".hero .eyebrow") assert LazyHTML.text(eyebrow) =~ "Endgames, simplified" assert LazyHTML.attribute(LazyHTML.query(eyebrow, "svg"), "aria-hidden") == ["true"] + assert LazyHTML.text(LazyHTML.query(document, ".puzzle-coming-soon")) =~ "Coming soon" + + assert LazyHTML.text(LazyHTML.query(document, ".learning-quote")) =~ + "The hardest game to win is a won game." + + assert html =~ "Emmanuel Lasker" + assert LazyHTML.attribute(LazyHTML.query(document, ~s(meta[name="description"])), "content") == [@description] @@ -381,7 +388,7 @@ defmodule ChesstrainerWeb.PageControllerTest do refute html =~ "Browse puzzles" assert html =~ ~s(class="site-footer") assert html =~ "/assets/js/marketing.js" - assert html =~ ~s(name="robots") + assert html =~ ~s() assert body =~ ~s() assert body =~ "#{base_url}/" - assert body =~ "#{Date.utc_today() |> Date.to_iso8601()}" assert body =~ "#{base_url}/privacy" assert body =~ "#{base_url}/terms-conditions" assert body =~ "#{base_url}/mentions-legales" assert length(:binary.matches(body, "")) == 4 end - test "only dates the landing page", %{conn: conn} do + test "does not invent modification dates", %{conn: conn} do body = conn |> get(~p"/sitemap.xml") |> response(200) - assert length(:binary.matches(body, "")) == 1 + refute body =~ "" end test "is served as XML", %{conn: conn} do diff --git a/test/chesstrainer_web/controllers/user_session_controller_test.exs b/test/chesstrainer_web/controllers/user_session_controller_test.exs index b566ea2..e84a135 100644 --- a/test/chesstrainer_web/controllers/user_session_controller_test.exs +++ b/test/chesstrainer_web/controllers/user_session_controller_test.exs @@ -186,22 +186,6 @@ defmodule ChesstrainerWeb.UserSessionControllerTest do assert get_session(conn, :user_token) end - test "the admin login uses the same throttle", %{conn: conn, user: user} do - for _ <- 1..LoginThrottle.max_per_login() do - post(conn, ~p"/admin/log-in", %{ - "user" => %{"email" => user.email, "password" => "wrong password"} - }) - end - - conn = - post(conn, ~p"/admin/log-in", %{ - "user" => %{"email" => user.email, "password" => valid_user_password()} - }) - - refute get_session(conn, :user_token) - assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Too many attempts." - end - test "log events contain no raw address or password", %{conn: conn, user: user} do log = capture_log( diff --git a/test/chesstrainer_web/crawler_directives_test.exs b/test/chesstrainer_web/crawler_directives_test.exs new file mode 100644 index 0000000..306bc33 --- /dev/null +++ b/test/chesstrainer_web/crawler_directives_test.exs @@ -0,0 +1,45 @@ +defmodule ChesstrainerWeb.CrawlerDirectivesTest do + use ChesstrainerWeb.ConnCase, async: true + + @noindex "noindex, nofollow" + + describe "X-Robots-Tag" do + test "authenticated routes are noindex even when redirecting to log in", %{conn: conn} do + conn = get(conn, ~p"/train") + + assert redirected_to(conn) == ~p"/users/log-in" + assert get_resp_header(conn, "x-robots-tag") == [@noindex] + end + + test "the branded 404 page is noindex", %{conn: conn} do + conn = get(conn, "/this-page-does-not-exist") + + assert html_response(conn, 404) + assert get_resp_header(conn, "x-robots-tag") == [@noindex] + end + + test "the mailing-list confirmation redirect is noindex", %{conn: conn} do + conn = get(conn, "/mailing-list/confirm/oops") + + assert redirected_to(conn) == "/#mailing-list" + assert get_resp_header(conn, "x-robots-tag") == [@noindex] + end + + test "public pages are not marked noindex", %{conn: conn} do + for path <- [~p"/", ~p"/privacy", ~p"/terms-conditions", ~p"/mentions-legales"] do + conn = get(conn, path) + html = html_response(conn, 200) + + assert get_resp_header(conn, "x-robots-tag") == [] + refute html =~ ~s(name="robots") + refute html =~ "nofollow" + end + end + + test "pages that assign :noindex carry the same policy as the header", %{conn: conn} do + html = conn |> get("/this-page-does-not-exist") |> html_response(404) + + assert html =~ ~s( get(~p"/") |> html_response(200) assert conn |> get(~p"/privacy") |> html_response(200) assert conn |> get(~p"/terms-conditions") |> html_response(200) assert conn |> get(~p"/health") |> response(200) - assert conn |> get(~p"/admin/log-in") |> html_response(200) + assert conn |> get(~p"/users/log-in") |> html_response(200) end test "hides public auth links and start training", %{conn: conn} do @@ -30,29 +30,26 @@ defmodule ChesstrainerWeb.Plugs.PrelaunchTest do refute html =~ "Start training" end - test "the hidden admin login uses the admin form action", %{conn: conn} do - html = conn |> get(~p"/admin/log-in") |> html_response(200) + test "the prelaunch login form posts to the public login route", %{conn: conn} do + html = conn |> get(~p"/users/log-in") |> html_response(200) - assert html =~ ~s(action="/admin/log-in") + assert html =~ ~s(action="/users/log-in") refute html =~ "Sign up" end - test "pauses the public login route", %{conn: conn} do - assert conn |> get(~p"/users/log-in") |> redirected_to() == "/" - end - - test "admin login redirects to the admin area", %{conn: conn} do - user = + test "an admin can log in through the public login route", %{conn: conn} do + admin = user_fixture() |> Ecto.Changeset.change(role: :admin) |> Repo.update!() conn = - post(conn, ~p"/admin/log-in", - user: %{email: user.email, password: "hello world!", remember_me: "true"} + post(conn, ~p"/users/log-in", + user: %{email: admin.email, password: "hello world!", remember_me: "true"} ) - assert redirected_to(conn) == "/admin/endgames" + assert get_session(conn, :user_token) + assert get_resp_header(conn, "x-robots-tag") == ["noindex, nofollow"] end test "redirects blocked routes to the home page", %{conn: conn} do @@ -84,7 +81,7 @@ defmodule ChesstrainerWeb.Plugs.PrelaunchTest do end test "blocks registration reached through LiveView navigation", %{conn: conn} do - {:ok, view, _html} = live(conn, ~p"/admin/log-in") + {:ok, view, _html} = live(conn, ~p"/users/log-in") assert {:error, {:redirect, %{to: "/"}}} = live_redirect(view, to: ~p"/users/register") diff --git a/test/chesstrainer_web/static_cache_test.exs b/test/chesstrainer_web/static_cache_test.exs new file mode 100644 index 0000000..c613270 --- /dev/null +++ b/test/chesstrainer_web/static_cache_test.exs @@ -0,0 +1,28 @@ +defmodule ChesstrainerWeb.StaticCacheTest do + use ChesstrainerWeb.ConnCase, async: true + + # One year, matching `Plug.Static` in the endpoint when code reloading is off. + # A missing max-age here lets the CDN fall back to its own short default. + @one_year "public, max-age=31536000, immutable" + + # Piece art is committed already hashed, so it is shaped like digested build + # output without requiring `mix assets.build` first (CI's test job does not + # build assets). The endpoint sets one cache option for every static file. + @digested_piece "/images/pieces/white/king-27fd3307056d10dae685faf4ca8f4488.svg" + + test "digested assets are cached for a year", %{conn: conn} do + conn = get(conn, @digested_piece) + + assert conn.status == 200 + assert get_resp_header(conn, "cache-control") == [@one_year] + end + + test "stable-name assets are cached for a year", %{conn: conn} do + for path <- ["/fonts/dm-sans-variable.woff2", "/images/og.png", "/favicon.svg"] do + conn = get(conn, path) + + assert conn.status == 200 + assert get_resp_header(conn, "cache-control") == [@one_year] + end + end +end