Skip to content

Commit

Permalink
feat(core): upgrade to jQuery 3.6 and jQuery-UI 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
ghiscoding committed Jun 13, 2022
1 parent 1eb7e2b commit 7e7f24c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 24 deletions.
14 changes: 1 addition & 13 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@
depTypeList: ["peerDependencies"],
enabled: false,
},
{
packageNames: ["jquery"],
allowedVersions: "3.5.1",
},
{
packageNames: ["jquery-ui"],
allowedVersions: "1.12.1",
},
{
packageNames: ["jquery-ui-dist"],
allowedVersions: "1.12.1",
},
// allow Node14/npm8 until its EOL June 2023
{
packageNames: ["node"],
Expand All @@ -33,6 +21,6 @@
allowedVersions: "6.14.13",
},
],
schedule: ["on Friday", "every weekend"],
schedule: ["on Friday"],
ignoreDeps: ["typescript"],
}
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@
"dequal": "^2.0.2",
"dompurify": "^2.3.8",
"font-awesome": "^4.7.0",
"jquery": "^3.5.1",
"jquery-ui-dist": "^1.12.1",
"jquery": "^3.6.0",
"moment-mini": "^2.24.0",
"rxjs": "^7.5.5"
},
Expand Down
4 changes: 2 additions & 2 deletions test/cypress/e2e/example16.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('Example 16: Grid State & Presets using Local Storage', { retries: 1 },
.children('.slick-header-column:nth(3)')
.should('contain', 'Duration')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('#grid16')
.find('.slick-header-columns')
Expand All @@ -96,7 +96,7 @@ describe('Example 16: Grid State & Presets using Local Storage', { retries: 1 },
cy.get('.slick-header-columns')
.children('.slick-header-column:nth(5)')
.trigger('mousemove', 'bottomLeft')
.trigger('mouseup', 'bottomLeft', { force: true });
.trigger('mouseup', 'bottomLeft', { which: 1, force: true });
});

it('should hide the "Start" column from the Column Picker', () => {
Expand Down
10 changes: 5 additions & 5 deletions test/cypress/e2e/example17.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
cy.get('@moveIconTask3').should('have.length', 1);

cy.get('@moveIconTask3')
.trigger('mousedown', { button: 0, force: true })
.trigger('mousedown', { which: 1, force: true })
.trigger('mousemove', 'bottomRight');

cy.get('@moveIconTask1')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('@moveIconTask2').trigger('mouseover', { force: true });

Expand Down Expand Up @@ -84,12 +84,12 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
cy.get('@moveIconTask3').should('have.length', 1);

cy.get('@moveIconTask3')
.trigger('mousedown', { button: 0, force: true })
.trigger('mousedown', { which: 1, force: true })
.trigger('mousemove', 'bottomRight');

cy.get('@moveIconTask5')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('.slick-viewport-top.slick-viewport-left')
.scrollTo('top');
Expand Down Expand Up @@ -119,7 +119,7 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
.children('.slick-header-column:nth(6)')
.should('contain', 'Finish')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('#grid17')
.find('.slick-header-columns')
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/example19.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe('Example 19 - Draggable Grouping & Aggregators', { retries: 1 }, () =>
cy.get('.slick-dropped-grouping:nth(1) div')
.contains('Effort-Driven')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
});

it('should expect the grouping to be swapped as well in the grid', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/example33.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('Example 33 - Regular & Custom Tooltips', { retries: 1 }, () => {

cy.get('.slick-draggable-dropbox-toggle-placeholder')
.trigger('mousemove', 'center')
.trigger('mouseup', 'center', { force: true });
.trigger('mouseup', 'center', { which: 1, force: true });

cy.get('.slick-group-toggle-all')
.click();
Expand Down

0 comments on commit 7e7f24c

Please sign in to comment.