From 6fea7543b0e43f285c0583259b5a99747df5476e Mon Sep 17 00:00:00 2001
From: dangapay <divin.angapay@lam.fr>
Date: Fri, 30 Sep 2022 15:24:20 +0200
Subject: [PATCH] corect tests for wepage resolvers
---
.../components/webpage-card.component.spec.ts | 67 +++++++++----------
.../webpage-family-card.component.spec.ts | 14 ++--
.../webpage-family-form.component.spec.ts | 2 +-
.../components/webpage-form.component.spec.ts | 24 +++----
.../containers/new-webpage.component.spec.ts | 6 +-
.../containers/webpage-list.component.spec.ts | 6 +-
.../edit-webpage-title.resolver.spec.ts | 6 +-
.../webpage/webpage-title.resolver.spec.ts | 14 ++--
.../instance/webpage/webpage.module.spec.ts | 13 ++--
9 files changed, 75 insertions(+), 77 deletions(-)
diff --git a/client/src/app/admin/instance/webpage/components/webpage-card.component.spec.ts b/client/src/app/admin/instance/webpage/components/webpage-card.component.spec.ts
index 2b28f485..87c1b835 100644
--- a/client/src/app/admin/instance/webpage/components/webpage-card.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/components/webpage-card.component.spec.ts
@@ -7,45 +7,44 @@
* file that was distributed with this source code.
*/
- import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
- import { ReactiveFormsModule } from '@angular/forms';
- import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
- import { WebpageCardComponent } from './webpage-card.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { WebpageCardComponent } from './webpage-card.component';
@Component({
selector: 'app-delete-btn',
})
-export class DeleteBtnComponent {}
-
- describe('[admin][instance][webpage][components]WebpageCardComponent ', () => {
- let component: WebpageCardComponent;
- let fixture: ComponentFixture<WebpageCardComponent>;
-
- beforeEach(() => {
- TestBed.configureTestingModule({
- declarations: [
+export class DeleteBtnComponent { }
+
+describe('[admin][instance][webpage][components]WebpageCardComponent ', () => {
+ let component: WebpageCardComponent;
+ let fixture: ComponentFixture<WebpageCardComponent>;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ declarations: [
WebpageCardComponent,
DeleteBtnComponent
- ],
- imports: [
- BrowserAnimationsModule,
- ReactiveFormsModule
- ],
-
- });
- fixture = TestBed.createComponent(WebpageCardComponent);
- component = fixture.componentInstance;
- component.webpage = {icon:'', content:'', display: 10, id: 0, id_webpage_family: 0, label:'', title:''};
- fixture.detectChanges();
-
- });
-
- it('should create the component', () => {
- expect(component).toBeTruthy();
- });
-
-
- });
-
\ No newline at end of file
+ ],
+ imports: [
+ BrowserAnimationsModule,
+ ReactiveFormsModule
+ ],
+
+ });
+ fixture = TestBed.createComponent(WebpageCardComponent);
+ component = fixture.componentInstance;
+ component.webpage = { icon: '', content: '', display: 10, id: 0, id_webpage_family: 0, label: '', title: '' };
+ fixture.detectChanges();
+
+ });
+
+ it('should create the component', () => {
+ expect(component).toBeTruthy();
+ });
+
+
+});
diff --git a/client/src/app/admin/instance/webpage/components/webpage-family-card.component.spec.ts b/client/src/app/admin/instance/webpage/components/webpage-family-card.component.spec.ts
index 9dcc7423..59c9ed9c 100644
--- a/client/src/app/admin/instance/webpage/components/webpage-family-card.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/components/webpage-family-card.component.spec.ts
@@ -15,27 +15,27 @@ import { Webpage } from 'src/app/metamodel/models';
import { WebpageFamilyCardComponent } from './webpage-family-card.component';
// mock webpageListByFamilyPipe
-@Pipe({name: 'webpageListByFamily'})
+@Pipe({ name: 'webpageListByFamily' })
class MockPipe implements PipeTransform {
transform(webpageList: Webpage[], idWebpageFamily: number): Webpage[] {
return webpageList.filter(webpage => webpage.id_webpage_family === idWebpageFamily);
}
}
-class DummyComponent {}
+class DummyComponent { }
@Component({
selector: 'app-edit-webpage'
})
-class EditWebpageComponent{}
+class EditWebpageComponent { }
@Component({
selector: 'app-delete-btn'
})
-class DeleteBtnComponenent{}
+class DeleteBtnComponenent { }
@Component({
selector: 'app-webpage-card'
})
-class WebPageComponent{}
+class WebPageComponent { }
describe('[admin][instance][webpage][components] WebpageFamilyCardComponent ', () => {
let component: WebpageFamilyCardComponent;
@@ -54,7 +54,7 @@ describe('[admin][instance][webpage][components] WebpageFamilyCardComponent ', (
BrowserAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'test', component: DummyComponent }
- ])
+ ])
],
});
@@ -77,7 +77,7 @@ describe('[admin][instance][webpage][components] WebpageFamilyCardComponent ', (
it(' nbWebpagesByWebpageFamily should return 2', () => {
- expect(component.nbWebpagesByWebpageFamily()).toEqual(2);
+ expect(component.nbWebpagesByWebpageFamily()).toEqual(2);
})
diff --git a/client/src/app/admin/instance/webpage/components/webpage-family-form.component.spec.ts b/client/src/app/admin/instance/webpage/components/webpage-family-form.component.spec.ts
index c92c9015..c5ac034b 100644
--- a/client/src/app/admin/instance/webpage/components/webpage-family-form.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/components/webpage-family-form.component.spec.ts
@@ -16,7 +16,7 @@ import { WebpageFamilyFormComponent } from './webpage-family-form.component';
describe('[admin][instance][webpage][components] WebpageFamilyFormComponent', () => {
let component: WebpageFamilyFormComponent;
let fixture: ComponentFixture<WebpageFamilyFormComponent>;
- let spy = null;
+ let spy;
let webpageFamilly: WebpageFamily = { display: 10, icon: 'test', id: 0, label: 'webpageFamilly test label' };
let form = new UntypedFormGroup({
label: new UntypedFormControl('test', [Validators.required]),
diff --git a/client/src/app/admin/instance/webpage/components/webpage-form.component.spec.ts b/client/src/app/admin/instance/webpage/components/webpage-form.component.spec.ts
index 61318868..5f8dce02 100644
--- a/client/src/app/admin/instance/webpage/components/webpage-form.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/components/webpage-form.component.spec.ts
@@ -14,8 +14,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { Webpage } from 'src/app/metamodel/models';
import { WebpageFormComponent } from './webpage-form.component';
-@Component({selector: 'app-webpage-form-content'})
-class WebpageFormContentComponent{}
+@Component({ selector: 'app-webpage-form-content' })
+class WebpageFormContentComponent { }
describe('[admin][instance][webpage][components]WebpageFormComponent ', () => {
let component: WebpageFormComponent;
let fixture: ComponentFixture<WebpageFormComponent>;
@@ -28,7 +28,7 @@ describe('[admin][instance][webpage][components]WebpageFormComponent ', () => {
content: new UntypedFormControl('', [Validators.required]),
id_webpage_family: new UntypedFormControl('', [Validators.required])
});
- let webpage: Webpage = { icon: '', content: '', display: 10, id: 0, id_webpage_family: 0, label: '', title: '' };
+ let webpage: Webpage = { icon: '', content: '', display: 10, id: 0, id_webpage_family: 0, label: '', title: '' };
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [
@@ -55,22 +55,22 @@ describe('[admin][instance][webpage][components]WebpageFormComponent ', () => {
expect(component).toBeTruthy();
});
- it('should emit with webpage and form.getRawValue()', () =>{
+ it('should emit with webpage and form.getRawValue()', () => {
component.submit();
expect(spy).toHaveBeenCalledTimes(1);
- expect(spy).toHaveBeenCalledWith({...component.webpage, ...component.form.getRawValue() });
-
+ expect(spy).toHaveBeenCalledWith({ ...component.webpage, ...component.form.getRawValue() });
+
})
- it('should emit with webpage only', () =>{
+ it('should emit with webpage only', () => {
component.webpage = null;
component.submit();
expect(spy).toHaveBeenCalledTimes(1);
- expect(spy).toHaveBeenCalledWith({...component.form.getRawValue() });
-
+ expect(spy).toHaveBeenCalledWith({ ...component.form.getRawValue() });
+
})
- it('should set id_webpage_family form value with idWebpageFamily ', () =>{
- expect(component.form.controls['id_webpage_family'].value).toEqual(component.idWebpageFamily);
-
+ it('should set id_webpage_family form value with idWebpageFamily ', () => {
+ expect(component.form.controls['id_webpage_family'].value).toEqual(component.idWebpageFamily);
+
})
diff --git a/client/src/app/admin/instance/webpage/containers/new-webpage.component.spec.ts b/client/src/app/admin/instance/webpage/containers/new-webpage.component.spec.ts
index 3a10e8f5..01f1f16c 100644
--- a/client/src/app/admin/instance/webpage/containers/new-webpage.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/containers/new-webpage.component.spec.ts
@@ -15,7 +15,7 @@ import { Webpage } from 'src/app/metamodel/models';
import { NewWebpageComponent } from './new-webpage.component';
import * as webpageActions from 'src/app/metamodel/actions/webpage.actions';
import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
+import { of } from 'rxjs';
describe('[admin][instance][webpage][containers] NewWebpageComponent ', () => {
let component: NewWebpageComponent;
@@ -54,9 +54,9 @@ describe('[admin][instance][webpage][containers] NewWebpageComponent ', () => {
});
it('should create the component', () => {
-
+
expect(component).toBeTruthy();
-
+
});
it('dispatch webpageActions.addWebPage with the new webpage values', () => {
let webpage: Webpage = { icon: '', content: '', display: 10, id: 0, id_webpage_family: 0, label: '', title: '' };
diff --git a/client/src/app/admin/instance/webpage/containers/webpage-list.component.spec.ts b/client/src/app/admin/instance/webpage/containers/webpage-list.component.spec.ts
index 59aef099..035a4810 100644
--- a/client/src/app/admin/instance/webpage/containers/webpage-list.component.spec.ts
+++ b/client/src/app/admin/instance/webpage/containers/webpage-list.component.spec.ts
@@ -8,7 +8,7 @@
*/
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ReactiveFormsModule, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { Webpage, WebpageFamily } from 'src/app/metamodel/models';
@@ -37,7 +37,9 @@ describe('[admin][instance][webpage][containers] WebpageListComponent ', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [
- WebpageListComponent
+ WebpageListComponent,
+ WebpageButtonsComponent,
+ WebpageCardComponent
],
imports: [
BrowserAnimationsModule,
diff --git a/client/src/app/admin/instance/webpage/edit-webpage-title.resolver.spec.ts b/client/src/app/admin/instance/webpage/edit-webpage-title.resolver.spec.ts
index 44632572..cf0fa0f9 100644
--- a/client/src/app/admin/instance/webpage/edit-webpage-title.resolver.spec.ts
+++ b/client/src/app/admin/instance/webpage/edit-webpage-title.resolver.spec.ts
@@ -29,9 +29,9 @@ describe('[Webpage] EditWebpageTitleResolver', () => {
]
})
let webpage: Webpage = { icon: '', content: '', display: 10, id: 0, id_webpage_family: 0, label: 'webpage_test_label', title: '' };
- let instance: Instance ;
- instance = {...instance, label:'instance_test_label'}
-
+ let instance: Instance;
+ instance = { ...instance, label: 'instance_test_label' }
+
store = TestBed.inject(MockStore);
editWebpageTitleResolver = TestBed.inject(EditWebpageTitleResolver);
diff --git a/client/src/app/admin/instance/webpage/webpage-title.resolver.spec.ts b/client/src/app/admin/instance/webpage/webpage-title.resolver.spec.ts
index b8877ccb..ae5e3734 100644
--- a/client/src/app/admin/instance/webpage/webpage-title.resolver.spec.ts
+++ b/client/src/app/admin/instance/webpage/webpage-title.resolver.spec.ts
@@ -7,19 +7,17 @@
* file that was distributed with this source code.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { cold, hot } from 'jasmine-marbles';
-import * as webpageSelector from 'src/app/metamodel/selectors/webpage.selector';
+import { cold} from 'jasmine-marbles';
import * as instanceSelector from 'src/app/metamodel/selectors/instance.selector';
-import { Instance, Webpage } from 'src/app/metamodel/models';
+import { Instance} from 'src/app/metamodel/models';
import { WebpageTitleResolver } from './webpage-title.resolver';
import { ActivatedRouteSnapshot } from '@angular/router';
-import { Component } from '@angular/core';
import { WebpageListComponent } from './containers/webpage-list.component';
-describe('[Webpage] EditWebpageTitleResolver', () => {
+describe('[Webpage] WebpageTitleResolver', () => {
let webpageTitleResolver: WebpageTitleResolver;
let store: MockStore;
let component;
@@ -47,7 +45,7 @@ describe('[Webpage] EditWebpageTitleResolver', () => {
it('shoud return nstance_test_label - Webpages list on resolve call', () => {
const expected = cold('a', { a: instance.label + " - Webpages list" });
let route: ActivatedRouteSnapshot;
- component = {name: 'WebpageListComponent'}
+ component = { name: 'WebpageListComponent' }
route = { ...route, component: component, children: [], root: null, parent: null, firstChild: null, pathFromRoot: null, paramMap: null, queryParamMap: null };
let result = webpageTitleResolver.resolve(route, null);
expect(result).toBeObservable(expected);
@@ -55,7 +53,7 @@ describe('[Webpage] EditWebpageTitleResolver', () => {
it('shoud return nstance_test_label - New webpage on resolve call', () => {
const expected = cold('a', { a: instance.label + " - New webpage" });
let route: ActivatedRouteSnapshot;
- component = {name: 'test'}
+ component = { name: 'test' }
route = { ...route, component: component, children: [], root: null, parent: null, firstChild: null, pathFromRoot: null, paramMap: null, queryParamMap: null };
let result = webpageTitleResolver.resolve(route, null);
expect(result).toBeObservable(expected);
diff --git a/client/src/app/admin/instance/webpage/webpage.module.spec.ts b/client/src/app/admin/instance/webpage/webpage.module.spec.ts
index fec72243..ca05d8db 100644
--- a/client/src/app/admin/instance/webpage/webpage.module.spec.ts
+++ b/client/src/app/admin/instance/webpage/webpage.module.spec.ts
@@ -7,11 +7,10 @@
* file that was distributed with this source code.
*/
- import { WebpageModule } from './webpage.module';
+import { WebpageModule } from './webpage.module';
- describe('[Webpage] DatabaseModule', () => {
- it('Test WebPage module', () => {
- expect(WebpageModule.name).toEqual('WebpageModule');
- });
- });
-
\ No newline at end of file
+describe('[Webpage] WebModule', () => {
+ it('Test WebPage module', () => {
+ expect(WebpageModule.name).toEqual('WebpageModule');
+ });
+});
--
GitLab