Fix unit tests

src/button/Button.tsx

@@ -164,7 +164,7 @@ export const LoudspeakerButton: FC<LoudspeakerButtonProps> = ({
   );
 };
 
-function classNamesForScrrenWidth(
+function classNamesForScreenWidth(
   className?: string,
   forScreenWidth?: "wide" | "narrow",
 ): string {
@@ -190,10 +190,10 @@ export const SettingsIconButton: FC<SettingsIconButtonProps> = ({
   return (
     <Tooltip label={t("common.settings")}>
       <IconButton
-        className={classNamesForScrrenWidth(className, showForScreenWidth)}
+        className={classNamesForScreenWidth(className, showForScreenWidth)}
         {...props}
       >
-        <Icon aria-hidden/>
+        <Icon aria-hidden />
       </IconButton>
     </Tooltip>
   );
@@ -213,7 +213,7 @@ export const SettingsButton: FC<SettingsButtonProps> = ({
   return (
     <Tooltip label={t("common.settings")}>
       <CpdButton
-        className={classNamesForScrrenWidth(className, showForScreenWidth)}
+        className={classNamesForScreenWidth(className, showForScreenWidth)}
         iconOnly
         Icon={
           platform === "android" ? OverflowVerticalIcon : OverflowHorizontalIcon

src/components/CallFooter.tsx

@@ -114,6 +114,7 @@ export const CallFooter: FC<FooterProps> = ({
         key="settings"
         showForScreenWidth="narrow"
         onClick={openSettings}
+        data-testid="settings-bottom-center"
       />,
     );
   }
@@ -222,6 +223,7 @@ export const CallFooter: FC<FooterProps> = ({
             kind="secondary"
             showForScreenWidth="wide"
             onClick={openSettings}
+            data-testid="settings-bottom-left"
           />
         )}
         {children}

src/room/InCallView.test.tsx

@@ -44,7 +44,6 @@ import { type MediaDevices as ECMediaDevices } from "../state/MediaDevices";
 import { constant } from "../state/Behavior";
 import { AppBar } from "../AppBar";
 import { initializeWidget } from "../widget";
-import callFooterStyles from "../components/CallFooter.module.css";
 
 initializeWidget();
 vi.hoisted(
@@ -123,7 +122,7 @@ function createInCallView(args: CreateInCallViewArgs = {}): RenderResult & {
     [local, alice],
     undefined,
     mediaDevices,
-    {},
+    args.callViewModelOptions,
   );
 
   rtcSession.joined = true;
@@ -191,7 +190,7 @@ describe("InCallView", () => {
     });
   });
   describe("settings button with AppBar header", () => {
-    it("is accessible when showHeader is false", () => {
+    it("mobile landscape, is accessible when showHeader is false", () => {
       // windowSize with height <= 600 results in "flat" windowMode,
       // which means showHeader$ emits false.
       const { getAllByRole } = createInCallView({
@@ -204,20 +203,20 @@ describe("InCallView", () => {
       });
       // When showHeader is false, hideSettingsButton is false,
       // so the settings button is visible in the footer.
-      const settingsBtns = getAllByRole("button", { name: "Settings" });
-      expect(settingsBtns.length).toBe(2);
-      const [btnA, btnB] = settingsBtns;
+      const settingsBtn = getAllByRole("button", { name: "Settings" });
       // here we check for two settings buttons because there are two buttons in the bottom bar. One for the
       // the narrow layout and another one for the wide layout.
       // Their visibility uses @media css queries, which cannot be tested in JSDOM,
       // but we can at least check that both buttons are rendered and have the correct classes.
-      expect(btnA).toBeInTheDocument();
-      expect(btnA).toHaveClass(callFooterStyles.settingsOnlyShowWide);
-      expect(btnB).toBeInTheDocument();
-      expect(btnB).toHaveClass(callFooterStyles.settingsOnlyShowNarrow);
+      expect(settingsBtn.length).toBe(2);
+      expect(settingsBtn[0]).toHaveAttribute(
+        "data-testid",
+        "settings-bottom-left",
+      );
+      expect(settingsBtn[0]).toBeVisible();
     });
 
-    it("is accessible when showHeader is true", () => {
+    it("mobile portrait, is accessible when showHeader is true", () => {
       // windowSize with height > 600 and width > 600 results in "normal" windowMode,
       // which means showHeader$ emits true.
       const { getAllByRole } = createInCallView({
@@ -232,8 +231,12 @@ describe("InCallView", () => {
       // hideSettingsButton is true in the footer, but the settings
       // button is rendered in the AppBar via useAppBarSecondaryButton.
       const settingsBtns = getAllByRole("button", { name: "Settings" });
-      expect(settingsBtns.length).toBe(1);
 
+      expect(settingsBtns.length).toBe(1);
+      expect(settingsBtns[0]).toHaveAttribute(
+        "data-testid",
+        "settings-app-bar",
+      );
       expect(settingsBtns[0]).toBeVisible();
     });
   });

src/room/InCallView.tsx

@@ -565,7 +565,11 @@ export const InCallView: FC<InCallViewProps> = ({
   const settingsButtonInAppBar =
     headerStyle === HeaderStyle.AppBar && showHeader;
   useAppBarSecondaryButton(
-    <SettingsIconButton key="settings" onClick={openSettings} />,
+    <SettingsIconButton
+      key="settings"
+      onClick={openSettings}
+      data-testid="settings-app-bar"
+    />,
   );
 
   // Only hide the settings button if we have an AppBar header and we are showing the header

src/room/__snapshots__/InCallView.test.tsx.snap

@@ -172,6 +172,7 @@ exports[`InCallView > rendering > renders 1`] = `
           aria-labelledby="_r_8_"
           class="_icon-button_1215g_8 settingsOnlyShowWide"
           data-kind="secondary"
+          data-testid="settings-bottom-left"
           role="button"
           style="--cpd-icon-button-size: 32px;"
           tabindex="0"
@@ -307,6 +308,7 @@ exports[`InCallView > rendering > renders 1`] = `
           class="_button_13vu4_8 settingsOnlyShowNarrow _has-icon_13vu4_60 _icon-only_13vu4_53"
           data-kind="secondary"
           data-size="lg"
+          data-testid="settings-bottom-center"
           role="button"
           tabindex="0"
         >
@@ -372,30 +374,7 @@ exports[`InCallView > rendering > renders 1`] = `
           </svg>
         </button>
         <button
-          aria-checked="false"
           aria-labelledby="_r_s_"
-          class="_button_13vu4_8 shareScreen _has-icon_13vu4_60 _icon-only_13vu4_53"
-          data-kind="secondary"
-          data-size="lg"
-          data-testid="incall_screenshare"
-          role="switch"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M1.288 20.713Q1.575 21 2 21h20q.424 0 .712-.288A.97.97 0 0 0 23 20a.97.97 0 0 0-.288-.712A.97.97 0 0 0 22 19H2a.97.97 0 0 0-.712.288A.97.97 0 0 0 1 20q0 .424.288.712m1.3-3.299A1.93 1.93 0 0 1 2 16V5q0-.824.587-1.412A1.93 1.93 0 0 1 4 3h16q.824 0 1.413.587Q22 4.176 22 5v11q0 .824-.587 1.413A1.93 1.93 0 0 1 20 18H4q-.824 0-1.412-.587m10.12-10.12a1 1 0 0 0-1.415 0l-2.5 2.5a1 1 0 0 0 1.414 1.414l.793-.793V13a1 1 0 1 0 2 0v-2.586l.793.793a1 1 0 0 0 1.414-1.414z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-labelledby="_r_11_"
           class="_button_13vu4_8 endCall _has-icon_13vu4_60 _icon-only_13vu4_53 _destructive_13vu4_110"
           data-kind="primary"
           data-size="lg"
@@ -421,7 +400,7 @@ exports[`InCallView > rendering > renders 1`] = `
         class="toggle layout"
       >
         <input
-          aria-labelledby="_r_16_"
+          aria-labelledby="_r_11_"
           name="layout"
           type="radio"
           value="spotlight"
@@ -439,7 +418,7 @@ exports[`InCallView > rendering > renders 1`] = `
           />
         </svg>
         <input
-          aria-labelledby="_r_1b_"
+          aria-labelledby="_r_16_"
           checked=""
           name="layout"
           type="radio"