fix test

lib/core/services/upload.service.spec.ts

@@ -16,13 +16,12 @@
  */
 
 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 { AppConfigModule } from '../app-config/app-config.module';
 import { UploadService } from './upload.service';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { StorageService } from './storage.service';
 
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreTestingModule } from '../testing/core.testing.module';
@@ -31,6 +30,7 @@ declare let jasmine: any;
 
 describe('UploadService', () => {
     let service: UploadService;
+    let alfrescoApiService: AlfrescoApiService;
 
     setupTestBed({
         imports: [CoreTestingModule, AppConfigModule]
@@ -46,6 +46,7 @@ describe('UploadService', () => {
         };
 
         service = TestBed.get(UploadService);
+        alfrescoApiService = TestBed.get(AlfrescoApiService);
         service.queue = [];
         service.activeTask = null;
         jasmine.Ajax.install();
@@ -157,7 +158,7 @@ describe('UploadService', () => {
     });
 
     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();
 

lib/core/services/upload.service.ts

@@ -33,14 +33,15 @@ let minimatch: any = (<any> minimatch_).default || minimatch_;
 @Injectable()
 export class UploadService {
 
-    private queue: FileModel[] = [];
     private cache: { [key: string]: any } = {};
     private totalComplete: number = 0;
     private totalAborted: number = 0;
     private totalError: number = 0;
-    private activeTask: Promise<any> = null;
     private excludedFileList: String[] = [];
 
+    activeTask: Promise<any> = null;
+    queue: FileModel[] = [];
+
     queueChanged: Subject<FileModel[]> = new Subject<FileModel[]>();
     fileUpload: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
     fileUploadStarting: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();

lib/core/settings/host-settings.component.spec.ts

@@ -216,7 +216,6 @@ describe('HostSettingsComponent', () => {
 
     describe('OAUTH ', () => {
 
-        let ecmUrlInput;
         let bpmUrlInput;
         let oauthHostUrlInput;
         let clientIdInput;

lib/core/settings/host-settings.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, EventEmitter, Output, ViewEncapsulation, OnInit } from '@angular/core';
 import { Validators, FormGroup, FormBuilder, AbstractControl } from '@angular/forms';
-import { UserPreferencesService } from '../services';
+import { UserPreferencesService } from '../services/user-preferences.service';
 
 @Component({
     selector: 'adf-host-settings',