fix: refine render ref pages test

Author: Callin Mullaney

.github/scripts/render-reference-pages.sh

@@ -10,6 +10,7 @@ fi
 fixture_dir="$1"
 output_dir="$2"
 base_url="${3:-http://127.0.0.1:8888}"
+web_root="${fixture_dir}/web"
 server_log="${output_dir}/php-server.log"
 cookie_file="${output_dir}/cookies.txt"
 
@@ -25,34 +26,60 @@ cleanup() {
 trap cleanup EXIT
 
 (
-  cd "$fixture_dir"
-  php -S 127.0.0.1:8888 -t web web/.ht.router.php >"$server_log" 2>&1
+  cd "$web_root"
+  php -S 127.0.0.1:8888 .ht.router.php >"$server_log" 2>&1
 ) &
 server_pid="$!"
 
+ready=0
 for _ in $(seq 1 30); do
   if curl -fsS "${base_url}/node" >/dev/null 2>&1; then
+    ready=1
     break
   fi
   sleep 1
 done
 
-curl -fsSL "${base_url}/node" >"${output_dir}/frontpage-view.html"
-curl -fsSL "${base_url}/node/1" >"${output_dir}/node.html"
-curl -fsSL "${base_url}/user/1" >"${output_dir}/user.html"
-curl -fsSL "${base_url}/user/login" >"${output_dir}/user-login.html"
-curl -fsSL "${base_url}/contact" >"${output_dir}/contact.html"
+if [ "$ready" -ne 1 ]; then
+  echo "Timed out waiting for the PHP built-in server." >&2
+  sed -n '1,160p' "$server_log" >&2 || true
+  exit 1
+fi
 
-form_build_id="$(grep -o 'name="form_build_id" value="[^"]*"' "${output_dir}/user-login.html" | sed 's/^.*value="//; s/"$//')"
-form_token="$(grep -o 'name="form_token" value="[^"]*"' "${output_dir}/user-login.html" | sed 's/^.*value="//; s/"$//')"
+curl -fsSL "${base_url}/node" >"${output_dir}/frontpage-view.html"
+if grep -q "Drupal already installed" "${output_dir}/frontpage-view.html"; then
+  echo "Fixture site resolved to Drupal's installer instead of the installed site." >&2
+  sed -n '1,160p' "$server_log" >&2 || true
+  exit 1
+fi
 
+curl -fsSL "${base_url}/node/1" >"${output_dir}/node.html"
 curl -fsSL \
   -c "$cookie_file" \
   -b "$cookie_file" \
-  --data-urlencode "name=not-a-real-user" \
-  --data-urlencode "pass=definitely-wrong" \
-  --data-urlencode "form_build_id=${form_build_id}" \
-  --data-urlencode "form_token=${form_token}" \
-  --data-urlencode "form_id=user_login_form" \
-  --data-urlencode "op=Log in" \
-  "${base_url}/user/login" >"${output_dir}/user-login-error.html"
+  "${base_url}/user/login" >"${output_dir}/user-login.html"
+
+form_build_id="$(grep -o 'name="form_build_id" value="[^"]*"' "${output_dir}/user-login.html" | sed 's/^.*value="//; s/"$//')"
+form_token="$(grep -o 'name="form_token" value="[^"]*"' "${output_dir}/user-login.html" | sed 's/^.*value="//; s/"$//' || true)"
+
+if [ -z "$form_build_id" ]; then
+  echo "Unable to extract the login form_build_id from the rendered user login page." >&2
+  exit 1
+fi
+
+post_args=(
+  -fsSL
+  -c "$cookie_file"
+  -b "$cookie_file"
+  --data-urlencode "name=not-a-real-user"
+  --data-urlencode "pass=definitely-wrong"
+  --data-urlencode "form_build_id=${form_build_id}"
+  --data-urlencode "form_id=user_login_form"
+  --data-urlencode "op=Log in"
+)
+
+if [ -n "$form_token" ]; then
+  post_args+=(--data-urlencode "form_token=${form_token}")
+fi
+
+curl "${post_args[@]}" "${base_url}/user/login" >"${output_dir}/user-login-error.html"

templates/form/form.html.twig

@@ -3,8 +3,14 @@
  * @file
  * Theme override for a form.
  *
+ * Available variables:
+ * - attributes: A list of HTML attributes for the form element.
+ * - children: The child elements of the form.
+ *
  * This preserves Drupal's default form wrapper output while moving ownership
  * into the Emulsify parent theme.
  */
 #}
-{{ form }}
+<form{{ attributes }}>
+  {{ children }}
+</form>