fix: more alignment

test/bds/desktop/shell_live_test.exs

@@ -25,6 +25,16 @@ defmodule BDS.Desktop.ShellLiveTest do
     {:ok, project} = Projects.create_project(%{name: "Shell Project", data_path: temp_dir})
     {:ok, _project} = Projects.set_active_project(project.id)
 
+    original_shell_platform = Application.get_env(:bds, :shell_platform)
+
+    on_exit(fn ->
+      if is_nil(original_shell_platform) do
+        Application.delete_env(:bds, :shell_platform)
+      else
+        Application.put_env(:bds, :shell_platform, original_shell_platform)
+      end
+    end)
+
     %{project: project, temp_dir: temp_dir}
   end
 
@@ -95,6 +105,59 @@ defmodule BDS.Desktop.ShellLiveTest do
     assert html =~ ~s(class="tab-bar-empty")
   end
 
+  test "titlebar menu stays hidden on macos because the native menu owns it" do
+    {:ok, view, html} = live_isolated(build_conn(), BDS.Desktop.ShellLive)
+
+    assert html =~ ~s(class="window-titlebar is-mac")
+    refute html =~ ~s(data-testid="window-titlebar-menu-bar")
+    refute html =~ ~s(data-testid="window-titlebar-menu-button")
+    refute html =~ ~s(data-testid="window-titlebar-menu-dropdown")
+
+    html =
+      render_hook(view, "native_menu_action", %{"action" => "edit_preferences"})
+
+    assert html =~ ~s(data-tab-type="settings")
+    assert html =~ ">Settings<"
+  end
+
+  test "titlebar menu matches the old shell contract on windows and linux" do
+    Application.put_env(:bds, :shell_platform, {:unix, :linux})
+
+    {:ok, view, html} = live_isolated(build_conn(), BDS.Desktop.ShellLive)
+
+    refute html =~ ~s(class="window-titlebar is-mac")
+    assert html =~ ~s(data-testid="window-titlebar-menu-bar")
+    assert html =~ ~s(data-testid="window-titlebar-menu-button")
+    assert html =~ ~s(data-menu-group="file")
+    assert html =~ ~s(>File<)
+
+    html =
+      view
+      |> element("[data-testid='window-titlebar-menu-button'][data-menu-group='file']")
+      |> render_click()
+
+    assert html =~ ~s(data-testid="window-titlebar-menu-dropdown")
+    assert html =~ ~s(data-testid="window-titlebar-menu-item")
+    assert html =~ ~s(data-menu-action="new_post")
+    assert html =~ ~s(>New Post<)
+
+    html =
+      view
+      |> element("[data-testid='window-titlebar-menu-button'][data-menu-group='edit']")
+      |> render_click()
+
+    assert html =~ ~s(data-menu-action="edit_preferences")
+
+    html =
+      view
+      |> element("[data-testid='window-titlebar-menu-item'][data-menu-action='edit_preferences']")
+      |> render_click()
+
+    assert html =~ ~s(data-tab-type="settings")
+    assert html =~ ">Settings<"
+    refute html =~ ~s(data-testid="window-titlebar-menu-dropdown")
+  end
+
   test "sidebar open supports preview and pin intents for entity tabs" do
     {:ok, view, _html} = live_isolated(build_conn(), BDS.Desktop.ShellLive)
 

test/bds/desktop_test.exs

@@ -101,7 +101,9 @@ defmodule BDS.DesktopTest do
 
     assert conn.status == 200
     assert conn.resp_body =~ ~s(class="app")
-    assert conn.resp_body =~ ~s(class="window-titlebar")
+    assert conn.resp_body =~ ~s(data-testid="window-titlebar")
+    assert conn.resp_body =~ ~s(class="window-titlebar is-mac")
+    refute conn.resp_body =~ ~s(data-testid="window-titlebar-menu-bar")
     assert conn.resp_body =~ ~s(class="activity-bar")
     assert conn.resp_body =~ ~s(class="sidebar")
     assert conn.resp_body =~ ~s(class="status-bar")