mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)
* upgrade to HttpClient * upgrade to Renderer2 * upgrade Document reference * remove useless test with deprecated ReflectiveInjector * upgrade to latest typescript * upgrade libs * upgrade package scripts * remove rxjs blacklists and duplicate rules * add rxjs compat to help with migration * fix breaking changes * fix breaking changes in material * fix breaking changes (material 6) * upgrade rxjs, ngx-translate and flex layout * update unit tests * restore providers * upgrade deprecated Observable.error * rebase fix first configuration problems * fix style issues commented * fix core build * fix lib template errors * move lib test execution in angular.json * ignore * karma conf files * fix import statement test * single run option * update packages reporter * restore report * increase timeout * improve karma conf test configuration * fix test issues about lint * fix test analytics * fix process service test * content service fix test * fix logout directive test * fix core test * fix build * update node-sass to latest * update angular cli dependencies * improve build script create directorites and move files only if previous command succeded * upgrade individual libs to 6.0 * remove old webpack files * revert sass change * fix type issues fix style issues * fix tslint demo shell issue * fix peerdependencies * fix test e2e BC * package upate * fix style import issue * extract-text-webpack-plugin beta * fix test dist build command * remove alpha js-api * fix tslint issue add banner tslint rule * upload service fix * change BC script * fix test dist script * increase demo shell timeout test * verbose copy * path absolute * fix script bc * fix copy part * fix path warning fix monaco editor * remove duplicate header * remove unused import * fix align and check ago tests * add missing import * fix notification button selector * [ANGULAR6] fixed core tests * fix CS test * fix cs test step 2 * increase travis_wait for dist * fix attachment PS * fix checklist test * use pdf min
This commit is contained in:
committed by
Eugenio Romano
parent
c510ec864d
commit
6b24bfb1d4
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { TranslationService, FileUploadStatus, NodesApiService, UploadService,
|
||||
setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock
|
||||
} from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of, throwError } from 'rxjs';
|
||||
import { UploadModule } from '../upload.module';
|
||||
import { FileUploadingListComponent } from './file-uploading-list.component';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
@@ -57,7 +57,7 @@ describe('FileUploadingListComponent', () => {
|
||||
fixture = TestBed.createComponent(FileUploadingListComponent);
|
||||
component = fixture.componentInstance;
|
||||
|
||||
spyOn(translateService, 'get').and.returnValue(Observable.of('some error message'));
|
||||
spyOn(translateService, 'get').and.returnValue(of('some error message'));
|
||||
spyOn(uploadService, 'cancelUpload');
|
||||
});
|
||||
|
||||
@@ -71,7 +71,7 @@ describe('FileUploadingListComponent', () => {
|
||||
|
||||
describe('removeFile()', () => {
|
||||
it('should change file status when api returns success', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
|
||||
|
||||
component.removeFile(file);
|
||||
fixture.detectChanges();
|
||||
@@ -80,7 +80,7 @@ describe('FileUploadingListComponent', () => {
|
||||
});
|
||||
|
||||
it('should change file status when api returns error', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
|
||||
|
||||
component.removeFile(file);
|
||||
fixture.detectChanges();
|
||||
@@ -89,7 +89,7 @@ describe('FileUploadingListComponent', () => {
|
||||
});
|
||||
|
||||
it('should call uploadService on error', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
|
||||
|
||||
component.removeFile(file);
|
||||
fixture.detectChanges();
|
||||
@@ -98,7 +98,7 @@ describe('FileUploadingListComponent', () => {
|
||||
});
|
||||
|
||||
it('should call uploadService on success', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
|
||||
|
||||
component.removeFile(file);
|
||||
fixture.detectChanges();
|
||||
@@ -109,7 +109,7 @@ describe('FileUploadingListComponent', () => {
|
||||
describe('Events', () => {
|
||||
|
||||
it('should throw an error event if delete file goes wrong', (done) => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
|
||||
|
||||
component.error.subscribe(() => {
|
||||
done();
|
||||
@@ -153,7 +153,7 @@ describe('FileUploadingListComponent', () => {
|
||||
});
|
||||
|
||||
it('should call deleteNode when there are completed uploads', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
|
||||
|
||||
component.files[0].status = FileUploadStatus.Complete;
|
||||
component.cancelAllFiles();
|
||||
@@ -162,7 +162,7 @@ describe('FileUploadingListComponent', () => {
|
||||
});
|
||||
|
||||
it('should call uploadService when there are uploading files', () => {
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
|
||||
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
|
||||
|
||||
component.files[0].status = FileUploadStatus.Progress;
|
||||
component.cancelAllFiles();
|
||||
|
Reference in New Issue
Block a user