inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Angular 6 (#556)

Browse Source 
* upgrade to angular 6 (with rxjs-compat)

* fix tests

* fix test scripts

* upgrade rxjs to 6.0

* remove rxjs-compat layer

* update unit tests

* restore tests

* context-menu transparent backdrop

* upgrade libs

* changed snackbar locator

* locator as class

* remove locator element reference

* snackbar locators

* wait for snackbar before executing the action button

* expect cdk-overlay before mat-menu-panel condition

* update libs
This commit is contained in:
Denys Vuika
2018-08-09 11:11:06 +01:00
committed by GitHub
parent 4668112871
commit f91608fe78
54 changed files with 3512 additions and 1976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/app/components/files/files.component.spec.ts
View File

@@ -23,7 +23,6 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { Observable } from 'rxjs/Rx';
import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
@@ -40,6 +39,7 @@ import { FilesComponent } from './files.component';
import { AppTestingModule } from '../../testing/app-testing.module';
import { ContentApiService } from '../../services/content-api.service';
import { ExperimentalDirective } from '../../directives/experimental.directive';
import { of, throwError } from 'rxjs';
describe('FilesComponent', () => {
let node;
@@ -51,11 +51,6 @@ describe('FilesComponent', () => {
let nodeActionsService: NodeActionsService;
let contentApi: ContentApiService;
beforeAll(() => {
// testing only functional-wise not time-wise
Observable.prototype.debounceTime = function () { return this; };
});
beforeEach(() => {
TestBed.configureTestingModule({
imports: [ AppTestingModule ],
@@ -73,7 +68,7 @@ describe('FilesComponent', () => {
providers: [
{ provide: ActivatedRoute, useValue: {
snapshot: { data: { preferencePrefix: 'prefix' } },
params: Observable.of({ folderId: 'someId' })
params: of({ folderId: 'someId' })
} }
],
schemas: [ NO_ERRORS_SCHEMA ]
@@ -96,7 +91,7 @@ describe('FilesComponent', () => {
describe('Current page is valid', () => {
it('should be a valid current page', fakeAsync(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.throw(null));
spyOn(contentApi, 'getNode').and.returnValue(throwError(null));
component.ngOnInit();
fixture.detectChanges();
@@ -106,7 +101,7 @@ describe('FilesComponent', () => {
}));
it('should set current page as invalid path', fakeAsync(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
component.ngOnInit();
tick();
@@ -118,7 +113,7 @@ describe('FilesComponent', () => {
describe('OnInit', () => {
it('should set current node', () => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
fixture.detectChanges();
expect(component.node).toBe(node);
});
@@ -126,7 +121,7 @@ describe('FilesComponent', () => {
it('if should navigate to parent if node is not a folder', () => {
node.isFolder = false;
node.parentId = 'parent-id';
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(router, 'navigate');
fixture.detectChanges();
@@ -137,7 +132,7 @@ describe('FilesComponent', () => {
describe('refresh on events', () => {
beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(component.documentList, 'reload');
fixture.detectChanges();
@@ -199,47 +194,55 @@ describe('FilesComponent', () => {
expect(component.documentList.reload).toHaveBeenCalled();
});
it('should call refresh on fileUploadComplete event if parent node match', () => {
it('should call refresh on fileUploadComplete event if parent node match', fakeAsync(() => {
const file = { file: { options: { parentId: 'parentId' } } };
component.node = { id: 'parentId' };
uploadService.fileUploadComplete.next(<any>file);
expect(component.documentList.reload).toHaveBeenCalled();
});
tick(500);
it('should not call refresh on fileUploadComplete event if parent mismatch', () => {
expect(component.documentList.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadComplete event if parent mismatch', fakeAsync(() => {
const file = { file: { options: { parentId: 'otherId' } } };
component.node = { id: 'parentId' };
uploadService.fileUploadComplete.next(<any>file);
expect(component.documentList.reload).not.toHaveBeenCalled();
});
tick(500);
it('should call refresh on fileUploadDeleted event if parent node match', () => {
expect(component.documentList.reload).not.toHaveBeenCalled();
}));
it('should call refresh on fileUploadDeleted event if parent node match', fakeAsync(() => {
const file = { file: { options: { parentId: 'parentId' } } };
component.node = { id: 'parentId' };
uploadService.fileUploadDeleted.next(<any>file);
expect(component.documentList.reload).toHaveBeenCalled();
});
tick(500);
it('should not call refresh on fileUploadDeleted event if parent mismatch', () => {
expect(component.documentList.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadDeleted event if parent mismatch', fakeAsync(() => {
const file: any = { file: { options: { parentId: 'otherId' } } };
component.node = { id: 'parentId' };
uploadService.fileUploadDeleted.next(file);
tick(500);
expect(component.documentList.reload).not.toHaveBeenCalled();
});
}));
});
describe('onBreadcrumbNavigate()', () => {
beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
fixture.detectChanges();
});
@@ -255,7 +258,7 @@ describe('FilesComponent', () => {
describe('Node navigation', () => {
beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node }));
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(router, 'navigate');
fixture.detectChanges();

5
src/app/components/files/files.component.ts
View File

@@ -36,6 +36,7 @@ import { ContentApiService } from '../../services/content-api.service';
import { ExtensionService } from '../../extensions/extension.service';
import { SetCurrentFolderAction } from '../../store/actions';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { debounceTime } from 'rxjs/operators';
@Component({
templateUrl: './files.component.html'
@@ -96,8 +97,8 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
content.nodesDeleted.subscribe(() => this.documentList.reload()),
content.nodesMoved.subscribe(() => this.documentList.reload()),
content.nodesRestored.subscribe(() => this.documentList.reload()),
uploadService.fileUploadComplete.debounceTime(300).subscribe(file => this.onFileUploadedEvent(file)),
uploadService.fileUploadDeleted.debounceTime(300).subscribe((file) => this.onFileUploadedEvent(file)),
uploadService.fileUploadComplete.pipe(debounceTime(300)).subscribe(file => this.onFileUploadedEvent(file)),
uploadService.fileUploadDeleted.pipe(debounceTime(300)).subscribe((file) => this.onFileUploadedEvent(file)),
this.breakpointObserver
.observe([