update command (to account for breaking change)

auto-mat · Sep 24, 2024 · be1365c · be1365c
1 parent 8d1f636
commit be1365c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 57 deletions.
diff --git a/src/components/__tests__/CountdownEvent.cy.js b/src/components/__tests__/CountdownEvent.cy.js
@@ -23,28 +23,11 @@ describe('<CountdownEvent>', () => {
   });
 
   it('has translation for all strings', () => {
-    const translationKeyList = [
-      'index.countdown.title',
-      'index.countdown.days',
-      'index.countdown.hours',
-      'index.countdown.minutes',
-      'index.countdown.seconds',
-    ];
-
-    translationKeyList.forEach((translationKey) => {
-      const defaultEnglishString = i18n.global.t(translationKey, 'en');
-
-      const locales = i18n.global.availableLocales;
-      locales
-        .filter((locale) => locale !== 'en')
-        .forEach((locale) => {
-          i18n.global.locale = locale;
-          const translatedString = i18n.global.t(translationKey);
-          cy.wrap(translatedString)
-            .should('be.a', 'string')
-            .and('not.equal', defaultEnglishString);
-        });
-    });
+    cy.testLanguageStringsInContext(
+      ['title', 'days', 'hours', 'minutes', 'seconds'],
+      'index.countdown',
+      i18n,
+    );
   });
 
   it('displays internationalized labels', () => {

diff --git a/src/components/__tests__/DrawerHeader.cy.js b/src/components/__tests__/DrawerHeader.cy.js
@@ -23,38 +23,22 @@ describe('<DrawerHeader>', () => {
   });
 
   it('has translation for all strings', () => {
-    const translationStrings = [
-      'titleStateDefault',
-      'titleStateContact',
-      'titleParticipants',
-      'titleCoordinators',
-      'titleGuide',
-      'buttonGuide',
-      'titleContact',
-      'buttonContact',
-      'titleLinks',
-      'titleSocials',
-    ];
-
-    const translationKeyList = translationStrings.map(
-      (item) => `index.help.${item}`,
+    cy.testLanguageStringsInContext(
+      [
+        'titleStateDefault',
+        'titleStateContact',
+        'titleParticipants',
+        'titleCoordinators',
+        'titleGuide',
+        'buttonGuide',
+        'titleContact',
+        'buttonContact',
+        'titleLinks',
+        'titleSocials',
+      ],
+      'index.help',
+      i18n,
     );
-
-    translationKeyList.forEach((translationKey) => {
-      const defaultEnglishString = i18n.global.t(translationKey, 'en');
-
-      const locales = i18n.global.availableLocales;
-      locales
-        .filter((locale) => locale !== 'en')
-        .forEach((locale) => {
-          i18n.global.locale = locale;
-          const translatedString = i18n.global.t(translationKey);
-
-          cy.wrap(translatedString)
-            .should('be.a', 'string')
-            .and('not.equal', defaultEnglishString);
-        });
-    });
   });
 
   it('renders logo', () => {

diff --git a/src/i18n/en.toml b/src/i18n/en.toml
@@ -154,7 +154,7 @@ labelCompanyShort = "Company"
 labelConfirmBillingDetails = "I confirm that the billing information above is correct"
 labelCoordinatorResponsibility = "I will arrange for the company to pay all or part of the entry fee for our employee team(s)."
 labelDonorEntryFee = "My organisation would like to support AutoMat and pay a charity entry fee of 500 CZK excluding VAT per person"
-labelEmail = "E-mail"
+labelEmail = "Email"
 labelFirstName = "First Name"
 labelGender = "Gender"
 labelHouseNumber = "House number"

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
@@ -51,14 +51,21 @@ Cypress.Commands.add(
     );
 
     translationKeyList.forEach((translationKey) => {
-      const defaultEnglishString = i18n.global.t(translationKey, 'en');
+      const defaultEnglishString = i18n.global.t(
+        translationKey,
+        {},
+        { locale: 'en' },
+      );
 
       const locales = i18n.global.availableLocales;
       locales
         .filter((locale) => locale !== 'en')
         .forEach((locale) => {
-          i18n.global.locale = locale;
-          const translatedString = i18n.global.t(translationKey);
+          const translatedString = i18n.global.t(
+            translationKey,
+            {},
+            { locale: locale },
+          );
 
           cy.wrap(translatedString)
             .should('be.a', 'string')