diff --git a/admin/package-lock.json b/admin/package-lock.json index b59423b87d7..e34e4b16682 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -53,7 +53,7 @@ "ember-fetch": "^8.1.2", "ember-file-upload": "^9.0.0", "ember-flatpickr": "^8.0.0", - "ember-intl": "^6.0.0", + "ember-intl": "^7.0.0", "ember-lifeline": "^7.0.0", "ember-load-initializers": "^2.1.2", "ember-modifier": "^4.1.0", @@ -15805,11 +15805,11 @@ } }, "node_modules/cldr-core": { - "version": "44.1.0", - "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-44.1.0.tgz", - "integrity": "sha512-ssbJaXu3pCkc4YqNC6xHhgleZG7YqnOFZ9laMlJfHOfnspoA9waI4AH54gKB3Fe/+wI4i3cVxKFdCTVGTRw+UA==", + "version": "45.0.0", + "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-45.0.0.tgz", + "integrity": "sha512-gQVxy3gzOQpXiTRGmlKiRQFLYimrr1RgvqGKZCS61JgmdkeNm7+LZGx+Lhw5/AW0t8WMM/uZhf4CMva6LuUobQ==", "dev": true, - "license": "Unicode-DFS-2016" + "license": "Unicode-3.0" }, "node_modules/clean-base-url": { "version": "1.0.0", @@ -30679,38 +30679,35 @@ } }, "node_modules/ember-intl": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/ember-intl/-/ember-intl-6.5.5.tgz", - "integrity": "sha512-ce+SyhrnzHMgxuX7eIv1PSs5GY0uJpG/33QxGMvrRqavDEzvhhAq9G56dedoMygFT6bKPr/dZuLpDmz7hhk8Kg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/ember-intl/-/ember-intl-7.0.4.tgz", + "integrity": "sha512-EKIEV24BiUTx05+zi1Y37+qaOwVO/bFMZtsHPzndMDJcj6wjC1e3aMm5nvs4+jldh1TVwnIMVs9ivEoUNeijHQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.24.0", - "@formatjs/icu-messageformat-parser": "^2.7.6", - "@formatjs/intl": "^2.10.0", + "@babel/core": "^7.24.7", + "@formatjs/icu-messageformat-parser": "^2.7.8", + "@formatjs/intl": "^2.10.4", "broccoli-caching-writer": "^3.0.3", "broccoli-funnel": "^3.0.8", "broccoli-merge-trees": "^4.2.0", "broccoli-source": "^3.0.1", - "broccoli-stew": "^3.0.0", "calculate-cache-key-for-tree": "^2.0.0", - "cldr-core": "^44.1.0", - "ember-auto-import": "^2.7.2", + "cldr-core": "^45.0.0", + "ember-auto-import": "^2.7.4", "ember-cli-babel": "^8.2.0", "ember-cli-typescript": "^5.3.0", "eventemitter3": "^5.0.1", "extend": "^3.0.2", - "fast-memoize": "^2.5.2", - "intl-messageformat": "^10.5.11", + "intl-messageformat": "^10.5.14", "js-yaml": "^4.1.0", - "json-stable-stringify": "^1.1.1", - "silent-error": "^1.1.1" + "json-stable-stringify": "^1.1.1" }, "engines": { - "node": "16.* || >= 18" + "node": "18.* || >= 20" }, "peerDependencies": { - "typescript": "^4.8.0 || ^5.0.0" + "typescript": "^5.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -39043,13 +39040,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true, - "license": "MIT" - }, "node_modules/fast-ordered-set": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz", diff --git a/admin/package.json b/admin/package.json index 5fa97b18b85..2459d58e262 100644 --- a/admin/package.json +++ b/admin/package.json @@ -85,7 +85,7 @@ "ember-fetch": "^8.1.2", "ember-file-upload": "^9.0.0", "ember-flatpickr": "^8.0.0", - "ember-intl": "^6.0.0", + "ember-intl": "^7.0.0", "ember-lifeline": "^7.0.0", "ember-load-initializers": "^2.1.2", "ember-modifier": "^4.1.0", diff --git a/admin/tests/acceptance/authenticated/autonomous-courses/autonomous-courses-test.js b/admin/tests/acceptance/authenticated/autonomous-courses/autonomous-courses-test.js index 405d103597a..0f0e233bb86 100644 --- a/admin/tests/acceptance/authenticated/autonomous-courses/autonomous-courses-test.js +++ b/admin/tests/acceptance/authenticated/autonomous-courses/autonomous-courses-test.js @@ -1,16 +1,15 @@ import { fillByLabel, visit } from '@1024pix/ember-testing-library'; import { click, currentURL } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../helpers/setup-intl'; - module('Acceptance | Autonomous courses', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); module('When admin member is logged in', function (hooks) { hooks.beforeEach(async function () { diff --git a/admin/tests/acceptance/authenticated/certifications/certification/neutralization-test.js b/admin/tests/acceptance/authenticated/certifications/certification/neutralization-test.js index 49695f8a0eb..0b8e3ba24d9 100644 --- a/admin/tests/acceptance/authenticated/certifications/certification/neutralization-test.js +++ b/admin/tests/acceptance/authenticated/certifications/certification/neutralization-test.js @@ -3,11 +3,13 @@ import { setupMirage } from 'ember-cli-mirage/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; +import setupIntl from '../../../../helpers/setup-intl'; import { authenticateAdminMemberWithRole } from '../../../../helpers/test-init'; module('Acceptance | Route | routes/authenticated/certifications/certification | neutralization', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); + setupIntl(hooks); module('when there is no challenge for this certification', function () { test('it renders "Aucune épreuve posée"', async function (assert) { diff --git a/admin/tests/acceptance/authenticated/organizations/invitations-management-test.js b/admin/tests/acceptance/authenticated/organizations/invitations-management-test.js index b7ef882fb8b..b59e8c99f0b 100644 --- a/admin/tests/acceptance/authenticated/organizations/invitations-management-test.js +++ b/admin/tests/acceptance/authenticated/organizations/invitations-management-test.js @@ -1,15 +1,14 @@ import { visit } from '@1024pix/ember-testing-library'; import { click, fillIn } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../helpers/setup-intl'; - module('Acceptance | Organizations | Invitations management', function (hooks) { setupApplicationTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); setupMirage(hooks); test('should allow to invite a member when user has access', async function (assert) { diff --git a/admin/tests/acceptance/authenticated/target-profiles/target-profile/management-test.js b/admin/tests/acceptance/authenticated/target-profiles/target-profile/management-test.js index 6ee44af984f..9d7a18e2993 100644 --- a/admin/tests/acceptance/authenticated/target-profiles/target-profile/management-test.js +++ b/admin/tests/acceptance/authenticated/target-profiles/target-profile/management-test.js @@ -1,15 +1,15 @@ import { clickByName, visit } from '@1024pix/ember-testing-library'; import { currentURL } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../../helpers/setup-intl'; - module('Acceptance | Target Profile Management', function (hooks) { setupApplicationTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); setupMirage(hooks); module('Access restriction stuff', function () { @@ -94,9 +94,7 @@ module('Acceptance | Target Profile Management', function (hooks) { assert.dom(_findByListItemText(screen, 'Public : Oui')).exists(); assert.dom(_findByListItemText(screen, 'Obsolète : Non')).exists(); assert.dom(_findByListItemText(screen, 'Parcours Accès Simplifié : Oui')).exists(); - assert - .dom(_findByListItemText(screen, `${this.intl.t('pages.target-profiles.resettable-checkbox.label')} : Non`)) - .exists(); + assert.dom(_findByListItemText(screen, `${t('pages.target-profiles.resettable-checkbox.label')} : Non`)).exists(); assert.dom(_findByListItemText(screen, 'Est associé à une campagne : Oui')).exists(); assert.dom(screen.getByText('456')).exists(); assert.dom(screen.getByText('Top profil cible.')).exists(); diff --git a/admin/tests/acceptance/authenticated/trainings/edit-triggers-test.js b/admin/tests/acceptance/authenticated/trainings/edit-triggers-test.js index 97791ba86e9..ead8f408bdb 100644 --- a/admin/tests/acceptance/authenticated/trainings/edit-triggers-test.js +++ b/admin/tests/acceptance/authenticated/trainings/edit-triggers-test.js @@ -1,16 +1,16 @@ import { clickByName, visit } from '@1024pix/ember-testing-library'; import { click, currentURL, fillIn } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../helpers/setup-intl'; - module('Acceptance | Trainings | Triggers edit', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); let trainingId; @@ -53,7 +53,7 @@ module('Acceptance | Trainings | Triggers edit', function (hooks) { const screen = await visit(`/trainings/${trainingId}/`); await click( screen.getByRole('link', { - name: this.intl.t('pages.trainings.training.triggers.prerequisite.alternative-title'), + name: t('pages.trainings.training.triggers.prerequisite.alternative-title'), }), ); @@ -66,9 +66,7 @@ module('Acceptance | Trainings | Triggers edit', function (hooks) { // when const screen = await visit(`/trainings/${trainingId}/`); - await click( - screen.getByRole('link', { name: this.intl.t('pages.trainings.training.triggers.goal.alternative-title') }), - ); + await click(screen.getByRole('link', { name: t('pages.trainings.training.triggers.goal.alternative-title') })); // then assert.strictEqual(currentURL(), `/trainings/${trainingId}/triggers/edit?type=goal`); @@ -92,7 +90,7 @@ module('Acceptance | Trainings | Triggers edit', function (hooks) { const screen = await visit(`/trainings/${trainingId}/`); await click( screen.getByRole('link', { - name: this.intl.t('pages.trainings.training.triggers.prerequisite.alternative-title'), + name: t('pages.trainings.training.triggers.prerequisite.alternative-title'), }), ); @@ -124,7 +122,7 @@ module('Acceptance | Trainings | Triggers edit', function (hooks) { assert .dom( screen.queryByRole('link', { - name: this.intl.t('pages.trainings.training.triggers.prerequisite.alternative-title'), + name: t('pages.trainings.training.triggers.prerequisite.alternative-title'), }), ) .doesNotExist(); diff --git a/admin/tests/acceptance/authenticated/trainings/target-profiles-test.js b/admin/tests/acceptance/authenticated/trainings/target-profiles-test.js index 3aa02261010..eb83bd3325b 100644 --- a/admin/tests/acceptance/authenticated/trainings/target-profiles-test.js +++ b/admin/tests/acceptance/authenticated/trainings/target-profiles-test.js @@ -1,16 +1,15 @@ import { clickByName, fillByLabel, visit } from '@1024pix/ember-testing-library'; import { currentURL } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../helpers/setup-intl'; - module('Acceptance | Trainings | Target profiles', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); let trainingId; diff --git a/admin/tests/acceptance/authenticated/trainings/training-test.js b/admin/tests/acceptance/authenticated/trainings/training-test.js index 9fa37be934f..06cc2d61423 100644 --- a/admin/tests/acceptance/authenticated/trainings/training-test.js +++ b/admin/tests/acceptance/authenticated/trainings/training-test.js @@ -1,16 +1,16 @@ import { clickByName, fillByLabel, screen, visit } from '@1024pix/ember-testing-library'; import { click, currentURL } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; +import { setupIntl } from 'ember-intl/test-support'; import { setupApplicationTest } from 'ember-qunit'; import { authenticateAdminMemberWithRole } from 'pix-admin/tests/helpers/test-init'; import { module, test } from 'qunit'; -import setupIntl from '../../../helpers/setup-intl'; - module('Acceptance | Trainings | Training', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - setupIntl(hooks); + setupIntl(hooks, 'fr'); module('When admin member is logged in', function (hooks) { let triggersTabName; @@ -21,10 +21,10 @@ module('Acceptance | Trainings | Training', function (hooks) { let targetProfileName; hooks.beforeEach(async function () { - triggersTabName = this.intl.t('pages.trainings.training.triggers.tabName'); - targetProfilesTabName = this.intl.t('pages.trainings.training.targetProfiles.tabName'); - prerequisiteTriggerHeading = this.intl.t('pages.trainings.training.triggers.prerequisite.title'); - goalTriggerHeading = this.intl.t('pages.trainings.training.triggers.goal.title'); + triggersTabName = t('pages.trainings.training.triggers.tabName'); + targetProfilesTabName = t('pages.trainings.training.targetProfiles.tabName'); + prerequisiteTriggerHeading = t('pages.trainings.training.triggers.prerequisite.title'); + goalTriggerHeading = t('pages.trainings.training.triggers.goal.title'); trainingId = 2; targetProfileName = 'Profile Cible 1'; diff --git a/admin/tests/integration/components/administration/access/anonymize-gar-import-test.gjs b/admin/tests/integration/components/administration/access/anonymize-gar-import-test.gjs index 0328ab3c01e..294a3e6d977 100644 --- a/admin/tests/integration/components/administration/access/anonymize-gar-import-test.gjs +++ b/admin/tests/integration/components/administration/access/anonymize-gar-import-test.gjs @@ -2,6 +2,7 @@ import NotificationContainer from '@1024pix/ember-cli-notifications/components/n import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import AnonymizeGarImport from 'pix-admin/components/administration/access/anonymize-gar-import'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -47,15 +48,13 @@ module('Integration | Component | administration/anonymize-gar-import', functio // when const screen = await render(); - const input = await screen.getByLabelText( - this.intl.t('components.administration.anonymize-gar-import.upload-button'), - ); + const input = await screen.getByLabelText(t('components.administration.anonymize-gar-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t('components.administration.anonymize-gar-import.notifications.success.full', { + t('components.administration.anonymize-gar-import.notifications.success.full', { total: 10, }), ), @@ -83,15 +82,13 @@ module('Integration | Component | administration/anonymize-gar-import', functio // when const screen = await render(); - const input = await screen.getByLabelText( - this.intl.t('components.administration.anonymize-gar-import.upload-button'), - ); + const input = await screen.getByLabelText(t('components.administration.anonymize-gar-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t('components.administration.anonymize-gar-import.notifications.success.partial', { + t('components.administration.anonymize-gar-import.notifications.success.partial', { garAnonymizedUserCount: 5, total: 10, }), @@ -115,15 +112,13 @@ module('Integration | Component | administration/anonymize-gar-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.anonymize-gar-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.anonymize-gar-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t('components.administration.anonymize-gar-import.notifications.error.payload-too-large', { + t('components.administration.anonymize-gar-import.notifications.error.payload-too-large', { maxSize: 20, }), ), @@ -138,13 +133,11 @@ module('Integration | Component | administration/anonymize-gar-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.anonymize-gar-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.anonymize-gar-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok(await screen.findByText(this.intl.t('common.notifications.generic-error'))); + assert.ok(await screen.findByText(t('common.notifications.generic-error'))); }); }); }); diff --git a/admin/tests/integration/components/administration/access/oidc-providers-import-test.gjs b/admin/tests/integration/components/administration/access/oidc-providers-import-test.gjs index 5f5cee92eed..f2faab691df 100644 --- a/admin/tests/integration/components/administration/access/oidc-providers-import-test.gjs +++ b/admin/tests/integration/components/administration/access/oidc-providers-import-test.gjs @@ -2,6 +2,7 @@ import NotificationContainer from '@1024pix/ember-cli-notifications/components/n import { render } from '@1024pix/ember-testing-library'; import { triggerEvent } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; import OidcProvidersImport from 'pix-admin/components/administration/access/oidc-providers-import'; import { module, test } from 'qunit'; @@ -19,15 +20,11 @@ module('Integration | Component | administration/oidc-providers-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.oidc-providers-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.oidc-providers-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok( - await screen.findByText(this.intl.t('components.administration.oidc-providers-import.notifications.success')), - ); + assert.ok(await screen.findByText(t('components.administration.oidc-providers-import.notifications.success'))); }); }); @@ -48,13 +45,11 @@ module('Integration | Component | administration/oidc-providers-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.oidc-providers-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.oidc-providers-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok(await screen.findByText(this.intl.t('common.notifications.generic-error'))); + assert.ok(await screen.findByText(t('common.notifications.generic-error'))); }); }); }); diff --git a/admin/tests/integration/components/administration/campaigns/campaigns-import-test.gjs b/admin/tests/integration/components/administration/campaigns/campaigns-import-test.gjs index ccab9a9838f..7463ed8c9ca 100644 --- a/admin/tests/integration/components/administration/campaigns/campaigns-import-test.gjs +++ b/admin/tests/integration/components/administration/campaigns/campaigns-import-test.gjs @@ -2,6 +2,7 @@ import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; import CampaignsImport from 'pix-admin/components/administration/campaigns/campaigns-import'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -36,16 +37,14 @@ module('Integration | Component | administration/campaigns-import', function (h // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.campaigns-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.campaigns-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok(true); sinon.assert.calledWith( notificationSuccessStub, - this.intl.t('components.administration.campaigns-import.notifications.success'), + t('components.administration.campaigns-import.notifications.success'), ); }); }); @@ -72,9 +71,7 @@ module('Integration | Component | administration/campaigns-import', function (h // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.campaigns-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.campaigns-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then diff --git a/admin/tests/integration/components/administration/campaigns/swap-campaign-codes-test.gjs b/admin/tests/integration/components/administration/campaigns/swap-campaign-codes-test.gjs index 3662128a196..16d8b005f0a 100644 --- a/admin/tests/integration/components/administration/campaigns/swap-campaign-codes-test.gjs +++ b/admin/tests/integration/components/administration/campaigns/swap-campaign-codes-test.gjs @@ -1,5 +1,6 @@ import { render } from '@1024pix/ember-testing-library'; import { click, fillIn } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import SwapCampaignCodes from 'pix-admin/components/administration/campaigns/swap-campaign-codes'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -34,17 +35,17 @@ module('Integration | Component | administration/swap-campaign-codes', function const screen = await render(); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.firstCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.firstCampaignId')), firstCampaignId, ); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.secondCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.secondCampaignId')), secondCampaignId, ); await click( screen.getByRole('button', { - name: this.intl.t('components.administration.swap-campaign-codes.form.button'), + name: t('components.administration.swap-campaign-codes.form.button'), }), ); @@ -52,7 +53,7 @@ module('Integration | Component | administration/swap-campaign-codes', function assert.true(swapStub.calledOnce); assert.true( notificationService.success.calledOnceWithExactly( - this.intl.t('components.administration.swap-campaign-codes.notifications.success'), + t('components.administration.swap-campaign-codes.notifications.success'), ), ); assert.true(notificationService.error.notCalled); @@ -73,17 +74,17 @@ module('Integration | Component | administration/swap-campaign-codes', function const screen = await render(); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.firstCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.firstCampaignId')), firstCampaignId, ); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.secondCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.secondCampaignId')), secondCampaignId, ); await click( screen.getByRole('button', { - name: this.intl.t('components.administration.swap-campaign-codes.form.button'), + name: t('components.administration.swap-campaign-codes.form.button'), }), ); @@ -91,7 +92,7 @@ module('Integration | Component | administration/swap-campaign-codes', function assert.true(swapStub.calledOnce); assert.true(notificationService.clearAll.called); assert.true(notificationService.success.notCalled); - assert.true(notificationService.error.calledOnceWithExactly(this.intl.t('common.notifications.generic-error'))); + assert.true(notificationService.error.calledOnceWithExactly(t('common.notifications.generic-error'))); }); test('it should display mismatch organization error notification', async function (assert) { @@ -108,17 +109,17 @@ module('Integration | Component | administration/swap-campaign-codes', function const screen = await render(); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.firstCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.firstCampaignId')), firstCampaignId, ); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.secondCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.secondCampaignId')), secondCampaignId, ); await click( screen.getByRole('button', { - name: this.intl.t('components.administration.swap-campaign-codes.form.button'), + name: t('components.administration.swap-campaign-codes.form.button'), }), ); @@ -128,7 +129,7 @@ module('Integration | Component | administration/swap-campaign-codes', function assert.true(notificationService.success.notCalled); assert.true( notificationService.error.calledOnceWithExactly( - this.intl.t('components.administration.swap-campaign-codes.notifications.error.mismatch-organization'), + t('components.administration.swap-campaign-codes.notifications.error.mismatch-organization'), ), ); }); @@ -147,17 +148,17 @@ module('Integration | Component | administration/swap-campaign-codes', function const screen = await render(); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.firstCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.firstCampaignId')), firstCampaignId, ); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.swap-campaign-codes.form.secondCampaignId')), + screen.getByLabelText(t('components.administration.swap-campaign-codes.form.secondCampaignId')), secondCampaignId, ); await click( screen.getByRole('button', { - name: this.intl.t('components.administration.swap-campaign-codes.form.button'), + name: t('components.administration.swap-campaign-codes.form.button'), }), ); @@ -167,7 +168,7 @@ module('Integration | Component | administration/swap-campaign-codes', function assert.true(notificationService.success.notCalled); assert.true( notificationService.error.calledOnceWithExactly( - this.intl.t('components.administration.swap-campaign-codes.notifications.error.swap-code-error'), + t('components.administration.swap-campaign-codes.notifications.error.swap-code-error'), ), ); }); diff --git a/admin/tests/integration/components/administration/campaigns/update-campaign-code-test.gjs b/admin/tests/integration/components/administration/campaigns/update-campaign-code-test.gjs index 11d19ae26ce..6dcec1a7cb9 100644 --- a/admin/tests/integration/components/administration/campaigns/update-campaign-code-test.gjs +++ b/admin/tests/integration/components/administration/campaigns/update-campaign-code-test.gjs @@ -1,5 +1,6 @@ import { render } from '@1024pix/ember-testing-library'; import { click, fillIn } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import UpdateCampaignCode from 'pix-admin/components/administration/campaigns/update-campaign-code'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -34,17 +35,17 @@ module('Integration | Component | administration/update-campaign-code', function const screen = await render(); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.update-campaign-code.form.campaignId')), + screen.getByLabelText(t('components.administration.update-campaign-code.form.campaignId')), campaignId, ); await fillIn( - screen.getByLabelText(this.intl.t('components.administration.update-campaign-code.form.campaignCode')), + screen.getByLabelText(t('components.administration.update-campaign-code.form.campaignCode')), campaignCode, ); await click( screen.getByRole('button', { - name: this.intl.t('components.administration.update-campaign-code.form.button'), + name: t('components.administration.update-campaign-code.form.button'), }), ); @@ -52,7 +53,7 @@ module('Integration | Component | administration/update-campaign-code', function assert.true(updateAdapterStub.calledOnce); assert.true( notificationService.success.calledOnceWithExactly( - this.intl.t('components.administration.update-campaign-code.notifications.success'), + t('components.administration.update-campaign-code.notifications.success'), ), ); assert.true(notificationService.error.notCalled); diff --git a/admin/tests/integration/components/administration/common/add-organization-features-in-batch-test.gjs b/admin/tests/integration/components/administration/common/add-organization-features-in-batch-test.gjs index 0ccaec06ce7..ac0fc5b475a 100644 --- a/admin/tests/integration/components/administration/common/add-organization-features-in-batch-test.gjs +++ b/admin/tests/integration/components/administration/common/add-organization-features-in-batch-test.gjs @@ -2,6 +2,7 @@ import NotificationContainer from '@1024pix/ember-cli-notifications/components/n import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import AddOrganizationFeaturesInBatch from 'pix-admin/components/administration/common/add-organization-features-in-batch'; import ENV from 'pix-admin/config/environment'; import { module, test } from 'qunit'; @@ -50,14 +51,14 @@ module('Integration | Component | administration/add-organization-features-in-b // when const screen = await render(); const input = await screen.getByLabelText( - this.intl.t('components.administration.add-organization-features-in-batch.upload-button'), + t('components.administration.add-organization-features-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t('components.administration.add-organization-features-in-batch.notifications.success'), + t('components.administration.add-organization-features-in-batch.notifications.success'), ), ); }); @@ -88,7 +89,7 @@ module('Integration | Component | administration/add-organization-features-in-b // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.add-organization-features-in-batch.upload-button'), + t('components.administration.add-organization-features-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); @@ -112,12 +113,12 @@ module('Integration | Component | administration/add-organization-features-in-b // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.add-organization-features-in-batch.upload-button'), + t('components.administration.add-organization-features-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok(await screen.findByText(this.intl.t('common.notifications.generic-error'))); + assert.ok(await screen.findByText(t('common.notifications.generic-error'))); }); }); }); diff --git a/admin/tests/integration/components/administration/deployment/organization-tags-import_test.gjs b/admin/tests/integration/components/administration/deployment/organization-tags-import_test.gjs index 37057c00416..0f560d9f46c 100644 --- a/admin/tests/integration/components/administration/deployment/organization-tags-import_test.gjs +++ b/admin/tests/integration/components/administration/deployment/organization-tags-import_test.gjs @@ -2,6 +2,7 @@ import NotificationContainer from '@1024pix/ember-cli-notifications/components/n import { render } from '@1024pix/ember-testing-library'; import { triggerEvent } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; import OrganizationTagsImport from 'pix-admin/components/administration/deployment/organization-tags-import'; import { module, test } from 'qunit'; @@ -19,17 +20,11 @@ module('Integration | Component | administration/organization-tags-import', func // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.organization-tags-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.organization-tags-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok( - await screen.findByText( - this.intl.t('components.administration.organization-tags-import.notifications.success'), - ), - ); + assert.ok(await screen.findByText(t('components.administration.organization-tags-import.notifications.success'))); }); }); @@ -50,13 +45,11 @@ module('Integration | Component | administration/organization-tags-import', func // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.organization-tags-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.organization-tags-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then - assert.ok(await screen.findByText(this.intl.t('common.notifications.generic-error'))); + assert.ok(await screen.findByText(t('common.notifications.generic-error'))); }); }); }); diff --git a/admin/tests/integration/components/administration/deployment/organizations-import-test.gjs b/admin/tests/integration/components/administration/deployment/organizations-import-test.gjs index c08d3a8def1..80dac60f33c 100644 --- a/admin/tests/integration/components/administration/deployment/organizations-import-test.gjs +++ b/admin/tests/integration/components/administration/deployment/organizations-import-test.gjs @@ -2,6 +2,7 @@ import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; import { setupMirage } from 'ember-cli-mirage/test-support'; +import { t } from 'ember-intl/test-support'; import OrganizationsImport from 'pix-admin/components/administration/deployment/organizations-import'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -37,16 +38,14 @@ module('Integration | Component | administration/organizations-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.organizations-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.organizations-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok(true); sinon.assert.calledWith( notificationSuccessStub, - this.intl.t('components.administration.organizations-import.notifications.success'), + t('components.administration.organizations-import.notifications.success'), ); }); }); @@ -73,9 +72,7 @@ module('Integration | Component | administration/organizations-import', functio // when const screen = await render(); - const input = await screen.findByLabelText( - this.intl.t('components.administration.organizations-import.upload-button'), - ); + const input = await screen.findByLabelText(t('components.administration.organizations-import.upload-button')); await triggerEvent(input, 'change', { files: [file] }); // then diff --git a/admin/tests/integration/components/administration/deployment/update-organizations-in-batch-test.gjs b/admin/tests/integration/components/administration/deployment/update-organizations-in-batch-test.gjs index 0411f1e703d..9d0ece81897 100644 --- a/admin/tests/integration/components/administration/deployment/update-organizations-in-batch-test.gjs +++ b/admin/tests/integration/components/administration/deployment/update-organizations-in-batch-test.gjs @@ -2,6 +2,7 @@ import NotificationContainer from '@1024pix/ember-cli-notifications/components/n import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import UpdateOrganizationsInBatch from 'pix-admin/components/administration/deployment/update-organizations-in-batch'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -35,15 +36,13 @@ module('Integration | Component | administration/update-organizations-in-batch' // when const screen = await render(); const input = await screen.getByLabelText( - this.intl.t('components.administration.update-organizations-in-batch.upload-button'), + t('components.administration.update-organizations-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( - await screen.findByText( - this.intl.t('components.administration.update-organizations-in-batch.notifications.success'), - ), + await screen.findByText(t('components.administration.update-organizations-in-batch.notifications.success')), ); }); }); @@ -63,17 +62,16 @@ module('Integration | Component | administration/update-organizations-in-batch' // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.update-organizations-in-batch.upload-button'), + t('components.administration.update-organizations-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t( - 'components.administration.update-organizations-in-batch.notifications.errors.organization-not-found', - { organizationId: '123' }, - ), + t('components.administration.update-organizations-in-batch.notifications.errors.organization-not-found', { + organizationId: '123', + }), ), ); }); @@ -97,14 +95,14 @@ module('Integration | Component | administration/update-organizations-in-batch' // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.update-organizations-in-batch.upload-button'), + t('components.administration.update-organizations-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t( + t( 'components.administration.update-organizations-in-batch.notifications.errors.parent-organization-not-found', { organizationId: '123' }, ), @@ -131,14 +129,14 @@ module('Integration | Component | administration/update-organizations-in-batch' // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.update-organizations-in-batch.upload-button'), + t('components.administration.update-organizations-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t( + t( 'components.administration.update-organizations-in-batch.notifications.errors.data-protection-email-invalid', { organizationId: '123', value: 'foo' }, ), @@ -160,14 +158,14 @@ module('Integration | Component | administration/update-organizations-in-batch' // when const screen = await render(); const input = await screen.findByLabelText( - this.intl.t('components.administration.update-organizations-in-batch.upload-button'), + t('components.administration.update-organizations-in-batch.upload-button'), ); await triggerEvent(input, 'change', { files: [file] }); // then assert.ok( await screen.findByText( - this.intl.t( + t( 'components.administration.update-organizations-in-batch.notifications.errors.organization-batch-update-error', { organizationId: '123' }, ), diff --git a/admin/tests/integration/components/certification-centers/information-view-test.gjs b/admin/tests/integration/components/certification-centers/information-view-test.gjs index 7311f0d33d3..000bf720358 100644 --- a/admin/tests/integration/components/certification-centers/information-view-test.gjs +++ b/admin/tests/integration/components/certification-centers/information-view-test.gjs @@ -1,10 +1,10 @@ import { render } from '@1024pix/ember-testing-library'; import ArrayProxy from '@ember/array/proxy'; +import { t } from 'ember-intl/test-support'; import InformationView from 'pix-admin/components/certification-centers/information-view'; import { module, test } from 'qunit'; import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering'; - function _createEmberDataHabilitations(store) { return ArrayProxy.create({ content: [ @@ -89,7 +89,7 @@ module('Integration | Component | certification-centers/information-view', funct assert .dom( screen.getByLabelText( - this.intl.t('pages.certification-centers.information-view.pilot-features.is-v3-pilot.aria-label.active'), + t('pages.certification-centers.information-view.pilot-features.is-v3-pilot.aria-label.active'), ), ) .exists(); @@ -115,7 +115,7 @@ module('Integration | Component | certification-centers/information-view', funct assert .dom( screen.getByLabelText( - this.intl.t('pages.certification-centers.information-view.pilot-features.is-v3-pilot.aria-label.inactive'), + t('pages.certification-centers.information-view.pilot-features.is-v3-pilot.aria-label.inactive'), ), ) .exists(); @@ -141,7 +141,7 @@ module('Integration | Component | certification-centers/information-view', funct assert .dom( screen.getByLabelText( - this.intl.t( + t( 'pages.certification-centers.information-view.pilot-features.is-complementary-alone-pilot.aria-label.active', ), ), @@ -169,7 +169,7 @@ module('Integration | Component | certification-centers/information-view', funct assert .dom( screen.getByLabelText( - this.intl.t( + t( 'pages.certification-centers.information-view.pilot-features.is-complementary-alone-pilot.aria-label.inactive', ), ), diff --git a/admin/tests/integration/components/certifications/certification/details-v3-test.gjs b/admin/tests/integration/components/certifications/certification/details-v3-test.gjs index 64e50e4df9b..9818a8f4a68 100644 --- a/admin/tests/integration/components/certifications/certification/details-v3-test.gjs +++ b/admin/tests/integration/components/certifications/certification/details-v3-test.gjs @@ -1,5 +1,6 @@ import { fireEvent, render, within } from '@1024pix/ember-testing-library'; import { click } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import DetailsV3 from 'pix-admin/components/certifications/certification/details-v3'; import { module, test } from 'qunit'; @@ -128,9 +129,7 @@ module('Integration | Component | Certifications | certification > details v3', const creationDate = await screen.getByLabelText('Créée le :').innerText; // then - const pixScoreLabel = this.intl.t( - 'pages.certifications.certification.details.v3.general-informations.labels.pix-score', - ); + const pixScoreLabel = t('pages.certifications.certification.details.v3.general-informations.labels.pix-score'); assert.dom(screen.getByRole('heading', { name: 'Certification N°123456', level: 2 })).exists(); assert.dom(screen.getByLabelText(`${pixScoreLabel} :`)).exists(); @@ -147,7 +146,7 @@ module('Integration | Component | Certifications | certification > details v3', // then const assessmentResultStatusElement = screen.getByText( - this.intl.t('pages.certifications.certification.details.v3.assessment-result-status.validated'), + t('pages.certifications.certification.details.v3.assessment-result-status.validated'), ); assert.dom(assessmentResultStatusElement).exists(); @@ -162,9 +161,7 @@ module('Integration | Component | Certifications | certification > details v3', const screen = await render(); // then - const endedAtLabel = this.intl.t( - 'pages.certifications.certification.details.v3.general-informations.labels.ended-at', - ); + const endedAtLabel = t('pages.certifications.certification.details.v3.general-informations.labels.ended-at'); assert.dom(screen.getByText(`${endedAtLabel} :`)).exists(); }); @@ -177,11 +174,9 @@ module('Integration | Component | Certifications | certification > details v3', const screen = await render(); // then - const endedAtLabel = this.intl.t( - 'pages.certifications.certification.details.v3.general-informations.labels.ended-by', - ); + const endedAtLabel = t('pages.certifications.certification.details.v3.general-informations.labels.ended-by'); - const abortReasonLabel = this.intl.t( + const abortReasonLabel = t( 'pages.certifications.certification.details.v3.general-informations.labels.abort-reason', ); @@ -215,7 +210,7 @@ module('Integration | Component | Certifications | certification > details v3', // then const assessmentResultStatusElement = screen.getByText( - this.intl.t('pages.certifications.certification.details.v3.assessment-result-status.rejected'), + t('pages.certifications.certification.details.v3.assessment-result-status.rejected'), ); assert.dom(assessmentResultStatusElement).exists(); @@ -230,9 +225,7 @@ module('Integration | Component | Certifications | certification > details v3', const screen = await render(); // then - const endedAtLabel = this.intl.t( - 'pages.certifications.certification.details.v3.general-informations.labels.ended-at', - ); + const endedAtLabel = t('pages.certifications.certification.details.v3.general-informations.labels.ended-at'); assert.dom(screen.getByText(`${endedAtLabel} :`)).exists(); }); @@ -245,16 +238,12 @@ module('Integration | Component | Certifications | certification > details v3', const screen = await render(); // then - const endedAtLabel = this.intl.t( - 'pages.certifications.certification.details.v3.general-informations.labels.ended-by', - ); + const endedAtLabel = t('pages.certifications.certification.details.v3.general-informations.labels.ended-by'); - const abortReasonLabel = this.intl.t( + const abortReasonLabel = t( 'pages.certifications.certification.details.v3.general-informations.labels.abort-reason', ); - const abortReasonTranslation = this.intl.t( - 'pages.certifications.certification.details.v3.abort-reason.candidate', - ); + const abortReasonTranslation = t('pages.certifications.certification.details.v3.abort-reason.candidate'); const abortReasonElement = screen.getByLabelText(`${abortReasonLabel} :`); assert.dom(screen.getByLabelText(`${endedAtLabel} :`)).exists(); @@ -419,7 +408,7 @@ module('Integration | Component | Certifications | certification > details v3', ]; const list = screen.getByRole('list', { - name: this.intl.t('pages.certifications.certification.details.v3.more-informations.title'), + name: t('pages.certifications.certification.details.v3.more-informations.title'), }); const terms = within(list).getAllByRole('term'); const definitions = within(list).getAllByRole('definition'); diff --git a/admin/tests/integration/components/complementary-certifications/attach-form/badges/list-test.gjs b/admin/tests/integration/components/complementary-certifications/attach-form/badges/list-test.gjs index dbbc6c7f3c6..ff083c45eb2 100644 --- a/admin/tests/integration/components/complementary-certifications/attach-form/badges/list-test.gjs +++ b/admin/tests/integration/components/complementary-certifications/attach-form/badges/list-test.gjs @@ -16,7 +16,13 @@ module('Integration | Component | complementary-certifications/attach-badges/lis await render(); // then - assert.dom(getByTextWithHtml(this.intl.t('common.forms.mandatory-fields'))).exists(); + assert + .dom( + getByTextWithHtml( + `Les champs marqués de * sont obligatoires`, + ), + ) + .exists(); }); module('Without badges', function () { diff --git a/admin/tests/integration/components/login-form-test.gjs b/admin/tests/integration/components/login-form-test.gjs index be2cb722317..9b929c59381 100644 --- a/admin/tests/integration/components/login-form-test.gjs +++ b/admin/tests/integration/components/login-form-test.gjs @@ -1,5 +1,6 @@ import { clickByName, fillByLabel, render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; +import { t } from 'ember-intl/test-support'; import LoginForm from 'pix-admin/components/login-form'; import ENV from 'pix-admin/config/environment'; import { module, test } from 'qunit'; @@ -154,7 +155,7 @@ module('Integration | Component | login-form', function (hooks) { await clickByName('Je me connecte'); // then - assert.dom(screen.getByText(this.intl.t(ApiErrorMessages.LOGIN_UNAUTHORIZED.I18N_KEY))).exists(); + assert.dom(screen.getByText(t(ApiErrorMessages.LOGIN_UNAUTHORIZED.I18N_KEY))).exists(); }); test('should display good error message when an error 400 occurred', async function (assert) { @@ -180,7 +181,7 @@ module('Integration | Component | login-form', function (hooks) { await clickByName('Je me connecte'); // then - assert.dom(screen.getByText(this.intl.t(ApiErrorMessages.BAD_REQUEST.I18N_KEY))).exists(); + assert.dom(screen.getByText(t(ApiErrorMessages.BAD_REQUEST.I18N_KEY))).exists(); }); test('should display good error message when an error 403 occurred', async function (assert) { @@ -199,7 +200,7 @@ module('Integration | Component | login-form', function (hooks) { await clickByName('Je me connecte'); // then - assert.dom(screen.getByText(this.intl.t(ApiErrorMessages.LOGIN_NO_PERMISSION.I18N_KEY))).exists(); + assert.dom(screen.getByText(t(ApiErrorMessages.LOGIN_NO_PERMISSION.I18N_KEY))).exists(); }); test('should display good error message when an 500 error occurred', async function (assert) { @@ -225,7 +226,7 @@ module('Integration | Component | login-form', function (hooks) { await clickByName('Je me connecte'); // then - assert.dom(screen.getByText(this.intl.t(ApiErrorMessages.INTERNAL_SERVER_ERROR.I18N_KEY))).exists(); + assert.dom(screen.getByText(t(ApiErrorMessages.INTERNAL_SERVER_ERROR.I18N_KEY))).exists(); }); test('should display good error message when an non handled status code', async function (assert) { @@ -244,7 +245,7 @@ module('Integration | Component | login-form', function (hooks) { await clickByName('Je me connecte'); // then - assert.dom(screen.getByText(this.intl.t(ApiErrorMessages.INTERNAL_SERVER_ERROR.I18N_KEY))).exists(); + assert.dom(screen.getByText(t(ApiErrorMessages.INTERNAL_SERVER_ERROR.I18N_KEY))).exists(); }); }); }); diff --git a/admin/tests/integration/components/organizations/all-tags-test.gjs b/admin/tests/integration/components/organizations/all-tags-test.gjs index f6767c60299..487b10a45cf 100644 --- a/admin/tests/integration/components/organizations/all-tags-test.gjs +++ b/admin/tests/integration/components/organizations/all-tags-test.gjs @@ -1,6 +1,7 @@ import { clickByName, render } from '@1024pix/ember-testing-library'; import EmberObject from '@ember/object'; import { fillIn } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import AllTags from 'pix-admin/components/organizations/all-tags'; import ENV from 'pix-admin/config/environment'; import { module, test } from 'qunit'; @@ -75,7 +76,7 @@ module('Integration | Component | organizations/all-tags', function (hooks) { assert .dom( screen.getByRole('heading', { - name: this.intl.t('components.organizations.all-tags.recently-used-tags', { tagName: tag2.name }), + name: t('components.organizations.all-tags.recently-used-tags', { tagName: tag2.name }), }), ) .exists(); @@ -106,7 +107,7 @@ module('Integration | Component | organizations/all-tags', function (hooks) { assert .dom( screen.queryByRole('heading', { - name: this.intl.t('components.organizations.all-tags.recently-used-tags', { tagName: tag2.name }), + name: t('components.organizations.all-tags.recently-used-tags', { tagName: tag2.name }), }), ) .doesNotExist(); diff --git a/admin/tests/integration/components/trainings/create-training-triggers-test.gjs b/admin/tests/integration/components/trainings/create-training-triggers-test.gjs index 4683a8105a4..4b0131fabe5 100644 --- a/admin/tests/integration/components/trainings/create-training-triggers-test.gjs +++ b/admin/tests/integration/components/trainings/create-training-triggers-test.gjs @@ -1,4 +1,5 @@ import { clickByText, render } from '@1024pix/ember-testing-library'; +import { t } from 'ember-intl/test-support'; import CreateTrainingTriggers from 'pix-admin/components/trainings/create-training-triggers'; import { module, test } from 'qunit'; @@ -137,7 +138,7 @@ module('Integration | Component | Trainings::CreateTrainingTriggers', function ( // then assert - .dom(screen.queryByLabelText(this.intl.t('pages.trainings.training.triggers.prerequisite.alternative-title'))) + .dom(screen.queryByLabelText(t('pages.trainings.training.triggers.prerequisite.alternative-title'))) .exists(); }); @@ -151,9 +152,7 @@ module('Integration | Component | Trainings::CreateTrainingTriggers', function ( const screen = await render(); // then - assert - .dom(screen.queryByLabelText(this.intl.t('pages.trainings.training.triggers.goal.alternative-title'))) - .doesNotExist(); + assert.dom(screen.queryByLabelText(t('pages.trainings.training.triggers.goal.alternative-title'))).doesNotExist(); assert.dom(screen.getByText('Seuil : 19%')).exists(); assert.dom(screen.getByText('5 sujets')).exists(); assert.dom(screen.getByText('area1 code · area1 title')).exists(); @@ -184,9 +183,7 @@ module('Integration | Component | Trainings::CreateTrainingTriggers', function ( const screen = await render(); // then - assert - .dom(screen.queryByLabelText(this.intl.t('pages.trainings.training.triggers.goal.alternative-title'))) - .exists(); + assert.dom(screen.queryByLabelText(t('pages.trainings.training.triggers.goal.alternative-title'))).exists(); }); }); }); diff --git a/admin/tests/integration/components/users/certification-centers/membership-item-role-test.gjs b/admin/tests/integration/components/users/certification-centers/membership-item-role-test.gjs index 1bde18e201c..512045e3c21 100644 --- a/admin/tests/integration/components/users/certification-centers/membership-item-role-test.gjs +++ b/admin/tests/integration/components/users/certification-centers/membership-item-role-test.gjs @@ -1,5 +1,6 @@ import { clickByName, render as renderScreen } from '@1024pix/ember-testing-library'; import { click } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import MembershipItemRole from 'pix-admin/components/users/certification-centers/membership-item-role'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -29,8 +30,8 @@ module('Integration | Component | users | certification-centers | membership-ite test('it displays role selection input', async function (assert) { // given const certificationCenterRoles = [ - { value: 'ADMIN', label: this.intl.t('common.roles.admin') }, - { value: 'MEMBER', label: this.intl.t('common.roles.member') }, + { value: 'ADMIN', label: t('common.roles.admin') }, + { value: 'MEMBER', label: t('common.roles.member') }, ]; const isEditionMode = true; const role = 'MEMBER'; @@ -56,8 +57,8 @@ module('Integration | Component | users | certification-centers | membership-ite test('it displays a list of roles', async function (assert) { // given const certificationCenterRoles = [ - { value: 'ADMIN', label: this.intl.t('common.roles.admin') }, - { value: 'MEMBER', label: this.intl.t('common.roles.member') }, + { value: 'ADMIN', label: t('common.roles.admin') }, + { value: 'MEMBER', label: t('common.roles.member') }, ]; const isEditionMode = true; const role = 'MEMBER'; @@ -86,8 +87,8 @@ module('Integration | Component | users | certification-centers | membership-ite test('it emits an event with the new role', async function (assert) { // given const certificationCenterRoles = [ - { value: 'ADMIN', label: this.intl.t('common.roles.admin') }, - { value: 'MEMBER', label: this.intl.t('common.roles.member') }, + { value: 'ADMIN', label: t('common.roles.admin') }, + { value: 'MEMBER', label: t('common.roles.member') }, ]; const onRoleSelected = sinon.stub(); const isEditionMode = true; diff --git a/admin/tests/integration/components/users/user-detail-personal-information/authentication-method-test.gjs b/admin/tests/integration/components/users/user-detail-personal-information/authentication-method-test.gjs index 09ecd81be15..26ae77a02de 100644 --- a/admin/tests/integration/components/users/user-detail-personal-information/authentication-method-test.gjs +++ b/admin/tests/integration/components/users/user-detail-personal-information/authentication-method-test.gjs @@ -1,5 +1,6 @@ import { render } from '@1024pix/ember-testing-library'; import Service from '@ember/service'; +import { t } from 'ember-intl/test-support'; import AuthenticationMethod from 'pix-admin/components/users/user-detail-personal-information/authentication-method'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -119,10 +120,10 @@ module('Integration | Component | users | user-detail-personal-information | aut const screen = await render(); // then - const expectedLabel = this.intl.t( + const expectedLabel = t( 'components.users.user-detail-personal-information.authentication-method.should-change-password-status', ); - const expectedValue = this.intl.t('common.words.yes'); + const expectedValue = t('common.words.yes'); assert .dom( screen.getAllByRole('listitem').find((listItem) => { @@ -149,10 +150,10 @@ module('Integration | Component | users | user-detail-personal-information | aut const screen = await render(); // then - const expectedLabel = this.intl.t( + const expectedLabel = t( 'components.users.user-detail-personal-information.authentication-method.should-change-password-status', ); - const expectedValue = this.intl.t('common.words.no'); + const expectedValue = t('common.words.no'); assert .dom( screen.getAllByRole('listitem').find((listItem) => { diff --git a/admin/tests/integration/components/users/user-overview-test.gjs b/admin/tests/integration/components/users/user-overview-test.gjs index 1a6869680d7..80c4f34418c 100644 --- a/admin/tests/integration/components/users/user-overview-test.gjs +++ b/admin/tests/integration/components/users/user-overview-test.gjs @@ -2,6 +2,7 @@ import { clickByName, render, waitFor } from '@1024pix/ember-testing-library'; import EmberObject from '@ember/object'; import Service from '@ember/service'; import { triggerEvent } from '@ember/test-helpers'; +import { t } from 'ember-intl/test-support'; import UserOverview from 'pix-admin/components/users/user-overview'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -118,7 +119,7 @@ module('Integration | Component | users | user-overview', function (hooks) { assert.ok( screen .getByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-email'), + name: t('components.users.user-detail-personal-information.actions.copy-email'), }) .hasAttribute('data-clipboard-text', email), ); @@ -140,15 +141,13 @@ module('Integration | Component | users | user-overview', function (hooks) { // when const screen = await render(); const copyButton = await screen.getByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-email'), + name: t('components.users.user-detail-personal-information.actions.copy-email'), }); await triggerEvent(copyButton, 'mouseenter'); // then assert - .dom( - screen.getByText(this.intl.t('components.users.user-detail-personal-information.actions.copy-email')), - ) + .dom(screen.getByText(t('components.users.user-detail-personal-information.actions.copy-email'))) .exists(); }); @@ -172,7 +171,7 @@ module('Integration | Component | users | user-overview', function (hooks) { assert.ok( screen .getByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-username'), + name: t('components.users.user-detail-personal-information.actions.copy-username'), }) .hasAttribute('data-clipboard-text', username), ); @@ -194,17 +193,13 @@ module('Integration | Component | users | user-overview', function (hooks) { // when const screen = await render(); const copyButton = await screen.getByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-username'), + name: t('components.users.user-detail-personal-information.actions.copy-username'), }); await triggerEvent(copyButton, 'mouseenter'); // then assert - .dom( - screen.getByText( - this.intl.t('components.users.user-detail-personal-information.actions.copy-username'), - ), - ) + .dom(screen.getByText(t('components.users.user-detail-personal-information.actions.copy-username'))) .exists(); }); }); @@ -229,7 +224,7 @@ module('Integration | Component | users | user-overview', function (hooks) { assert .dom( screen.queryByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-email'), + name: t('components.users.user-detail-personal-information.actions.copy-email'), }), ) .doesNotExist(); @@ -254,7 +249,7 @@ module('Integration | Component | users | user-overview', function (hooks) { assert .dom( screen.queryByRole('button', { - name: this.intl.t('components.users.user-detail-personal-information.actions.copy-username'), + name: t('components.users.user-detail-personal-information.actions.copy-username'), }), ) .doesNotExist(); diff --git a/admin/tests/unit/components/campaigns/update-test.js b/admin/tests/unit/components/campaigns/update-test.js index d82efa8bd66..9d619e0a3cc 100644 --- a/admin/tests/unit/components/campaigns/update-test.js +++ b/admin/tests/unit/components/campaigns/update-test.js @@ -1,3 +1,4 @@ +import { setupIntl } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -6,6 +7,7 @@ import createGlimmerComponent from '../../../helpers/create-glimmer-component'; module('Unit | Component | Campaigns | update', function (hooks) { setupTest(hooks); + setupIntl(hooks, 'fr'); module('#update', function () { test('it should update controller campaign fields', async function (assert) { diff --git a/admin/tests/unit/components/certification-centers/information-view-test.js b/admin/tests/unit/components/certification-centers/information-view-test.js index c5ce9f79241..0ae48f76f0f 100644 --- a/admin/tests/unit/components/certification-centers/information-view-test.js +++ b/admin/tests/unit/components/certification-centers/information-view-test.js @@ -1,3 +1,4 @@ +import { setupIntl } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import ENV from 'pix-admin/config/environment'; import { module, test } from 'qunit'; @@ -6,6 +7,7 @@ import createGlimmerComponent from '../../../helpers/create-glimmer-component'; module('Unit | Component | certification-centers/information-view', function (hooks) { setupTest(hooks); + setupIntl(hooks, 'fr'); module('#availableHabilitations', function () { test('it should return a sorted list of available habilitations', async function (assert) { diff --git a/admin/tests/unit/components/users/user-overview-test.js b/admin/tests/unit/components/users/user-overview-test.js index 2674a397a53..ba7bac947db 100644 --- a/admin/tests/unit/components/users/user-overview-test.js +++ b/admin/tests/unit/components/users/user-overview-test.js @@ -1,3 +1,4 @@ +import { setupIntl } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import ENV from 'pix-admin/config/environment'; import { module, test } from 'qunit'; @@ -7,6 +8,7 @@ import createGlimmerComponent from '../../../helpers/create-glimmer-component'; module('Unit | Component | users | user-overview', function (hooks) { setupTest(hooks); + setupIntl(hooks, 'fr'); module('#externalURL', function () { test('it should generate dashboard URL based on environment and object', async function (assert) { diff --git a/admin/tests/unit/controllers/authenticated/certification-centers/get/team-test.js b/admin/tests/unit/controllers/authenticated/certification-centers/get/team-test.js index 002fa9200e6..8d6859b5c75 100644 --- a/admin/tests/unit/controllers/authenticated/certification-centers/get/team-test.js +++ b/admin/tests/unit/controllers/authenticated/certification-centers/get/team-test.js @@ -1,10 +1,12 @@ import Service from '@ember/service'; +import { setupIntl } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import sinon from 'sinon'; module('Unit | Controller | authenticated/certification-centers/get/team', function (hooks) { setupTest(hooks); + setupIntl(hooks, 'fr'); module('#updateEmailErrorMessage', function () { test('should set email error message if email syntax is invalid', function (assert) { diff --git a/admin/tests/unit/controllers/authenticated/organizations/get-test.js b/admin/tests/unit/controllers/authenticated/organizations/get-test.js index 8c47794f225..06f3caf12b4 100644 --- a/admin/tests/unit/controllers/authenticated/organizations/get-test.js +++ b/admin/tests/unit/controllers/authenticated/organizations/get-test.js @@ -1,3 +1,4 @@ +import { t } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -55,7 +56,7 @@ module('Unit | Controller | authenticated/organizations/get', function (hooks) { sinon.assert.calledOnce(controller.model.rollbackAttributes); sinon.assert.calledWith( controller.notifications.error, - this.intl.t('pages.organizations.notifications.errors.payload-too-large', { maxSizeInMegaBytes: '2.5' }), + t('pages.organizations.notifications.errors.payload-too-large', { maxSizeInMegaBytes: '2.5' }), ); assert.ok(true); }); diff --git a/admin/tests/unit/controllers/authenticated/sessions/session/informations-test.js b/admin/tests/unit/controllers/authenticated/sessions/session/informations-test.js index b808dbf78a1..c35931d0f60 100644 --- a/admin/tests/unit/controllers/authenticated/sessions/session/informations-test.js +++ b/admin/tests/unit/controllers/authenticated/sessions/session/informations-test.js @@ -1,4 +1,5 @@ import Service from '@ember/service'; +import { t } from 'ember-intl/test-support'; import { module, test } from 'qunit'; import sinon from 'sinon'; @@ -70,7 +71,7 @@ module('Unit | Controller | authenticated/sessions/session/informations', functi assert.strictEqual(controller.modalConfirmAction, controller.confirmAssignment); assert.deepEqual( controller.modalMessage, - this.intl.t('pages.sessions.informations.assignment-confirmation-modal', { fullName, htmlSafe: true }), + t('pages.sessions.informations.assignment-confirmation-modal', { fullName, htmlSafe: true }), ); assert.strictEqual(controller.modalTitle, 'Assignation de la session'); assert.true(controller.model.save.notCalled); diff --git a/admin/tests/unit/controllers/authenticated/users/get/certification-center-memberships-test.js b/admin/tests/unit/controllers/authenticated/users/get/certification-center-memberships-test.js index debbd64fe64..5ab774b38e5 100644 --- a/admin/tests/unit/controllers/authenticated/users/get/certification-center-memberships-test.js +++ b/admin/tests/unit/controllers/authenticated/users/get/certification-center-memberships-test.js @@ -1,9 +1,11 @@ +import { setupIntl } from 'ember-intl/test-support'; import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import sinon from 'sinon'; module('Unit | Controller | authenticated/users/get/certification-center-memberships', function (hooks) { setupTest(hooks); + setupIntl(hooks, 'fr'); let UserCertificationCenterMembership, notifications;