[BUMP] Update dependency ember-intl to v7 (admin)

#9689
1024pix · Aug 26, 2024 · 916450e · 916450e
2 parents 126ea85 + 690acd6
commit 916450e
Show file tree

Hide file tree

Showing 34 changed files with 184 additions and 220 deletions.
diff --git a/admin/package-lock.json b/admin/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(<template><AnonymizeGarImport /><NotificationContainer /></template>);
-      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(<template><AnonymizeGarImport /><NotificationContainer /></template>);
-      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(<template><AnonymizeGarImport /><NotificationContainer /></template>);
-        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(<template><AnonymizeGarImport /><NotificationContainer /></template>);
-        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')));
       });
     });
   });