fix: update test cases to match new UI labels
- Update RepeatEvent.test.tsx to use correct selectors and text matching - Update EventDisplay.test.tsx to use 'Notification' instead of 'Alarm' - Update EventModal.test.tsx to use new label names and fix description input tests - Update Calendar.test.tsx to use new placeholder text 'Start typing a name or email' - Fix EventDisplay.tsx to use 'Notification' label consistently
This commit is contained in:
@@ -217,7 +217,7 @@ describe("calendar Availability search", () => {
|
|||||||
|
|
||||||
renderWithProviders(<CalendarTestWrapper />, preloadedState);
|
renderWithProviders(<CalendarTestWrapper />, preloadedState);
|
||||||
|
|
||||||
const input = screen.getByPlaceholderText(/search user/i);
|
const input = screen.getByPlaceholderText(/start typing a name or email/i);
|
||||||
userEvent.type(input, "New");
|
userEvent.type(input, "New");
|
||||||
|
|
||||||
const option = await screen.findByText("New User");
|
const option = await screen.findByText("New User");
|
||||||
@@ -242,7 +242,7 @@ describe("calendar Availability search", () => {
|
|||||||
});
|
});
|
||||||
renderWithProviders(<CalendarTestWrapper />, preloadedState);
|
renderWithProviders(<CalendarTestWrapper />, preloadedState);
|
||||||
|
|
||||||
const input = screen.getByPlaceholderText(/search user/i);
|
const input = screen.getByPlaceholderText(/start typing a name or email/i);
|
||||||
userEvent.type(input, "Alice");
|
userEvent.type(input, "Alice");
|
||||||
|
|
||||||
const option = await screen.findByText("Alice");
|
const option = await screen.findByText("Alice");
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ async function setupEventPopover(
|
|||||||
fireEvent.click(showMoreButton);
|
fireEvent.click(showMoreButton);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const select = screen.getByLabelText(/repetition/i);
|
const select = screen.getByLabelText(/repeat/i);
|
||||||
userEvent.click(select);
|
userEvent.click(select);
|
||||||
|
|
||||||
return jest.spyOn(apiUtils, "api");
|
return jest.spyOn(apiUtils, "api");
|
||||||
@@ -155,13 +155,15 @@ async function expectRRule(expected: any) {
|
|||||||
describe("RepeatEvent", () => {
|
describe("RepeatEvent", () => {
|
||||||
it("renders with no repetition by default", () => {
|
it("renders with no repetition by default", () => {
|
||||||
setupRepeatEvent();
|
setupRepeatEvent();
|
||||||
expect(screen.getByLabelText(/repetition/i)).toBeInTheDocument();
|
expect(screen.getByText(/Repeat every/i)).toBeInTheDocument();
|
||||||
expect(screen.queryByText(/daily/i)).not.toBeInTheDocument();
|
// Check that the select exists and has default value
|
||||||
|
const select = screen.getByRole("combobox");
|
||||||
|
expect(select).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("allows selecting repetition frequency", async () => {
|
it("allows selecting repetition frequency", async () => {
|
||||||
const { setRepetition } = setupRepeatEvent();
|
const { setRepetition } = setupRepeatEvent();
|
||||||
const select = screen.getByLabelText(/repetition/i);
|
const select = screen.getByRole("combobox");
|
||||||
act(() => {
|
act(() => {
|
||||||
userEvent.click(select);
|
userEvent.click(select);
|
||||||
});
|
});
|
||||||
@@ -176,7 +178,7 @@ describe("RepeatEvent", () => {
|
|||||||
|
|
||||||
it("renders interval input when frequency is selected", () => {
|
it("renders interval input when frequency is selected", () => {
|
||||||
setupRepeatEvent({ freq: "daily", interval: 2 });
|
setupRepeatEvent({ freq: "daily", interval: 2 });
|
||||||
expect(screen.getByText(/interval/i)).toBeInTheDocument();
|
expect(screen.getByText(/Repeat every/i)).toBeInTheDocument();
|
||||||
expect(screen.getByDisplayValue("2")).toBeInTheDocument();
|
expect(screen.getByDisplayValue("2")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1039,9 +1039,9 @@ describe("Event Full Display", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByLabelText(/Alarm/i)).toBeInTheDocument();
|
expect(screen.getByLabelText(/Notification/i)).toBeInTheDocument();
|
||||||
expect(screen.getByLabelText(/Repetition/i)).toBeInTheDocument();
|
expect(screen.getByLabelText(/Repeat/i)).toBeInTheDocument();
|
||||||
expect(screen.getByLabelText(/Visibility/i)).toBeInTheDocument();
|
expect(screen.getByText(/Visible to/i)).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
fireEvent.click(screen.getByText("Show Less"));
|
fireEvent.click(screen.getByText("Show Less"));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -116,10 +116,9 @@ describe("EventPopover", () => {
|
|||||||
const titleInput = screen.getByRole("textbox", { name: /title/i });
|
const titleInput = screen.getByRole("textbox", { name: /title/i });
|
||||||
expect(titleInput).toBeInTheDocument();
|
expect(titleInput).toBeInTheDocument();
|
||||||
|
|
||||||
const descriptionInput = screen.getByRole("textbox", {
|
// Description input is only visible after clicking "Add description" button
|
||||||
name: /description/i,
|
const addDescriptionButton = screen.getByText("Add description");
|
||||||
});
|
expect(addDescriptionButton).toBeInTheDocument();
|
||||||
expect(descriptionInput).toBeInTheDocument();
|
|
||||||
|
|
||||||
const calendarSelect = screen.getByRole("combobox", { name: /calendar/i });
|
const calendarSelect = screen.getByRole("combobox", { name: /calendar/i });
|
||||||
expect(calendarSelect).toBeInTheDocument();
|
expect(calendarSelect).toBeInTheDocument();
|
||||||
@@ -135,9 +134,9 @@ describe("EventPopover", () => {
|
|||||||
|
|
||||||
// Extended labels appear
|
// Extended labels appear
|
||||||
expect(screen.getAllByText("Repeat")).toHaveLength(1);
|
expect(screen.getAllByText("Repeat")).toHaveLength(1);
|
||||||
expect(screen.getAllByText("Alarm")).toHaveLength(1);
|
expect(screen.getAllByText("Notification")).toHaveLength(1);
|
||||||
expect(screen.getAllByText("Visibility")).toHaveLength(1);
|
expect(screen.getAllByText("Visible to")).toHaveLength(1);
|
||||||
expect(screen.getAllByText("Show as")).toHaveLength(1);
|
expect(screen.getAllByText("Show me as")).toHaveLength(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("fills start from selectedRange", () => {
|
it("fills start from selectedRange", () => {
|
||||||
@@ -160,6 +159,9 @@ describe("EventPopover", () => {
|
|||||||
});
|
});
|
||||||
expect(screen.getByLabelText("Title")).toHaveValue("My Event");
|
expect(screen.getByLabelText("Title")).toHaveValue("My Event");
|
||||||
|
|
||||||
|
// Click "Add description" button first
|
||||||
|
fireEvent.click(screen.getByText("Add description"));
|
||||||
|
|
||||||
fireEvent.change(screen.getByLabelText("Description"), {
|
fireEvent.change(screen.getByLabelText("Description"), {
|
||||||
target: { value: "Event Description" },
|
target: { value: "Event Description" },
|
||||||
});
|
});
|
||||||
@@ -190,7 +192,7 @@ describe("EventPopover", () => {
|
|||||||
fireEvent.change(screen.getByLabelText("Title"), {
|
fireEvent.change(screen.getByLabelText("Title"), {
|
||||||
target: { value: "newEvent" },
|
target: { value: "newEvent" },
|
||||||
});
|
});
|
||||||
const select = screen.getByLabelText("Search user");
|
const select = screen.getByLabelText("Start typing a name or email");
|
||||||
|
|
||||||
act(() => {
|
act(() => {
|
||||||
select.focus();
|
select.focus();
|
||||||
@@ -275,6 +277,8 @@ describe("EventPopover", () => {
|
|||||||
target: { value: newEvent.end.split("T")[0] },
|
target: { value: newEvent.end.split("T")[0] },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Click "Add description" button first
|
||||||
|
fireEvent.click(screen.getByText("Add description"));
|
||||||
fireEvent.change(screen.getByLabelText("Description"), {
|
fireEvent.change(screen.getByLabelText("Description"), {
|
||||||
target: { value: newEvent.description },
|
target: { value: newEvent.description },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import CalendarPopover from "./CalendarModal";
|
|||||||
import { Calendars } from "../../features/Calendars/CalendarTypes";
|
import { Calendars } from "../../features/Calendars/CalendarTypes";
|
||||||
import MoreVertIcon from "@mui/icons-material/MoreVert";
|
import MoreVertIcon from "@mui/icons-material/MoreVert";
|
||||||
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
|
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
|
||||||
import CalendarSearch from "./CalendarSearch";
|
|
||||||
import IconButton from "@mui/material/IconButton";
|
import IconButton from "@mui/material/IconButton";
|
||||||
import Checkbox from "@mui/material/Checkbox";
|
import Checkbox from "@mui/material/Checkbox";
|
||||||
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
|
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
|
||||||
|
|||||||
@@ -47,7 +47,9 @@ const checkIfCurrentWeekOrDay = (): boolean => {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const nowIndicator = document.querySelector(".fc-timegrid-now-indicator-arrow");
|
const nowIndicator = document.querySelector(
|
||||||
|
".fc-timegrid-now-indicator-arrow"
|
||||||
|
);
|
||||||
return !!nowIndicator;
|
return !!nowIndicator;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -110,9 +110,7 @@ export default function RepeatEvent({
|
|||||||
key={day}
|
key={day}
|
||||||
control={
|
control={
|
||||||
<Checkbox
|
<Checkbox
|
||||||
checked={
|
checked={repetition.selectedDays?.includes(day) ?? false}
|
||||||
repetition.selectedDays?.includes(day) ?? false
|
|
||||||
}
|
|
||||||
onChange={() => handleDayChange(day)}
|
onChange={() => handleDayChange(day)}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
@@ -153,11 +151,7 @@ export default function RepeatEvent({
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FormControlLabel
|
<FormControlLabel value="never" control={<Radio />} label="Never" />
|
||||||
value="never"
|
|
||||||
control={<Radio />}
|
|
||||||
label="Never"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormControlLabel
|
<FormControlLabel
|
||||||
value="after"
|
value="after"
|
||||||
|
|||||||
@@ -469,17 +469,17 @@ export default function EventDisplayModal({
|
|||||||
isOwn={isOwn}
|
isOwn={isOwn}
|
||||||
/>
|
/>
|
||||||
<FormControl fullWidth margin="dense" size="small">
|
<FormControl fullWidth margin="dense" size="small">
|
||||||
<InputLabel id="alarm">Alarm</InputLabel>
|
<InputLabel id="notification">Notification</InputLabel>
|
||||||
<Select
|
<Select
|
||||||
labelId="alarm"
|
labelId="notification"
|
||||||
label="Alarm"
|
label="Notification"
|
||||||
value={alarm}
|
value={alarm}
|
||||||
disabled={!isOwn}
|
disabled={!isOwn}
|
||||||
onChange={(e: SelectChangeEvent) =>
|
onChange={(e: SelectChangeEvent) =>
|
||||||
setAlarm(e.target.value)
|
setAlarm(e.target.value)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<MenuItem value={""}>No Alarm</MenuItem>
|
<MenuItem value={""}>No Notification</MenuItem>
|
||||||
<MenuItem value={"-PT1M"}>1 minute</MenuItem>
|
<MenuItem value={"-PT1M"}>1 minute</MenuItem>
|
||||||
<MenuItem value={"-PT5M"}>2 minutes</MenuItem>
|
<MenuItem value={"-PT5M"}>2 minutes</MenuItem>
|
||||||
<MenuItem value={"-PT10M"}>10 minutes</MenuItem>
|
<MenuItem value={"-PT10M"}>10 minutes</MenuItem>
|
||||||
|
|||||||
@@ -134,7 +134,9 @@ function EventPopover({
|
|||||||
|
|
||||||
const timezoneList = useMemo(() => {
|
const timezoneList = useMemo(() => {
|
||||||
const zones = Object.keys(TIMEZONES.zones).sort();
|
const zones = Object.keys(TIMEZONES.zones).sort();
|
||||||
const browserTz = resolveTimezone(Intl.DateTimeFormat().resolvedOptions().timeZone);
|
const browserTz = resolveTimezone(
|
||||||
|
Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||||
|
);
|
||||||
|
|
||||||
const getTimezoneOffset = (tzName: string): string => {
|
const getTimezoneOffset = (tzName: string): string => {
|
||||||
const resolvedTz = resolveTimezone(tzName);
|
const resolvedTz = resolveTimezone(tzName);
|
||||||
@@ -149,9 +151,9 @@ function EventPopover({
|
|||||||
const minutes = parseInt(offset.slice(3));
|
const minutes = parseInt(offset.slice(3));
|
||||||
|
|
||||||
if (minutes === 0) {
|
if (minutes === 0) {
|
||||||
return `UTC${hours >= 0 ? '+' : ''}${hours}`;
|
return `UTC${hours >= 0 ? "+" : ""}${hours}`;
|
||||||
}
|
}
|
||||||
return `UTC${hours >= 0 ? '+' : ''}${hours}:${Math.abs(minutes).toString().padStart(2, '0')}`;
|
return `UTC${hours >= 0 ? "+" : ""}${hours}:${Math.abs(minutes).toString().padStart(2, "0")}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
return { zones, browserTz, getTimezoneOffset };
|
return { zones, browserTz, getTimezoneOffset };
|
||||||
@@ -595,12 +597,12 @@ function EventPopover({
|
|||||||
}}
|
}}
|
||||||
size="small"
|
size="small"
|
||||||
>
|
>
|
||||||
<ToggleButton value="PUBLIC" sx={{ width: '140px' }}>
|
<ToggleButton value="PUBLIC" sx={{ width: "140px" }}>
|
||||||
<PublicIcon sx={{ mr: 1, fontSize: '16px' }} />
|
<PublicIcon sx={{ mr: 1, fontSize: "16px" }} />
|
||||||
All
|
All
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
<ToggleButton value="PRIVATE" sx={{ width: '140px' }}>
|
<ToggleButton value="PRIVATE" sx={{ width: "140px" }}>
|
||||||
<LockIcon sx={{ mr: 1, fontSize: '16px' }} />
|
<LockIcon sx={{ mr: 1, fontSize: "16px" }} />
|
||||||
Participants
|
Participants
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</ToggleButtonGroup>
|
</ToggleButtonGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user