feat(module: i18n): add test for locale zh_TW

NG-ZORRO · Mar 27, 2019 · 14f1399 · 14f1399
1 parent 6583036
commit 14f1399
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/components/i18n/date-helper.service.spec.ts b/components/i18n/date-helper.service.spec.ts
@@ -1,12 +1,15 @@
 import { Injector } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
+import ngZhHantHK from '@angular/common/locales/zh-Hant-HK';
+
 import enDateLocale from 'date-fns/locale/en';
 import { NZ_DATE_CONFIG } from './date-config';
 import { DateHelperByDatePipe, DateHelperService } from './date-helper.service';
 import en_US from './languages/en_US';
+import zh_TW from './languages/zh_TW';
 import { NzI18nModule } from './nz-i18n.module';
-import { NZ_DATE_LOCALE, NZ_I18N } from './nz-i18n.token';
+import { NZ_DATE_LOCALE, NZ_I18N, NZ_I18N_LOCALEID } from './nz-i18n.token';
 
 describe('DateHelperService', () => {
   let injector: Injector;
@@ -37,6 +40,27 @@ describe('DateHelperService', () => {
     });
   });
 
+  describe('Formatting with DatePipe (use zh_TW)', () => {
+    beforeEach(() => {
+      injector = TestBed.configureTestingModule({
+        imports: [NzI18nModule],
+        providers: [{ provide: NZ_I18N, useValue: zh_TW }, { provide: NZ_I18N_LOCALEID, useValue: ngZhHantHK[0] }]
+      });
+
+      dateHelper = injector.get(DateHelperService);
+    });
+
+    it('should do formatting by DatePipe', () => {
+      expect(dateHelper instanceof DateHelperByDatePipe).toBeTruthy();
+    });
+
+    it('should do formatting correctly', () => {
+      const date = new Date('2018-12-31 12:11:10');
+      expect(dateHelper.format(date, 'yyyy-MM-dd')).toBe('2018-12-31');
+      expect(dateHelper.format(date, 'yyyy-ww')).toBe('2018-53');
+    });
+  });
+
   describe('Formatting with Data-fns', () => {
     beforeEach(() => {
       injector = TestBed.configureTestingModule({

diff --git a/components/i18n/nz-i18n.service.spec.ts b/components/i18n/nz-i18n.service.spec.ts
@@ -2,9 +2,12 @@ import { Injector } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import en_US from './languages/en_US';
 import zh_CN from './languages/zh_CN';
+import zh_TW from './languages/zh_TW';
 import { NzI18nModule } from './nz-i18n.module';
 import { NzI18nService } from './nz-i18n.service';
 
+import zhHantHK from '@angular/common/locales/zh-Hant-HK';
+
 describe('nz-i18n.service', () => {
   let injector: Injector;
   let srv: NzI18nService;
@@ -22,10 +25,16 @@ describe('nz-i18n.service', () => {
     // tslint:disable:no-string-literal
     it('should be auto default zh_CN', () => {
       expect(srv.getLocale().locale).toBe(DEFAULT_LAN.locale);
-    });
-    it('ng locale id should equal default locale', () => {
+      expect(srv.getLocaleId()).toBe(DEFAULT_LAN.locale);
       expect(srv.getNgLocaleId()).toBe(DEFAULT_LAN.locale);
     });
+    it('should set ngLocaleId to zh-hant-hk locale', () => {
+      spyOn(srv['_change'], 'next');
+      expect(srv['_change'].next).not.toHaveBeenCalled();
+      srv.setLocale(zh_TW, zhHantHK[0] + '');
+      expect(srv.getNgLocaleId()).toBe(zhHantHK[0]);
+      expect(srv.getLocaleId()).toBe(zh_TW.locale);
+    });
     it('should trigger changed when set different lang', () => {
       spyOn(srv['_change'], 'next');
       expect(srv['_change'].next).not.toHaveBeenCalled();

diff --git a/components/i18n/nz-i18n.service.ts b/components/i18n/nz-i18n.service.ts
@@ -52,7 +52,7 @@ export class NzI18nService {
     if (this._locale && this._locale.locale === locale.locale) {
       return;
     }
-    this._ngLocaleId = ngLocaleId || locale.locale;
+    this._ngLocaleId = ngLocaleId;
     this._locale = locale;
     this._change.next(locale);
   }