tests

moira-alert · Dec 10, 2024 · 615e8e4 · 615e8e4
1 parent ea33731
commit 615e8e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/playwright/e2eTests/teamsOperations.spec.ts b/playwright/e2eTests/teamsOperations.spec.ts
@@ -35,6 +35,7 @@ test("Add team", async ({ page, teamName, teamDescription, teamsPage }) => {
 });
 
 test("Edit team description", async ({ page, teamDescription, teamsPage, teamName }) => {
+    await teamsPage.teamCardKebab.click();
     await teamsPage.editTeamButton.click();
     await expect(teamsPage.nameInput("Team name")).toHaveValue(teamName);
     await expect(teamsPage.teamDescription).toContainText(teamDescription);
@@ -64,7 +65,8 @@ test("Delete user", async ({ page, userName, teamsPage }) => {
 });
 
 test("Delete team", async ({ page, teamName, teamsPage }) => {
-    await teamsPage.deleteTeamButton(teamName + " changed").click();
+    await teamsPage.teamCardKebab.click();
+    await teamsPage.deleteTeamButton.click();
     await page.getByRole("button", { name: "Confirm" }).click();
     await expect(
         page.locator(`:text("${teamName}"):right-of(span[data-tid='Delete team ${teamName}'])`)

diff --git a/playwright/e2eTests/triggerOperations.spec.ts b/playwright/e2eTests/triggerOperations.spec.ts
@@ -79,8 +79,7 @@ test("Set trigger maintenance for all intervals", async ({ triggerName, page })
 
             const requestBody = JSON.parse(setMaintenanceRequest.postData() || "{}");
             expect(requestBody).not.toBeNull();
-            expect(requestBody.trigger).toEqual(expectedTriggerTime);
-
+            expect(Math.abs(requestBody.trigger - expectedTriggerTime)).toBeLessThanOrEqual(1);
             if (maintenance === Maintenance.off) {
                 await expect(page.getByText("Maintenance")).toBeVisible();
             } else

diff --git a/playwright/pages/teams.page.ts b/playwright/pages/teams.page.ts
@@ -6,23 +6,25 @@ export class TeamsPage {
     readonly nameInput: (testId: string) => Locator;
     readonly teamDescription: Locator;
     readonly previewButton: Locator;
+    readonly teamCardKebab: Locator;
     readonly editTeamButton: Locator;
     readonly showUsersButton: Locator;
     readonly addUserModalButton: Locator;
     readonly deleteUserButton: (userName: string) => Locator;
-    readonly deleteTeamButton: (teamName: string) => Locator;
+    readonly deleteTeamButton: Locator;
 
     constructor(page: Page) {
         this.page = page;
         this.addTeamButton = page.getByText("Add team");
         this.nameInput = (testId) => page.locator(`label[data-tid='${testId}'] > span > input`);
         this.teamDescription = page.locator("[data-tid='Team description']");
         this.previewButton = page.getByText("Preview");
-        this.editTeamButton = page.getByRole("button", { name: "Edit Team" });
+        this.teamCardKebab = page.locator("[data-tid='Team card kebab']");
+        this.editTeamButton = page.getByRole("button", { name: "Edit" });
         this.showUsersButton = page.getByText("Show users");
         this.addUserModalButton = page.locator("[data-tid='Add user modal']");
         this.deleteUserButton = (userName) => page.locator(`[data-tid="Delete user ${userName}"]`);
-        this.deleteTeamButton = (teamName) => page.locator(`[data-tid="Delete team ${teamName}"]`);
+        this.deleteTeamButton = page.getByRole("button", { name: "Delete" });
     }
 
     async gotoTeamsPage(): Promise<void> {

diff --git a/src/Components/Teams/TeamCard/TeamCard.tsx b/src/Components/Teams/TeamCard/TeamCard.tsx
@@ -79,7 +79,11 @@ export const TeamCard: FC<ITeamCardProps> = ({ team, isDeleting, onOpenDelete, o
                 className={cn("team-card")}
             >
                 <Flexbox gap={5}>
-                    <Kebab className={cn("team-card-kebab")} size="large">
+                    <Kebab
+                        data-tid="Team card kebab"
+                        className={cn("team-card-kebab")}
+                        size="large"
+                    >
                         <MenuItem icon={<EditIcon />} onClick={openModal}>
                             Edit
                         </MenuItem>
@@ -100,6 +104,7 @@ export const TeamCard: FC<ITeamCardProps> = ({ team, isDeleting, onOpenDelete, o
                                         onClick={handleConfirm}
                                         use={"primary"}
                                         width={100}
+                                        data-tid={`Delete team ${name}`}
                                     >
                                         Confirm
                                     </Button>

diff --git a/src/hooks/themes/useThemeFeature.ts b/src/hooks/themes/useThemeFeature.ts
@@ -29,7 +29,7 @@ export const useThemeFeature = () => {
         const resultTheme = isSystemTheme ? browserTheme : localValue;
 
         document.body.dataset.theme = resultTheme;
-    }, [localValue]);
+    }, [localValue, isBrowserDarkThemeEnabled]);
 
     return useFeatureFlag<EThemesNames>({ ...ThemeFlag, defaultValue: localValue });
 };