fix testcafe test and POM

Author: Tucchhaa

e2e/testcafe-devextreme/tests/scheduler/common/appointments/legacyEditing.ts

@@ -17,15 +17,15 @@ test('Should correctly update appointment if dataSource is a simple array', asyn
   const scheduler = new Scheduler(SCHEDULER_SELECTOR);
   const appointment = scheduler.getAppointment(INITIAL_APPOINTMENT_TITLE);
   const updatedAppointment = scheduler.getAppointment(UPDATED_APPOINTMENT_TITLE);
-  const { appointmentPopup } = scheduler;
+  const { legacyAppointmentPopup: appointmentPopup } = scheduler;
 
   await t
     .doubleClick(appointment.element, CLICK_OPTIONS)
-    .click(appointmentPopup.textEditor.element)
-    .typeText(appointmentPopup.textEditor.element, ADDITIONAL_TITLE_TEXT)
-    .expect(appointmentPopup.textEditor.element.value)
+    .click(appointmentPopup.subjectElement)
+    .typeText(appointmentPopup.subjectElement, ADDITIONAL_TITLE_TEXT)
+    .expect(appointmentPopup.subjectElement.value)
     .eql(UPDATED_APPOINTMENT_TITLE)
-    .click(appointmentPopup.saveButton.element)
+    .click(appointmentPopup.doneButton)
     .expect(updatedAppointment.element.exists)
     .ok();
 }).before(async () => createWidget('dxScheduler', {
@@ -48,15 +48,15 @@ test('Should correctly update appointment if dataSource is a Store with key arra
   const scheduler = new Scheduler(SCHEDULER_SELECTOR);
   const appointment = scheduler.getAppointment(INITIAL_APPOINTMENT_TITLE);
   const updatedAppointment = scheduler.getAppointment(UPDATED_APPOINTMENT_TITLE);
-  const { appointmentPopup } = scheduler;
+  const { legacyAppointmentPopup: appointmentPopup } = scheduler;
 
   await t
     .doubleClick(appointment.element, CLICK_OPTIONS)
-    .click(appointmentPopup.textEditor.element)
-    .typeText(appointmentPopup.textEditor.element, ADDITIONAL_TITLE_TEXT)
-    .expect(appointmentPopup.textEditor.element.value)
+    .click(appointmentPopup.subjectElement)
+    .typeText(appointmentPopup.subjectElement, ADDITIONAL_TITLE_TEXT)
+    .expect(appointmentPopup.subjectElement.value)
     .eql(UPDATED_APPOINTMENT_TITLE)
-    .click(appointmentPopup.saveButton.element)
+    .click(appointmentPopup.doneButton)
     .expect(updatedAppointment.element.exists)
     .ok();
 }).before(async () => {

packages/testcafe-models/scheduler/appointment/popup.ts

@@ -8,7 +8,7 @@ import DateBox from '../../dateBox';
 import Button from '../../button';
 
 export const SELECTORS = {
-  appointmentPopup: `.dx-scheduler-appointment-popup.dx-overlay-wrapper`,
+  appointmentPopup: `.dx-scheduler-appointment-popup.dx-popup.dx-widget`,
   form: `.dx-scheduler-form`,
   doneButton: `.dx-popup-done.dx-button.dx-widget`,
   cancelButton: `.dx-popup-cancel.dx-button.dx-widget`,
@@ -27,8 +27,8 @@ export const SELECTORS = {
 export default class AppointmentPopup {
   popup: Popup = new Popup(SELECTORS.appointmentPopup);
 
-  saveButton: Button = new Button(this.popup.topToolbar.find(SELECTORS.doneButton));
-  cancelButton: Button = new Button(this.popup.topToolbar.find(SELECTORS.cancelButton));
+  saveButton: Button = new Button(this.popup.getToolbar().find(SELECTORS.doneButton));
+  cancelButton: Button = new Button(this.popup.getToolbar().find(SELECTORS.cancelButton));
 
   form: Form = new Form(this.popup.content.find(SELECTORS.form));