Просмотр исходного кода

test(server): Fix failing tests, update jest & deps

Michael Bromley 7 лет назад
Родитель
Сommit
9d9c61e274

+ 2 - 2
server/package.json

@@ -68,13 +68,13 @@
     "graphql-request": "^1.6.0",
     "gulp": "^4.0.0",
     "husky": "^0.14.3",
-    "jest": "^21.2.1",
+    "jest": "^23.4.0",
     "lint-staged": "^7.1.3",
     "nodemon": "^1.14.1",
     "prettier": "^1.11.1",
     "rimraf": "^2.6.2",
     "supertest": "^3.0.0",
-    "ts-jest": "^21.2.4",
+    "ts-jest": "^23.0.0",
     "ts-node": "^6.0.0",
     "tsconfig-paths": "^3.3.1",
     "tslint": "5.3.2"

+ 2 - 1
server/src/i18n/messages/en.json

@@ -1,5 +1,6 @@
 {
   "error": {
-    "customer-with-id-not-found": "No customer with the id { customerId } was found"
+    "customer-with-id-not-found": "No customer with the id { customerId } was found",
+    "entity-has-no-translation-in-language": "Translatable entity '{ entityName }' has not been translated into the requested language ({ languageCode })"
   }
 }

+ 2 - 6
server/src/locale/translate-entity.spec.ts

@@ -72,17 +72,13 @@ describe('translateEntity()', () => {
     it('throw if there are no translations available', () => {
         product.translations = [];
 
-        expect(() => translateEntity(product, LanguageCode.EN)).toThrow(
-            'Translatable entity "Product" has not been translated into the requested language (en)',
-        );
+        expect(() => translateEntity(product, LanguageCode.EN)).toThrow('error.entity-has-no-translation-in-language');
     });
 
     it('throw if the desired translation is not available', () => {
         product.translations = [];
 
-        expect(() => translateEntity(product, LanguageCode.ZU)).toThrow(
-            'Translatable entity "Product" has not been translated into the requested language (zu)',
-        );
+        expect(() => translateEntity(product, LanguageCode.ZU)).toThrow('error.entity-has-no-translation-in-language');
     });
 });
 

+ 4 - 4
server/src/locale/translate-entity.ts

@@ -36,10 +36,10 @@ export function translateEntity<T extends Translatable>(translatable: T, languag
         translatable.translations && translatable.translations.find(t => t.languageCode === languageCode);
 
     if (!translation) {
-        throw new I18nError(
-            `Translatable entity '{{ entityName }}' has not been translated into the requested language ({{ languageCode }})`,
-            { entityName: translatable.constructor.name, languageCode },
-        );
+        throw new I18nError(`error.entity-has-no-translation-in-language`, {
+            entityName: translatable.constructor.name,
+            languageCode,
+        });
     }
 
     const translated = { ...(translatable as any) };

Разница между файлами не показана из-за своего большого размера
+ 397 - 300
server/yarn.lock


Некоторые файлы не были показаны из-за большого количества измененных файлов