Merge branch 'develop' into fix/CORL-3180-dont-autoplay-gifs-mod-queue

coralproject · Sep 30, 2024 · 6945b13 · 6945b13
2 parents a648c02 + 554602f
commit 6945b13
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 41 deletions.
diff --git a/client/src/core/client/admin/test/community/userHistoryDrawer.spec.tsx b/client/src/core/client/admin/test/community/userHistoryDrawer.spec.tsx
@@ -152,13 +152,13 @@ it("user drawer is open and user can be scheduled for deletion and have deletion
     "userHistoryDrawer-modal"
   );
   const historyTab = await within(isabelleUserHistory).findByRole("tab", {
-    name: "Tab: time-reverse Account History",
+    name: "time-reverse Account History",
   });
   await act(async () => {
     userEvent.click(historyTab);
   });
   const tabRegion = screen.getByRole("region", {
-    name: "Tab: time-reverse Account History",
+    name: "time-reverse Account History",
   });
   const deleteAccountButton = within(tabRegion).getByRole("button", {
     name: "Delete account",

diff --git a/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx b/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx
@@ -445,7 +445,7 @@ it("show reaction details for a comment with reactions", async () => {
   });
   userEvent.click(detailsButton);
   const reactionsButton = within(reported).getByRole("tab", {
-    name: "Tab: Reactions",
+    name: "Reactions",
   });
   await act(async () => {
     userEvent.click(reactionsButton);

diff --git a/client/src/core/client/stream/test/comments/featured/renderAnsweredStream.spec.tsx b/client/src/core/client/stream/test/comments/featured/renderAnsweredStream.spec.tsx
@@ -63,9 +63,7 @@ it("renders comment stream with answered comments", async () => {
     "comments-featuredComments-log"
   );
   expect(answeredComments).toBeVisible();
-  expect(
-    screen.getByRole("tab", { name: "Tab: Answered ( 2 )" })
-  ).toBeVisible();
+  expect(screen.getByRole("tab", { name: "Answered ( 2 )" })).toBeVisible();
   expect(
     screen.getByRole("article", {
       name: "Answer from Markus 2018-07-06T18:24:00.000Z",
@@ -88,9 +86,7 @@ it("renders oldest first sort answered comments tab with post comment form", asy
     "comments-featuredComments-log"
   );
   expect(answeredComments).toBeVisible();
-  expect(
-    screen.getByRole("tab", { name: "Tab: Answered ( 2 )" })
-  ).toBeVisible();
+  expect(screen.getByRole("tab", { name: "Answered ( 2 )" })).toBeVisible();
   expect(
     screen.getByRole("article", {
       name: "Answer from Markus 2018-07-06T18:24:00.000Z",

diff --git a/client/src/core/client/ui/components/v2/Tabs/Tab.tsx b/client/src/core/client/ui/components/v2/Tabs/Tab.tsx
@@ -1,12 +1,9 @@
-import { Localized } from "@fluent/react/compat";
 import cn from "classnames";
 import React from "react";
 
 import BaseButton from "coral-ui/components/v2/BaseButton";
 import { withStyles } from "coral-ui/hocs";
 
-import AriaInfo from "../AriaInfo";
-
 import styles from "./Tab.css";
 
 export interface TabProps {
@@ -103,14 +100,7 @@ class Tab extends React.Component<TabProps> {
           title={title}
           onClick={this.handleTabClick}
         >
-          <>
-            <AriaInfo>
-              <Localized id="ui-tabAriaPrefix">
-                <span>Tab:</span>
-              </Localized>
-            </AriaInfo>
-            {children}
-          </>
+          {children}
         </BaseButton>
       </li>
     );

diff --git a/client/src/core/client/ui/components/v2/Tabs/__snapshots__/TabBar.spec.tsx.snap b/client/src/core/client/ui/components/v2/Tabs/__snapshots__/TabBar.spec.tsx.snap
@@ -23,13 +23,6 @@ exports[`sets initial tab as active 1`] = `
       role="tab"
       type="button"
     >
-      <div
-        className="AriaInfo-root"
-      >
-        <span>
-          Tab:
-        </span>
-      </div>
       One
     </button>
   </li>
@@ -51,13 +44,6 @@ exports[`sets initial tab as active 1`] = `
       role="tab"
       type="button"
     >
-      <div
-        className="AriaInfo-root"
-      >
-        <span>
-          Tab:
-        </span>
-      </div>
       Two
     </button>
   </li>
@@ -79,13 +65,6 @@ exports[`sets initial tab as active 1`] = `
       role="tab"
       type="button"
     >
-      <div
-        className="AriaInfo-root"
-      >
-        <span>
-          Tab:
-        </span>
-      </div>
       Three
     </button>
   </li>