style: consistent back button and some translations

test/mv_web/live/custom_field_live/deletion_test.exs

@@ -46,6 +46,17 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     %{conn: conn, user: user_with_role}
   end
 
+  # Delete is in the edit form (FormComponent); open form by clicking the name cell (unique td with phx-click)
+  defp open_delete_modal(view, custom_field) do
+    view
+    |> element("tr#custom_fields-#{custom_field.id} td", custom_field.name)
+    |> render_click()
+
+    view
+    |> element("[data-testid=custom-field-delete]")
+    |> render_click()
+  end
+
   describe "delete button and modal" do
     test "opens modal with correct member count when delete is clicked", %{conn: conn} do
       {:ok, member} = create_member()
@@ -55,11 +66,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       create_custom_field_value(member, custom_field, "test")
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      # Click delete button - find the delete link within the component
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Modal should be visible
       assert has_element?(view, "#delete-custom-field-modal")
@@ -81,23 +88,17 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       create_custom_field_value(member2, custom_field, "test2")
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Should show plural form
       assert render(view) =~ "2 members have values assigned for this custom field"
     end
 
     test "shows 0 members for custom field without values", %{conn: conn} do
-      {:ok, _custom_field} = create_custom_field("test_field", :string)
+      {:ok, custom_field} = create_custom_field("test_field", :string)
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Should show 0 members
       assert render(view) =~ "0 members have values assigned for this custom field"
@@ -109,10 +110,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Type in slug input - use element to find the form with phx-target
       view
@@ -124,13 +122,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     end
 
     test "delete button is disabled when slug doesn't match", %{conn: conn} do
-      {:ok, _custom_field} = create_custom_field("test_field", :string)
+      {:ok, custom_field} = create_custom_field("test_field", :string)
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Type wrong slug - use element to find the form with phx-target
       view
@@ -149,11 +144,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field_value} = create_custom_field_value(member, custom_field, "test")
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      # Open modal
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Enter correct slug - use element to find the form with phx-target
       view
@@ -162,7 +153,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
 
       # Click confirm
       view
-      |> element("#delete-custom-field-modal button", "Delete Custom Field and All Values")
+      |> element("#delete-custom-field-modal button", "Delete Datafields and All Values")
       |> render_click()
 
       # Should show success message
@@ -186,10 +177,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Enter wrong slug - use element to find the form with phx-target
       view
@@ -210,10 +198,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
       {:ok, view, _html} = live(conn, ~p"/admin/datafields")
-
-      view
-      |> element("#custom-fields-component a", "Delete")
-      |> render_click()
+      open_delete_modal(view, custom_field)
 
       # Modal should be visible
       assert has_element?(view, "#delete-custom-field-modal")

test/mv_web/live/role_live_test.exs

@@ -138,7 +138,7 @@ defmodule MvWeb.RoleLiveTest do
       assert html =~ "System Role" || html =~ "system"
     end
 
-    test "delete button disabled for system roles", %{conn: conn, actor: actor} do
+    test "delete button not shown for system roles", %{conn: conn, actor: actor} do
       system_role =
         Role
         |> Ash.Changeset.for_create(:create_role, %{
@@ -148,28 +148,19 @@ defmodule MvWeb.RoleLiveTest do
         |> Ash.Changeset.force_change_attribute(:is_system_role, true)
         |> Ash.create!(actor: actor)
 
-      {:ok, view, _html} = live(conn, "/admin/roles")
+      {:ok, view, _html} = live(conn, "/admin/roles/#{system_role.id}")
 
-      assert has_element?(
-               view,
-               "button[phx-click='delete'][phx-value-id='#{system_role.id}'][disabled]"
-             ) ||
-               not has_element?(
-                 view,
-                 "button[phx-click='delete'][phx-value-id='#{system_role.id}']"
-               )
+      # Danger zone (and delete button) is not rendered for system roles
+      refute has_element?(view, "[data-testid=role-delete]")
     end
 
     test "delete button enabled for non-system roles", %{conn: conn} do
       role = create_role()
 
-      {:ok, view, html} = live(conn, "/admin/roles")
+      {:ok, view, _html} = live(conn, "/admin/roles/#{role.id}")
 
-      # Delete is a link with phx-click containing delete event
-      # Check if delete link exists in HTML (phx-click contains delete and role id)
-      assert (html =~ "phx-click" && html =~ "delete" && html =~ role.id) ||
-               has_element?(view, "a[phx-click*='delete'][phx-value-id='#{role.id}']") ||
-               has_element?(view, "a[aria-label='Delete role']")
+      # Delete is on show page (Danger zone)
+      assert has_element?(view, "[data-testid=role-delete]")
     end
 
     test "new role button navigates to form", %{conn: conn} do
@@ -393,21 +384,21 @@ defmodule MvWeb.RoleLiveTest do
     test "deletes non-system role", %{conn: conn, actor: actor} do
       role = create_role()
 
-      {:ok, view, html} = live(conn, "/admin/roles")
+      {:ok, view, _html} = live(conn, "/admin/roles/#{role.id}")
 
-      # Delete is a link - JS.push creates phx-click with value containing id
-      # Verify the role id is in the HTML (in phx-click value)
-      assert html =~ role.id
+      # Delete from Danger zone on show page
+      view
+      |> element("[data-testid=role-delete]")
+      |> render_click()
 
-      # Send delete event directly to avoid selector issues with multiple delete buttons
-      render_click(view, "delete", %{"id" => role.id})
+      assert_redirect(view, "/admin/roles")
 
       # Verify deletion by checking database
       assert {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{}]}} =
                Authorization.get_role(role.id, actor: actor)
     end
 
-    test "fails to delete system role with error message", %{conn: conn, actor: actor} do
+    test "system role has no delete button and cannot be deleted", %{conn: conn, actor: actor} do
       system_role =
         Role
         |> Ash.Changeset.for_create(:create_role, %{
@@ -417,19 +408,12 @@ defmodule MvWeb.RoleLiveTest do
         |> Ash.Changeset.force_change_attribute(:is_system_role, true)
         |> Ash.create!(actor: actor)
 
-      {:ok, view, html} = live(conn, "/admin/roles")
+      {:ok, view, _html} = live(conn, "/admin/roles/#{system_role.id}")
 
-      # System role delete button should be disabled
-      assert html =~ "disabled" || html =~ "cursor-not-allowed" ||
-               html =~ "System roles cannot be deleted"
+      # Danger zone is not rendered for system roles (no delete button)
+      refute has_element?(view, "[data-testid=role-delete]")
 
-      # Try to delete via event (backend check)
-      render_click(view, "delete", %{"id" => system_role.id})
-
-      # Should show error message
-      assert render(view) =~ "System roles cannot be deleted"
-
-      # Role should still exist
+      # Role still exists
       {:ok, _role} = Authorization.get_role(system_role.id, actor: actor)
     end
   end

test/mv_web/live/user_live_authorization_test.exs

@@ -10,14 +10,16 @@ defmodule MvWeb.UserLiveAuthorizationTest do
 
   describe "User Index - Admin" do
     @tag role: :admin
-    test "sees New User, Edit and Delete buttons", %{conn: conn} do
+    test "sees New User button; Edit and Delete are on show page", %{conn: conn} do
       user = Fixtures.user_with_role_fixture("admin")
 
-      {:ok, view, _html} = live(conn, "/users")
+      {:ok, index_view, _html} = live(conn, "/users")
+      assert has_element?(index_view, "[data-testid=user-new]")
 
-      assert has_element?(view, "[data-testid=user-new]")
-      assert has_element?(view, "#row-#{user.id} [data-testid=user-edit]")
-      assert has_element?(view, "#row-#{user.id} [data-testid=user-delete]")
+      # Edit and Delete are on user show page (Danger zone), not on index
+      {:ok, show_view, _html} = live(conn, "/users/#{user.id}")
+      assert has_element?(show_view, "[data-testid=user-edit]")
+      assert has_element?(show_view, "[data-testid=user-delete]")
     end
   end