Skip to content

Scheduler - Migrate popup resources and save/cancel tests to isolated environment #33786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bit-byte0 wants to merge 2 commits into
base: 26_1
Choose a base branch
from
+355 −369
Open

Scheduler - Migrate popup resources and save/cancel tests to isolated environment #33786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8752d8c
test(scheduler): migrate popup resource and save/cancel tests to isol…
bit-byte0 Jun 2, 2026
5ce1666
test(scheduler): dispose resourceManager in popup test cleanup
bit-byte0 Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/devextreme/js/__internal/scheduler/__tests__/__mock__/create_appointment_popup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
AppointmentDataAccessor,
} from '../../utils/data_accessor/appointment_data_accessor';
import type { IFieldExpr } from '../../utils/data_accessor/types';
import type { ResourceConfig } from '../../utils/loader/types';
import {
ResourceManager,
} from '../../utils/resource_manager/resource_manager';
Expand Down Expand Up @@ -64,6 +65,7 @@ interface CreateAppointmentPopupOptions {
firstDayOfWeek?: number;
startDayHour?: number;
timeZone?: string;
resources?: ResourceConfig[];
onAppointmentFormOpening?: (...args: unknown[]) => void;
onSave?: jest.Mock<(appointment: Record<string, unknown>) => PromiseLike<unknown>>;
title?: string;
Expand Down Expand Up @@ -106,10 +108,16 @@ export const createAppointmentPopup = async (
document.body.appendChild(container);

const dataAccessors = new AppointmentDataAccessor(DEFAULT_FIELDS, false);
const resourceManager = new ResourceManager([]);
const resourceManager = new ResourceManager(options.resources ?? []);
const timeZoneCalculator = createTimeZoneCalculator(options.timeZone ?? NO_TIMEZONE);
const editing = { ...DEFAULT_EDITING, ...options.editing };

if (options.resources?.length) {
await Promise.all(
resourceManager.resources.map((r) => r.load()),
);
}
Comment thread
bit-byte0 marked this conversation as resolved.

const addAppointment = options.addAppointment
?? jest.fn(resolvedDeferred);
const updateAppointment = options.updateAppointment
Expand Down Expand Up @@ -187,6 +195,7 @@ export const createAppointmentPopup = async (

const dispose = (): void => {
popup.dispose();
resourceManager.dispose();
container.remove();
};

Expand Down
Loading
Loading