Skip to content

Commit df153ad

Browse files
authored
Merge pull request #7269 from microting/copilot/fix-drag-and-drop-tests
Fix drag and drop Cypress tests to use standard mouse event pattern
2 parents 5badeca + da6d074 commit df153ad

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed

eform-client/cypress/e2e/NavigationMenu.page.ts

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ export class NavigationMenuPage {
2626
const dragHandle = cy.get(`#dragHandle0_${templateIndex}`);
2727
const target = cy.get('mat-card > mat-accordion').first();
2828

29-
dragHandle.trigger('mousedown', { which: 1 });
30-
target.trigger('mousemove', 'top').trigger('mouseup', { force: true });
29+
dragHandle
30+
.trigger('mousedown', { button: 0, bubbles: true })
31+
.trigger('mousemove', { pageX: 10, pageY: 0 });
32+
33+
target
34+
.trigger('mousemove', { position: 'top' })
35+
.trigger('mouseup', { button: 0, bubbles: true });
3136
}
3237

3338
public createCustomLink(data: { securityGroups?: string[]; link: string; translations: string[] }) {
@@ -183,8 +188,13 @@ export class NavigationMenuPage {
183188
const dragHandle = cy.get(`#dragHandle0_${templateIndex}`);
184189
const dropdownBody = cy.get('#menuItems').eq(dropdownIndex).find('#dropdownBody');
185190

186-
dragHandle.trigger('mousedown', { which: 1 });
187-
dropdownBody.trigger('mousemove').trigger('mouseup', { force: true });
191+
dragHandle
192+
.trigger('mousedown', { button: 0, bubbles: true })
193+
.trigger('mousemove', { pageX: 10, pageY: 0 });
194+
195+
dropdownBody
196+
.trigger('mousemove', { position: 'center' })
197+
.trigger('mouseup', { button: 0, bubbles: true });
188198

189199
cy.wait(500);
190200
this.collapseTemplates(0);
@@ -218,9 +228,14 @@ export class NavigationMenuPage {
218228
fromHandle.scrollIntoView();
219229
cy.wait(2000);
220230

221-
fromHandle.trigger('mousedown', { which: 1, force: true });
222-
toHandle.trigger('mousemove', { force: true });
223-
toHandle.trigger('mouseup', { force: true });
231+
fromHandle
232+
.trigger('mousedown', { button: 0, bubbles: true })
233+
.trigger('mousemove', { pageX: 10, pageY: 0 });
234+
235+
toHandle
236+
.trigger('mousemove', { position: 'center' })
237+
.trigger('mouseup', { button: 0, bubbles: true });
238+
224239
cy.wait(2000);
225240
}
226241

eform-client/cypress/e2e/c/subheader.spec.cy.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ describe('Subheader test', function () {
1515
cy.wait('@loadMenu', { timeout: 30000 });
1616

1717
cy.get('#mat-expansion-panel-header-2 > .mat-expansion-indicator').click();
18-
cy.get('#dragHandle0_0').trigger('mousedown', {which: 1});
19-
cy.get('mat-card > mat-accordion').trigger('mousemove', 'top').trigger('mouseup', {force: true});
18+
cy.get('#dragHandle0_0')
19+
.trigger('mousedown', { button: 0, bubbles: true })
20+
.trigger('mousemove', { pageX: 10, pageY: 0 });
21+
cy.get('mat-card > mat-accordion')
22+
.trigger('mousemove', { position: 'top' })
23+
.trigger('mouseup', { button: 0, bubbles: true });
2024
cy.get('#mat-expansion-panel-header-2 > .mat-expansion-indicator').click();
2125

2226
cy.intercept('POST', '**/api/navigation-menu').as('saveMenu');

0 commit comments

Comments
 (0)