[affected:*][ci:force] - Fixed problem after rebase

This commit is contained in:
Vito Albano 2024-04-16 11:45:08 +01:00 committed by VitoAlbano
parent a86d6bbccb
commit cd4e5f78f1
3 changed files with 15 additions and 13 deletions

View File

@ -17,12 +17,13 @@
import { EventEmitter } from '@angular/core'; import { EventEmitter } from '@angular/core';
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigModule, AppConfigService } from '@alfresco/adf-core'; import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigModule, AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
import { UploadService } from './upload.service'; import { UploadService } from './upload.service';
import { RepositoryInfo } from '@alfresco/js-api'; import { RepositoryInfo } from '@alfresco/js-api';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { DiscoveryApiService } from '../../common/services/discovery-api.service'; import { DiscoveryApiService } from '../../common/services/discovery-api.service';
import { FileModel, FileUploadStatus } from '../../common/models/file.model'; import { FileModel, FileUploadStatus } from '../../common/models/file.model';
import { HttpClientTestingModule } from '@angular/common/http/testing';
declare let jasmine: any; declare let jasmine: any;
@ -35,10 +36,11 @@ describe('UploadService', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [AppConfigModule], imports: [AppConfigModule, HttpClientTestingModule],
providers: [ providers: [
UploadService, UploadService,
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ {
provide: DiscoveryApiService, provide: DiscoveryApiService,
useValue: { useValue: {

View File

@ -37,7 +37,7 @@ describe('FolderDialogComponent', () => {
let createFolderSpy: jasmine.Spy; let createFolderSpy: jasmine.Spy;
const updateNode$ = new BehaviorSubject(null); const updateNode$ = new BehaviorSubject(null);
const createFolderNode$ = new BehaviorSubject(null); let createFolderNode$ = null;
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@ -48,6 +48,7 @@ describe('FolderDialogComponent', () => {
fixture = TestBed.createComponent(FolderDialogComponent); fixture = TestBed.createComponent(FolderDialogComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
nodesApi = TestBed.inject(NodesApiService); nodesApi = TestBed.inject(NodesApiService);
createFolderNode$ = new BehaviorSubject(null);
createFolderSpy = spyOn(nodesApi, 'createFolder').and.returnValue(createFolderNode$); createFolderSpy = spyOn(nodesApi, 'createFolder').and.returnValue(createFolderNode$);
updateNodeSpy = spyOn(nodesApi, 'updateNode').and.returnValue(updateNode$); updateNodeSpy = spyOn(nodesApi, 'updateNode').and.returnValue(updateNode$);
@ -273,8 +274,13 @@ describe('FolderDialogComponent', () => {
}); });
describe('Error events', () => { describe('Error events', () => {
let errorSubscriber = null;
afterEach(() => { afterEach(() => {
createFolderNode$.next(null); createFolderNode$.next(null);
if (errorSubscriber) {
errorSubscriber.complete();
}
}); });
it('should raise error for 409', (done) => { it('should raise error for 409', (done) => {
@ -283,7 +289,7 @@ describe('FolderDialogComponent', () => {
}; };
createFolderNode$.error(error); createFolderNode$.error(error);
component.error.subscribe((message) => { errorSubscriber = component.error.subscribe((message) => {
expect(message).toBe('CORE.MESSAGES.ERRORS.EXISTENT_FOLDER'); expect(message).toBe('CORE.MESSAGES.ERRORS.EXISTENT_FOLDER');
done(); done();
}); });
@ -300,7 +306,7 @@ describe('FolderDialogComponent', () => {
}; };
createFolderNode$.error(error); createFolderNode$.error(error);
component.error.subscribe((message) => { errorSubscriber = component.error.subscribe((message) => {
expect(message).toBe('CORE.MESSAGES.ERRORS.GENERIC'); expect(message).toBe('CORE.MESSAGES.ERRORS.GENERIC');
done(); done();
}); });

View File

@ -53,14 +53,8 @@ describe('InfiniteSelectScrollDirective', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [MatSelectModule, NoopAnimationsModule, InfiniteSelectScrollDirective],
MatSelectModule, declarations: [TestComponent]
NoopAnimationsModule
],
declarations: [
TestComponent,
InfiniteSelectScrollDirective
]
}); });
fixture = TestBed.createComponent(TestComponent); fixture = TestBed.createComponent(TestComponent);
component = fixture.componentInstance; component = fixture.componentInstance;