Skip to content

Scheduler - Migrate popup state and editor tests to isolated environment #33670

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

Merged
aleksei-semikozov merged 8 commits into from
May 22, 2026
Merged

Scheduler - Migrate popup state and editor tests to isolated environment #33670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4e6bc0
Scheduler - Migrate popup state test to isolated environment
aleksei-semikozov May 21, 2026
426d4e3
Scheduler - Migrate popup allDay switch tests to isolated environment
aleksei-semikozov May 21, 2026
64e20eb
Scheduler - Migrate popup startDate and endDate editor tests to isola…
aleksei-semikozov May 21, 2026
ac7bf18
Scheduler - Migrate popup firstDayOfWeek tests to isolated environment
aleksei-semikozov May 21, 2026
31d42ac
Scheduler - Drop reopen pattern and simplify popup tests
aleksei-semikozov May 21, 2026
3770968
Scheduler - Drop pass-through propagation tests and trim allDay asser…
aleksei-semikozov May 21, 2026
6a1cdf2
Scheduler - Add popup firstDayOfWeek propagation test
aleksei-semikozov May 22, 2026
44aa4ec
Scheduler - Extend firstDayOfWeek propagation test with recurrence we…
aleksei-semikozov May 22, 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
34 changes: 20 additions & 14 deletions 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 @@ -4,12 +4,12 @@ import $ from '@js/core/renderer';
// eslint-disable-next-line devextreme-custom/no-deferred
import { Deferred } from '@js/core/utils/deferred';

import { mockTimeZoneCalculator } from '../../__mock__/timezone_calculator.mock';
import { AppointmentForm } from '../../appointment_popup/form';
import {
APPOINTMENT_POPUP_CLASS,
AppointmentPopup,
} from '../../appointment_popup/popup';
import { createTimeZoneCalculator } from '../../r1/timezone_calculator/utils';
import {
AppointmentDataAccessor,
} from '../../utils/data_accessor/appointment_data_accessor';
Expand Down Expand Up @@ -41,6 +41,8 @@ const DEFAULT_EDITING = {
allowDragging: true,
};

const NO_TIMEZONE = '';

const DEFAULT_APPOINTMENT = {
text: 'Test Appointment',
startDate: new Date(2021, 3, 26, 9, 30),
Expand All @@ -61,6 +63,7 @@ interface CreateAppointmentPopupOptions {
editing?: Record<string, unknown>;
firstDayOfWeek?: number;
startDayHour?: number;
timeZone?: string;
onAppointmentFormOpening?: (...args: unknown[]) => void;
onSave?: jest.Mock<(appointment: Record<string, unknown>) => PromiseLike<unknown>>;
title?: string;
Expand Down Expand Up @@ -104,7 +107,7 @@ export const createAppointmentPopup = async (

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

const addAppointment = options.addAppointment
Expand Down Expand Up @@ -163,21 +166,24 @@ export const createAppointmentPopup = async (
const title = options.title ?? 'New Appointment';
const readOnly = options.readOnly ?? false;

popup.show(appointmentData, { onSave, title, readOnly });
await new Promise(process.nextTick);
const overlaySelector = `.dx-overlay-wrapper.${APPOINTMENT_POPUP_CLASS}`;

const showAndQuery = async (
data: Record<string, unknown>,
): Promise<PopupModel> => {
popup.show(data, { onSave, title, readOnly });
await new Promise(process.nextTick);

const selector = `.dx-overlay-wrapper.${APPOINTMENT_POPUP_CLASS}`;
const overlayWrapper = document.querySelector(
selector,
) as HTMLDivElement;
const wrapper = document.querySelector(overlaySelector) as HTMLDivElement;

if (!overlayWrapper) {
throw new Error(
'AppointmentPopup overlay wrapper not found in DOM',
);
}
if (!wrapper) {
throw new Error('AppointmentPopup overlay wrapper not found in DOM');
}

return new PopupModel(wrapper);
};

const POM = new PopupModel(overlayWrapper);
const POM = await showAndQuery(appointmentData);

const dispose = (): void => {
popup.dispose();
Expand Down
Loading
Loading