V0.5.8, fixing all ut errors

alvachien · Mar 21, 2021 · c35d6d5 · c35d6d5
1 parent 0a089f7
commit c35d6d5
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acgallery",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,14 +1,10 @@
 import { TestBed, } from '@angular/core/testing';
-import { HttpClient } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { BehaviorSubject, of } from 'rxjs';
-import { Router, ActivatedRoute, UrlSegment } from '@angular/router';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { RouterLinkStubDirective } from '../testing';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 
 describe('AppComponent', () => {
   beforeEach(async() => {
@@ -20,9 +16,8 @@ describe('AppComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [
-        HttpClientTestingModule,
-        RouterTestingModule,
-        BrowserAnimationsModule,
+        TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [
         AppComponent,

diff --git a/src/app/models/photo.spec.ts b/src/app/models/photo.spec.ts
@@ -30,6 +30,6 @@ describe('Photo', () => {
   it('generateJson', () => {
     objInstance.photoId = 'Test 1';
     let odata = objInstance.generateJson();
-    expect(odata.PhotoID).toEqual(objInstance.photoId);
+    expect(odata.PhotoId).toEqual(objInstance.photoId);
   });
 });
diff --git a/src/app/pages/about/about.component.spec.ts b/src/app/pages/about/about.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { AboutComponent } from './about.component';
 
 describe('AboutComponent', () => {
@@ -11,6 +11,7 @@ describe('AboutComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [ AboutComponent ]
     })

diff --git a/src/app/pages/album/album-detail/album-detail.component.spec.ts b/src/app/pages/album/album-detail/album-detail.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { AlbumDetailComponent } from './album-detail.component';
 
 describe('AlbumDetailComponent', () => {
@@ -11,6 +11,7 @@ describe('AlbumDetailComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [ AlbumDetailComponent ]
     })

diff --git a/src/app/pages/album/album-list/album-list.component.spec.ts b/src/app/pages/album/album-list/album-list.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { AlbumListComponent } from './album-list.component';
 import { OdataService } from 'src/app/services';
 
@@ -12,6 +12,7 @@ describe('AlbumListComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [
         AlbumListComponent,

diff --git a/src/app/pages/credits/credits.component.spec.ts b/src/app/pages/credits/credits.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { CreditsComponent } from './credits.component';
 
 describe('CreditsComponent', () => {
@@ -11,6 +11,7 @@ describe('CreditsComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [
         CreditsComponent,

diff --git a/src/app/pages/photo/photo-detail/photo-detail.component.spec.ts b/src/app/pages/photo/photo-detail/photo-detail.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { PhotoDetailComponent } from './photo-detail.component';
 
 describe('PhotoDetailComponent', () => {
@@ -11,6 +11,7 @@ describe('PhotoDetailComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [ PhotoDetailComponent ]
     })

diff --git a/src/app/pages/photo/photo-list/photo-list.component.spec.ts b/src/app/pages/photo/photo-list/photo-list.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestingDependsModule } from 'src/testing/';
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { PhotoListComponent } from './photo-list.component';
 
 describe('PhotoListComponent', () => {
@@ -11,6 +11,7 @@ describe('PhotoListComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         TestingDependsModule,
+        getTranslocoModule(),
       ],
       declarations: [
         PhotoListComponent,

diff --git a/src/app/pages/photo/photo-upload/photo-upload.component.spec.ts b/src/app/pages/photo/photo-upload/photo-upload.component.spec.ts
@@ -1,5 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { PhotoUploadComponent } from './photo-upload.component';
 
 describe('PhotoUploadComponent', () => {
@@ -8,6 +9,10 @@ describe('PhotoUploadComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [
+        TestingDependsModule,
+        getTranslocoModule(),
+      ],
       declarations: [ PhotoUploadComponent ]
     })
     .compileComponents();

diff --git a/src/app/services/auth.guard.spec.ts b/src/app/services/auth.guard.spec.ts
@@ -1,12 +1,18 @@
 import { TestBed } from '@angular/core/testing';
 
+import { TestingDependsModule, getTranslocoModule } from 'src/testing/';
 import { AuthGuard } from './auth.guard';
 
 describe('AuthGuard', () => {
   let guard: AuthGuard;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      imports: [
+        TestingDependsModule,
+        getTranslocoModule(),
+      ]
+    });
     guard = TestBed.inject(AuthGuard);
   });
 

diff --git a/src/environments/environment.azure.ts b/src/environments/environment.azure.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  currentVersion: '0.5.6',
+  currentVersion: '0.5.8',
   currentReleaseDate: '2019.7.10',
   loggingLevel: 1, // Crash
   basehref: '/',

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  currentVersion: '0.5.6',
+  currentVersion: '0.5.8',
   currentReleaseDate: '2019.7.10',
   loggingLevel: 1, // Crash
   basehref: '/',

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -5,7 +5,7 @@
 
 export const environment = {
   production: false,
-  currentVersion: '0.5.6',
+  currentVersion: '0.5.8',
   currentReleaseDate: '2021.7.9',
   loggingLevel: 4, // Debug
   basehref: '/',

diff --git a/src/testing/index.ts b/src/testing/index.ts
@@ -3,3 +3,4 @@ export * from './route-link-stub-directive';
 
 export * from './fake-data-helper';
 export * from './testing-depends.module';
+export * from './transloco-testing.module';
diff --git a/src/testing/testing-depends.module.ts b/src/testing/testing-depends.module.ts
@@ -1,26 +1,20 @@
 import { NgModule } from '@angular/core';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { UIModulesModule } from 'src/app/ui-modules.module';
-import { getTranslocoModule } from './transloco-testing.module';
-import { TranslocoModule, TranslocoTestingModule } from '@ngneat/transloco';
 
 @NgModule({
     imports: [
-        TranslocoTestingModule.forRoot({
-        }),
     ],
     exports: [
         HttpClientTestingModule,
         FormsModule,
+        ReactiveFormsModule,
         NoopAnimationsModule,
         RouterTestingModule,
-
-        TranslocoTestingModule,
-
         UIModulesModule,
     ]
 })

diff --git a/src/testing/transloco-testing.module.ts b/src/testing/transloco-testing.module.ts
@@ -1,14 +1,15 @@
-import { TranslocoTestingModule, TranslocoConfig } from '@ngneat/transloco';
+import { TranslocoTestingModule, TranslocoConfig, TranslocoTestingOptions } from '@ngneat/transloco';
 import * as en from '../assets/i18n/en.json';
 import * as zh from '../assets/i18n/zh.json';
 
-export function getTranslocoModule(config: Partial<TranslocoConfig> = {}) {
-  return TranslocoTestingModule.withLangs(
-    { en, zh },
-    {
+export function getTranslocoModule(options: TranslocoTestingOptions = {}) {
+  return TranslocoTestingModule.forRoot({
+    langs: { en, zh },
+    translocoConfig: {
       availableLangs: ['en', 'zh'],
       defaultLang: 'en',
-      ...config
-    }
-  );
+    },
+    preloadLangs: true,
+    ...options
+  });
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ export * from './route-link-stub-directive';

		export * from './fake-data-helper';
		export * from './testing-depends.module';
		export * from './transloco-testing.module';