Skip to content
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

feat: updated frontend-build & frontend-platform major versions #256

Merged
merged 15 commits into from
May 30, 2024
Merged

feat: updated frontend-build & frontend-platform major versions #256

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c405bc6
chore: bumped jest to v29
BilalQamar95 Dec 5, 2023
7fccd94
Merge branch 'master' into bilalqamar95/jest-v29-upgrade
BilalQamar95 Dec 22, 2023
8c76b5c
Merge branch 'master' into bilalqamar95/jest-v29-upgrade
BilalQamar95 Apr 4, 2024
a051d71
refactor: updated frontend-build
BilalQamar95 Apr 4, 2024
11b7e48
refactor: updated snapshots for failing tests
BilalQamar95 Apr 4, 2024
92f712d
feat: updated build and platform major versions, along with edx packages
BilalQamar95 Apr 24, 2024
59d90f5
Merge branch master into bilalqamar95/jest-v29-upgrade
BilalQamar95 May 16, 2024
1d53ef6
refactor: react-unit-test-util & hotjar major version upgrades, updat…
BilalQamar95 May 16, 2024
37bb54d
refactor: updated package-lock
BilalQamar95 May 16, 2024
506d3f6
refactor: updated version for frontend-plugin-framework
BilalQamar95 May 17, 2024
0fcaa64
fix: fixed snapshots
abdullahwaheed May 17, 2024
28da100
Merge branch master into bilalqamar95/jest-v29-upgrade
BilalQamar95 May 20, 2024
ecc4c4c
refactor: update package-lock
BilalQamar95 May 20, 2024
08050f4
Merge branch 'master' into bilalqamar95/jest-v29-upgrade
BilalQamar95 May 20, 2024
506f8f7
Merge branch master into bilalqamar95/jest-v29-upgrade
BilalQamar95 May 30, 2024
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
30,042 changes: 11,490 additions & 18,552 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "^1.1.0",
"@edx/frontend-enterprise-hotjar": "3.0.0",
"@edx/frontend-platform": "^7.1.4",
"@edx/frontend-platform": "8.0.0",
"@edx/openedx-atlas": "^0.6.0",
"@edx/react-unit-test-utils": "2.0.0",
"@edx/react-unit-test-utils": "3.0.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.2.0",
"@openedx/frontend-plugin-framework": "^1.1.2",
"@openedx/frontend-plugin-framework": "^1.2.0",
"@openedx/frontend-slot-footer": "^1.0.2",
"@openedx/paragon": "^22.2.2",
"@optimizely/react-sdk": "^2.9.2",
Expand All @@ -54,10 +54,11 @@
"history": "5.0.1",
"html-react-parser": "^1.3.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-when": "^3.6.0",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"prop-types": "^15.7.2",
"prop-types": "15.8.0",
"query-string": "7.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand All @@ -81,15 +82,15 @@
},
"devDependencies": {
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "13.1.4",
"@openedx/frontend-build": "14.0.3",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.0",
"axios-mock-adapter": "^1.20.0",
"copy-webpack-plugin": "^11.0.0",
"fetch-mock": "^9.11.0",
"husky": "^7.0.0",
"identity-obj-proxy": "^3.0.0",
"jest-expect-message": "^1.0.2",
"jest-expect-message": "^1.1.3",
"react-dev-utils": "^11.0.4",
"react-test-renderer": "^17.0.2",
"redux-mock-store": "^1.5.4",
Expand Down
2 changes: 1 addition & 1 deletion src/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`app registry subscribe: APP_INIT_ERROR. snapshot: displays an ErrorPag
exports[`app registry subscribe: APP_READY. links App to root element 1`] = `
<AppProvider
store={
Object {
{
"redux": "store",
}
}
Expand Down
34 changes: 17 additions & 17 deletions src/components/ZendeskFab/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ exports[`ZendeskFab snapshot 1`] = `
cookies={true}
defer={true}
webWidget={
Object {
"answerBot": Object {
"avatar": Object {
"name": Object {
{
"answerBot": {
"avatar": {
"name": {
"*": "edX Support",
},
"url": "https://edx-cdn.org/v3/prod/favicon.ico",
},
"contactOnlyAfterQuery": true,
"suppress": false,
"title": Object {
"title": {
"*": "edX Support",
},
},
"chat": Object {
"departments": Object {
"enabled": Array [
"chat": {
"departments": {
"enabled": [
"account settings",
"billing and payments",
"certificates",
Expand All @@ -33,17 +33,17 @@ exports[`ZendeskFab snapshot 1`] = `
},
"suppress": false,
},
"contactForm": Object {
"contactForm": {
"attachments": true,
"selectTicketForm": Object {
"selectTicketForm": {
"*": "Please choose your request type:",
},
"ticketForms": Array [
Object {
"fields": Array [
Object {
"ticketForms": [
{
"fields": [
{
"id": "description",
"prefill": Object {
"prefill": {
"*": "",
},
},
Expand All @@ -53,10 +53,10 @@ exports[`ZendeskFab snapshot 1`] = `
},
],
},
"contactOptions": Object {
"contactOptions": {
"enabled": false,
},
"helpCenter": Object {
"helpCenter": {
"originalArticleButton": true,
},
}
Expand Down
8 changes: 4 additions & 4 deletions ...ers/CourseCard/components/CourseCardActions/__snapshots__/BeginCourseButton.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ exports[`BeginCourseButton snapshot disabled snapshot 1`] = `
disabled={true}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
Expand All @@ -25,8 +25,8 @@ exports[`BeginCourseButton snapshot enabled snapshot 1`] = `
disabled={false}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
Expand Down
8 changes: 4 additions & 4 deletions ...ntainers/CourseCard/components/CourseCardActions/__snapshots__/ResumeButton.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ exports[`ResumeButton snapshot disabled snapshot 1`] = `
disabled={true}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
Expand All @@ -25,8 +25,8 @@ exports[`ResumeButton snapshot enabled snapshot 1`] = `
disabled={false}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
Expand Down
4 changes: 2 additions & 2 deletions ...tainers/CourseCard/components/CourseCardActions/__snapshots__/UpgradeButton.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ exports[`UpgradeButton snapshot can upgrade 1`] = `
href="upgradeUrl"
iconBefore={[MockFunction icons.Locked]}
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.trackUpgradeClicked],
"upgradeUrl": "upgradeUrl",
Expand Down
8 changes: 4 additions & 4 deletions ...ners/CourseCard/components/CourseCardActions/__snapshots__/ViewCourseButton.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ exports[`ViewCourseButton learner can view course 1`] = `
disabled={false}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "homeUrl",
Expand All @@ -25,8 +25,8 @@ exports[`ViewCourseButton learner cannot view course 1`] = `
disabled={true}
href="#"
onClick={
Object {
"trackCourseEvent": Object {
{
"trackCourseEvent": {
"cardId": "cardId",
"eventName": [MockFunction segment.enterCourseClicked],
"upgradeUrl": "homeUrl",
Expand Down
4 changes: 2 additions & 2 deletions ...rs/CourseCard/components/CourseCardBanners/CreditBanner/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ exports[`CreditBanner component render with error state snapshot 1`] = `
>
<format-message-function
message={
Object {
{
"defaultMessage": "An error occurred with this transaction. For help, contact {supportEmailLink}.",
"description": "",
"id": "learner-dash.courseCard.banners.credit.error",
}
}
values={
Object {
{
"supportEmailLink": <MailtoLink
to="test-support-email"
>
Expand Down
8 changes: 4 additions & 4 deletions ...CourseCardBanners/CreditBanner/views/components/__snapshots__/CreditContent.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ exports[`CreditContent component render with action snapshot 1`] = `
</ActionRow>
<CreditRequestForm
requestData={
Object {
"parameters": Object {
{
"parameters": {
"key1": "val1",
},
"url": "test-request-data-url",
Expand All @@ -48,8 +48,8 @@ exports[`CreditContent component render without action snapshot 1`] = `
</div>
<CreditRequestForm
requestData={
Object {
"parameters": Object {
{
"parameters": {
"key1": "val1",
},
"url": "test-request-data-url",
Expand Down
6 changes: 3 additions & 3 deletions ...Card/components/CourseCardBanners/RelatedProgramsBanner/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ exports[`RelatedProgramsBanner render with programs 1`] = `
</span>
<ProgramsList
programs={
Array [
Object {
[
{
"title": "Program 1",
"url": "http://example.com/program1",
},
Object {
{
"title": "Program 2",
"url": "http://example.com/program2",
},
Expand Down
20 changes: 10 additions & 10 deletions ...ers/CourseCard/components/CourseCardBanners/__snapshots__/CertificateBanner.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ exports[`CertificateBanner snapshot is restricted and verified with billing emai

<format-message-function
message={
Object {
{
"defaultMessage": "If you would like a refund on your Certificate of Achievement, please contact our billing address {billingEmail}",
"description": "Message to learners to contact billing for certificate refunds",
"id": "learner-dash.courseCard.banners.certificateRefundContactBilling",
}
}
values={
Object {
{
"billingEmail": <MailtoLink
to="billing@email"
>
Expand All @@ -68,14 +68,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support and
>
<format-message-function
message={
Object {
{
"defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
"description": "Restricted certificate warning message",
"id": "learner-dash.courseCard.banners.certificateRestricted",
}
}
values={
Object {
{
"supportEmail": <MailtoLink
to="suport@email"
>
Expand All @@ -87,14 +87,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support and

<format-message-function
message={
Object {
{
"defaultMessage": "If you would like a refund on your Certificate of Achievement, please contact our billing address {billingEmail}",
"description": "Message to learners to contact billing for certificate refunds",
"id": "learner-dash.courseCard.banners.certificateRefundContactBilling",
}
}
values={
Object {
{
"billingEmail": <MailtoLink
to="billing@email"
>
Expand All @@ -112,14 +112,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support emai
>
<format-message-function
message={
Object {
{
"defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
"description": "Restricted certificate warning message",
"id": "learner-dash.courseCard.banners.certificateRestricted",
}
}
values={
Object {
{
"supportEmail": <MailtoLink
to="suport@email"
>
Expand Down Expand Up @@ -147,14 +147,14 @@ exports[`CertificateBanner snapshot is restricted with support email 1`] = `
>
<format-message-function
message={
Object {
{
"defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
"description": "Restricted certificate warning message",
"id": "learner-dash.courseCard.banners.certificateRestricted",
}
}
values={
Object {
{
"supportEmail": <MailtoLink
to="suport@email"
>
Expand Down
8 changes: 4 additions & 4 deletions ...ers/CourseCard/components/CourseCardBanners/__snapshots__/EntitlementBanner.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ exports[`EntitlementBanner snapshot: expiration warning 1`] = `
<Banner>
<format-message-function
message={
Object {
{
"defaultMessage": "You must {selectSessionButton} by {changeDeadline} to access the course.",
"description": "Entitlement course message when the entitlement is expiring soon.",
"id": "learner-dash.courseCard.banners.entitlementExpiringSoon",
}
}
values={
Object {
{
"changeDeadline": "11/11/2022",
"selectSessionButton": <Button
className="m-0 p-0"
Expand All @@ -33,14 +33,14 @@ exports[`EntitlementBanner snapshot: no sessions available 1`] = `
>
<format-message-function
message={
Object {
{
"defaultMessage": "There are no sessions available at the moment. The course team will create new sessions soon. If no sessions appear, please contact {emailLink} for information.",
"description": "Entitlement course message when no sessions are available",
"id": "learner-dash.courseCard.banners.entitlementUnavailable",
}
}
values={
Object {
{
"emailLink": <MailtoLink
to="test-support-email"
>
Expand Down
4 changes: 2 additions & 2 deletions src/containers/CourseCard/components/CourseCardMenu/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`CourseCardMenu render show dropdown hide unenroll item and disable emai
<SocialShareMenu
cardId="test-card-id"
emailSettings={
Object {
{
"hide": [MockFunction emailSettingHide],
"isVisible": false,
"show": [MockFunction emailSettingShow],
Expand Down Expand Up @@ -58,7 +58,7 @@ exports[`CourseCardMenu render show dropdown show unenroll and enable email snap
<SocialShareMenu
cardId="test-card-id"
emailSettings={
Object {
{
"hide": [MockFunction emailSettingHide],
"isVisible": false,
"show": [MockFunction emailSettingShow],
Expand Down
Loading
Loading