Fix/Add unit tests

Alfresco · Nov 11, 2020 · 46d0179 · 46d0179
1 parent 954ecb5
commit 46d0179
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 30 deletions.
diff --git a/...-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts b/...-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts
@@ -197,7 +197,7 @@ describe('ProcessFiltersCloudComponent', () => {
         const appName = 'my-app-1';
         const change = new SimpleChange(null, appName, true);
 
-        component.filterClick.subscribe((res) => {
+        component.filterSelected.subscribe((res) => {
             expect(res).toBeDefined();
             expect(component.currentFilter).toBeDefined();
             expect(component.currentFilter.name).toEqual('FakeRunningProcesses');
@@ -217,7 +217,7 @@ describe('ProcessFiltersCloudComponent', () => {
 
         fixture.detectChanges();
 
-        component.filterClick.subscribe((res) => {
+        component.filterSelected.subscribe((res) => {
             expect(res).toBeDefined();
             expect(component.currentFilter).toBeDefined();
             expect(component.currentFilter.name).toEqual('FakeCompletedProcesses');
@@ -236,7 +236,7 @@ describe('ProcessFiltersCloudComponent', () => {
         const change = new SimpleChange(null, appName, true);
         fixture.detectChanges();
 
-        component.filterClick.subscribe((res) => {
+        component.filterSelected.subscribe((res) => {
             expect(res).toBeDefined();
             expect(component.currentFilter).toBeDefined();
             expect(component.currentFilter.name).toEqual('FakeCompletedProcesses');
@@ -255,7 +255,7 @@ describe('ProcessFiltersCloudComponent', () => {
         const change = new SimpleChange(null, appName, true);
         fixture.detectChanges();
 
-        component.filterClick.subscribe((res) => {
+        component.filterSelected.subscribe((res) => {
             expect(res).toBeDefined();
             expect(component.currentFilter).toBeDefined();
             expect(component.currentFilter.name).toEqual('FakeCompletedProcesses');
@@ -275,7 +275,7 @@ describe('ProcessFiltersCloudComponent', () => {
         component.ngOnChanges({ 'appName': change });
         fixture.detectChanges();
 
-        component.filterClick.subscribe((res) => {
+        component.filterClicked.subscribe((res) => {
             expect(res).toBeDefined();
             expect(component.currentFilter).toBeDefined();
             expect(component.currentFilter.name).toEqual('FakeAllProcesses');

diff --git a/...s-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts b/...s-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts
@@ -254,22 +254,35 @@ describe('ServiceTaskFiltersCloudComponent', () => {
 
     }));
 
-    it('should emit an event when a filter is selected', async(() => {
+    it('should emit the selected filter based on the filterParam input', async () => {
         spyOn(serviceTaskFilterCloudService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);
+        spyOn(component.filterSelected, 'emit');
 
-        component.filterParam = { id: '12' };
+        const filterParam = { id: '10' };
+        const change = new SimpleChange(null, filterParam, true);
+        component.filterParam = filterParam;
 
-        const appName = 'my-app-1';
-        const change = new SimpleChange(null, appName, true);
-        component.ngOnChanges({ 'appName': change });
+        component.ngOnChanges({ 'filterParam': change });
+        fixture.detectChanges();
+
+        expect(component.filterSelected.emit).toHaveBeenCalledWith(fakeGlobalServiceFilters[0]);
+    });
+
+    it('should emit the clicked filter', async () => {
+        spyOn(serviceTaskFilterCloudService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);
+        spyOn(component.filterClicked, 'emit');
 
         fixture.detectChanges();
-        spyOn(component, 'selectFilterAndEmit').and.stub();
-        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalServiceFilters[1].key}_filter"]`);
+        await fixture.whenStable();
 
+        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalServiceFilters[0].key}_filter"]`);
         filterButton.click();
-        expect(component.selectFilterAndEmit).toHaveBeenCalledWith(fakeGlobalServiceFilters[1]);
-    }));
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        expect(component.filterClicked.emit).toHaveBeenCalledWith(fakeGlobalServiceFilters[0]);
+    });
 
     it('should reset the filter when the param is undefined', async(() => {
         spyOn(serviceTaskFilterCloudService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);

diff --git a/...rvices-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts b/...rvices-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts
@@ -102,7 +102,7 @@ export class ServiceTaskFiltersCloudComponent extends BaseTaskFiltersCloudCompon
     }
 
     /**
-     * Selects and emits the filter selected by the user
+     * Selects and emits the clicked filter.
      */
     public onFilterClick(filter: FilterParamsModel) {
         if (filter) {

diff --git a/...-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts b/...-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts
@@ -254,22 +254,35 @@ describe('TaskFiltersCloudComponent', () => {
 
     }));
 
-    it('should emit an event when a filter is selected', async(() => {
+    it('should emit the selected filter based on the filterParam input', async(() => {
         spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);
+        spyOn(component.filterSelected, 'emit');
 
-        component.filterParam = { id: '12' };
+        const filterParam = { id: '10' };
+        const change = new SimpleChange(null, filterParam, true);
+        component.filterParam = filterParam;
 
-        const appName = 'my-app-1';
-        const change = new SimpleChange(null, appName, true);
-        component.ngOnChanges({ 'appName': change });
+        component.ngOnChanges({ 'filterParam': change });
+        fixture.detectChanges();
+
+        expect(component.filterSelected.emit).toHaveBeenCalledWith(fakeGlobalFilter[0]);
+    }));
+
+    it('should emit the clicked filter', async () => {
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);
+        spyOn(component.filterClicked, 'emit');
 
         fixture.detectChanges();
-        spyOn(component, 'selectFilterAndEmit').and.stub();
-        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[1].key}_filter"]`);
+        await fixture.whenStable();
 
+        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[0].key}_filter"]`);
         filterButton.click();
-        expect(component.selectFilterAndEmit).toHaveBeenCalledWith(fakeGlobalFilter[1]);
-    }));
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        expect(component.filterClicked.emit).toHaveBeenCalledWith(fakeGlobalFilter[0]);
+    });
 
     it('should reset the filter when the param is undefined', async(() => {
         spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(fakeGlobalFilterObservable);

diff --git a/...ocess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts b/...ocess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts
@@ -101,7 +101,7 @@ export class TaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent imp
     }
 
     /**
-     * Selects and emits the filter selected by the user
+     * Selects and emits the clicked filter.
      */
     public onFilterClick(filter: FilterParamsModel) {
         if (filter) {

diff --git a/lib/process-services-cloud/src/lib/task/task-filters/mock/task-filters-cloud.mock.ts b/lib/process-services-cloud/src/lib/task/task-filters/mock/task-filters-cloud.mock.ts
@@ -22,23 +22,23 @@ export const fakeGlobalFilter = [
         name: 'FakeInvolvedTasks',
         key: 'fake-involved-tasks',
         icon: 'adjust',
-        id: 10,
+        id: '10',
         status: 'open',
         assignee: 'fake-involved'
     }),
     new TaskFilterCloudModel({
         name: 'FakeMyTasks1',
         key: 'fake-my-tast1',
         icon: 'done',
-        id: 11,
+        id: '11',
         status: 'open',
         assignee: 'fake-assignee'
     }),
     new TaskFilterCloudModel({
         name: 'FakeMyTasks2',
         key: 'fake-my-tast2',
         icon: 'inbox',
-        id: 12,
+        id: '12',
         status: 'open',
         assignee: 'fake-assignee'
     })

diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts
@@ -199,7 +199,7 @@ describe('ProcessFiltersComponent', () => {
             filter: { state: 'open', assignment: 'fake-involved' }
         });
 
-        filterList.filterClick.subscribe((filter: FilterProcessRepresentationModel) => {
+        filterList.filterClicked.subscribe((filter: FilterProcessRepresentationModel) => {
             expect(filter).toBeDefined();
             expect(filter).toEqual(currentFilter);
             expect(filterList.currentFilter).toEqual(currentFilter);

diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts
@@ -220,7 +220,7 @@ describe('TaskFiltersComponent', () => {
     it('should emit an event when a filter is selected', (done) => {
         const currentFilter = fakeGlobalFilter[0];
         component.filters = fakeGlobalFilter;
-        component.filterClick.subscribe((filter: FilterRepresentationModel) => {
+        component.filterClicked.subscribe((filter: FilterRepresentationModel) => {
             expect(filter).toBeDefined();
             expect(filter).toEqual(currentFilter);
             expect(component.currentFilter).toEqual(currentFilter);

diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.ts
@@ -177,6 +177,9 @@ export class TaskFiltersComponent implements OnInit, OnChanges {
         this.filterSelected.emit(this.currentFilter);
     }
 
+    /**
+     * Selects and emits the clicked filter.
+     */
     onFilterClick(filter: FilterParamsModel) {
         this.selectFilter(filter);
         this.filterClicked.emit(this.currentFilter);