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
- finally found how to upgrade both jQuery/jQueryUI and get all Cypress E2E tests pass
  • Loading branch information
ghiscoding committed Jun 8, 2022
1 parent 7f603b0 commit 84b09dc
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 62 deletions.
12 changes: 0 additions & 12 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,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 Down
2 changes: 1 addition & 1 deletion examples/webpack-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@slickgrid-universal/vanilla-force-bundle": "workspace:*",
"bulma": "^0.9.4",
"dompurify": "^2.3.8",
"jquery": "^3.5.1",
"jquery": "^3.6.0",
"moment-mini": "^2.24.0",
"rxjs": "^7.5.5",
"whatwg-fetch": "^3.6.2"
Expand Down
7 changes: 0 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@
"ts-jest": "^28.0.4",
"typescript": "^4.7.3"
},
"pnpm": {
"overrides": {
"jquery": "3.5.1",
"jquery-ui": "1.12.1",
"jquery-ui-dist": "1.12.1"
}
},
"packageManager": "pnpm@7.1.9",
"engines": {
"node": ">=14.17.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
"dequal": "^2.0.2",
"dompurify": "^2.3.8",
"flatpickr": "^4.6.13",
"jquery": "^3.5.1",
"jquery-ui": "^1.12.1",
"jquery-ui-dist": "^1.12.1",
"jquery": "^3.6.0",
"jquery-ui": "^1.13.1",
"jquery-ui-dist": "^1.13.1",
"moment-mini": "^2.24.0",
"multiple-select-modified": "^1.3.17",
"slickgrid": "^2.4.44",
Expand Down
4 changes: 2 additions & 2 deletions packages/vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"@slickgrid-universal/utils": "workspace:*",
"dequal": "^2.0.2",
"flatpickr": "^4.6.13",
"jquery": "^3.5.1",
"jquery-ui": "^1.12.1",
"jquery": "^3.6.0",
"jquery-ui": "^1.13.1",
"slickgrid": "^2.4.44",
"whatwg-fetch": "^3.6.2"
},
Expand Down
55 changes: 27 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/cypress/integration/example03.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe('Example 03 - Draggable Grouping', { 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
12 changes: 6 additions & 6 deletions test/cypress/integration/example07.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ describe('Example 07 - 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('input[type="checkbox"]:checked')
.should('have.length', 4);
Expand Down Expand Up @@ -130,12 +130,12 @@ describe('Example 07 - 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 @@ -310,7 +310,7 @@ describe('Example 07 - Row Move & Checkbox Selector Selector Plugins', { retries
.children('.slick-header-column:nth(7)')
.should('contain', 'Finish')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('.grid7')
.find('.slick-header-columns')
Expand Down Expand Up @@ -733,7 +733,7 @@ describe('Example 07 - Row Move & Checkbox Selector Selector Plugins', { retries
.children('.slick-header-column:nth(8)')
.should('contain', 'Completed')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('.grid7')
.find('.slick-header-columns')
Expand Down
4 changes: 2 additions & 2 deletions test/cypress/integration/example18.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ describe('Example 18 - Real-Time Trading Platform', { retries: 1 }, () => {
it('should Group by 1st column "Currency" and expect 2 groups with Totals when collapsed', () => {
cy.get('.slick-column-name')
.first()
.trigger('mousedown', { button: 1, force: true })
.trigger('mousedown', { which: 1, force: true })

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 84b09dc

Please sign in to comment.