mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-06-30 18:15:11 +00:00
fix test
This commit is contained in:
parent
cb88a22a76
commit
fd7bb49289
@ -16,13 +16,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { EventEmitter } from '@angular/core';
|
import { EventEmitter } from '@angular/core';
|
||||||
import { async, TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { FileModel, FileUploadOptions, FileUploadStatus } from '../models/file.model';
|
import { FileModel, FileUploadOptions, FileUploadStatus } from '../models/file.model';
|
||||||
import { AppConfigModule } from '../app-config/app-config.module';
|
import { AppConfigModule } from '../app-config/app-config.module';
|
||||||
import { UploadService } from './upload.service';
|
import { UploadService } from './upload.service';
|
||||||
import { AppConfigService } from '../app-config/app-config.service';
|
import { AppConfigService } from '../app-config/app-config.service';
|
||||||
import { AlfrescoApiService } from './alfresco-api.service';
|
import { AlfrescoApiService } from './alfresco-api.service';
|
||||||
import { StorageService } from './storage.service';
|
|
||||||
|
|
||||||
import { setupTestBed } from '../testing/setupTestBed';
|
import { setupTestBed } from '../testing/setupTestBed';
|
||||||
import { CoreTestingModule } from '../testing/core.testing.module';
|
import { CoreTestingModule } from '../testing/core.testing.module';
|
||||||
@ -31,6 +30,7 @@ declare let jasmine: any;
|
|||||||
|
|
||||||
describe('UploadService', () => {
|
describe('UploadService', () => {
|
||||||
let service: UploadService;
|
let service: UploadService;
|
||||||
|
let alfrescoApiService: AlfrescoApiService;
|
||||||
|
|
||||||
setupTestBed({
|
setupTestBed({
|
||||||
imports: [CoreTestingModule, AppConfigModule]
|
imports: [CoreTestingModule, AppConfigModule]
|
||||||
@ -46,6 +46,7 @@ describe('UploadService', () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
service = TestBed.get(UploadService);
|
service = TestBed.get(UploadService);
|
||||||
|
alfrescoApiService = TestBed.get(AlfrescoApiService);
|
||||||
service.queue = [];
|
service.queue = [];
|
||||||
service.activeTask = null;
|
service.activeTask = null;
|
||||||
jasmine.Ajax.install();
|
jasmine.Ajax.install();
|
||||||
@ -157,7 +158,7 @@ describe('UploadService', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('If newVersion is set, name should be a param', () => {
|
it('If newVersion is set, name should be a param', () => {
|
||||||
let uploadFileSpy = spyOn(service.apiService.getInstance().upload, 'uploadFile').and.callThrough();
|
let uploadFileSpy = spyOn(alfrescoApiService.getInstance().upload, 'uploadFile').and.callThrough();
|
||||||
|
|
||||||
let emitter = new EventEmitter();
|
let emitter = new EventEmitter();
|
||||||
|
|
||||||
|
@ -33,14 +33,15 @@ let minimatch: any = (<any> minimatch_).default || minimatch_;
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class UploadService {
|
export class UploadService {
|
||||||
|
|
||||||
private queue: FileModel[] = [];
|
|
||||||
private cache: { [key: string]: any } = {};
|
private cache: { [key: string]: any } = {};
|
||||||
private totalComplete: number = 0;
|
private totalComplete: number = 0;
|
||||||
private totalAborted: number = 0;
|
private totalAborted: number = 0;
|
||||||
private totalError: number = 0;
|
private totalError: number = 0;
|
||||||
private activeTask: Promise<any> = null;
|
|
||||||
private excludedFileList: String[] = [];
|
private excludedFileList: String[] = [];
|
||||||
|
|
||||||
|
activeTask: Promise<any> = null;
|
||||||
|
queue: FileModel[] = [];
|
||||||
|
|
||||||
queueChanged: Subject<FileModel[]> = new Subject<FileModel[]>();
|
queueChanged: Subject<FileModel[]> = new Subject<FileModel[]>();
|
||||||
fileUpload: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
|
fileUpload: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
|
||||||
fileUploadStarting: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
|
fileUploadStarting: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
|
||||||
|
@ -216,7 +216,6 @@ describe('HostSettingsComponent', () => {
|
|||||||
|
|
||||||
describe('OAUTH ', () => {
|
describe('OAUTH ', () => {
|
||||||
|
|
||||||
let ecmUrlInput;
|
|
||||||
let bpmUrlInput;
|
let bpmUrlInput;
|
||||||
let oauthHostUrlInput;
|
let oauthHostUrlInput;
|
||||||
let clientIdInput;
|
let clientIdInput;
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
import { Component, EventEmitter, Output, ViewEncapsulation, OnInit } from '@angular/core';
|
import { Component, EventEmitter, Output, ViewEncapsulation, OnInit } from '@angular/core';
|
||||||
import { Validators, FormGroup, FormBuilder, AbstractControl } from '@angular/forms';
|
import { Validators, FormGroup, FormBuilder, AbstractControl } from '@angular/forms';
|
||||||
import { UserPreferencesService } from '../services';
|
import { UserPreferencesService } from '../services/user-preferences.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'adf-host-settings',
|
selector: 'adf-host-settings',
|
||||||
|
@ -97,6 +97,7 @@ describe('ProcessAttachmentListComponent', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
fixture.destroy();
|
||||||
const overlayContainers = <any> window.document.querySelectorAll('.cdk-overlay-container');
|
const overlayContainers = <any> window.document.querySelectorAll('.cdk-overlay-container');
|
||||||
|
|
||||||
overlayContainers.forEach((overlayContainer) => {
|
overlayContainers.forEach((overlayContainer) => {
|
||||||
|
@ -562,7 +562,6 @@ class EmptyTemplateComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('Custom EmptyTemplateComponent', () => {
|
describe('Custom EmptyTemplateComponent', () => {
|
||||||
let component: EmptyTemplateComponent;
|
|
||||||
let fixture: ComponentFixture<EmptyTemplateComponent>;
|
let fixture: ComponentFixture<EmptyTemplateComponent>;
|
||||||
|
|
||||||
setupTestBed({
|
setupTestBed({
|
||||||
@ -574,7 +573,6 @@ describe('Custom EmptyTemplateComponent', () => {
|
|||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(EmptyTemplateComponent);
|
fixture = TestBed.createComponent(EmptyTemplateComponent);
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
component = fixture.componentInstance;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should render the custom template', async(() => {
|
it('should render the custom template', async(() => {
|
||||||
|
@ -64,7 +64,7 @@ describe('TaskFiltersComponent', () => {
|
|||||||
error: 'wrong request'
|
error: 'wrong request'
|
||||||
};
|
};
|
||||||
|
|
||||||
let mockErrorFilterPromise = new Promise.reject(mockErrorFilterList);
|
let mockErrorFilterPromise = Promise.reject(mockErrorFilterList);
|
||||||
|
|
||||||
let component: TaskFiltersComponent;
|
let component: TaskFiltersComponent;
|
||||||
let fixture: ComponentFixture<TaskFiltersComponent>;
|
let fixture: ComponentFixture<TaskFiltersComponent>;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user