From e2e473e71bdbd621d4ac3b0dc88361342f763ef4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 23 Oct 2017 15:41:50 +0100 Subject: [PATCH] udpate unit tests --- .../common/directives/folder-create.directive.spec.ts | 8 ++++---- .../common/directives/folder-edit.directive.spec.ts | 8 ++++---- .../common/directives/node-download.directive.spec.ts | 7 +++---- src/app/common/services/node-actions.service.spec.ts | 11 ++++++----- .../current-user/current-user.component.spec.ts | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/common/directives/folder-create.directive.spec.ts b/src/app/common/directives/folder-create.directive.spec.ts index 689b75e37..a77ef95da 100644 --- a/src/app/common/directives/folder-create.directive.spec.ts +++ b/src/app/common/directives/folder-create.directive.spec.ts @@ -19,7 +19,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { MdDialogModule, MdDialog } from '@angular/material'; +import { MatDialogModule, MatDialog } from '@angular/material'; import { FolderCreateDirective } from './folder-create.directive'; import { ContentManagementService } from '../services/content-management.service'; @@ -35,7 +35,7 @@ describe('FolderCreateDirective', () => { let fixture: ComponentFixture; let element; let node: any; - let dialog: MdDialog; + let dialog: MatDialog; let contentService: ContentManagementService; let dialogRefMock; @@ -46,7 +46,7 @@ describe('FolderCreateDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ MdDialogModule ], + imports: [ MatDialogModule ], declarations: [ TestComponent, FolderCreateDirective @@ -59,7 +59,7 @@ describe('FolderCreateDirective', () => { fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderCreateDirective)); - dialog = TestBed.get(MdDialog); + dialog = TestBed.get(MatDialog); contentService = TestBed.get(ContentManagementService); }); diff --git a/src/app/common/directives/folder-edit.directive.spec.ts b/src/app/common/directives/folder-edit.directive.spec.ts index 2b9013f4c..a330ef9f8 100644 --- a/src/app/common/directives/folder-edit.directive.spec.ts +++ b/src/app/common/directives/folder-edit.directive.spec.ts @@ -19,7 +19,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { MdDialogModule, MdDialog } from '@angular/material'; +import { MatDialogModule, MatDialog } from '@angular/material'; import { FolderEditDirective } from './folder-edit.directive'; import { ContentManagementService } from '../services/content-management.service'; @@ -35,7 +35,7 @@ describe('FolderEditDirective', () => { let fixture: ComponentFixture; let element; let node: any; - let dialog: MdDialog; + let dialog: MatDialog; let contentService: ContentManagementService; let dialogRefMock; @@ -46,7 +46,7 @@ describe('FolderEditDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ MdDialogModule ], + imports: [ MatDialogModule ], declarations: [ TestComponent, FolderEditDirective @@ -59,7 +59,7 @@ describe('FolderEditDirective', () => { fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderEditDirective)); - dialog = TestBed.get(MdDialog); + dialog = TestBed.get(MatDialog); contentService = TestBed.get(ContentManagementService); }); diff --git a/src/app/common/directives/node-download.directive.spec.ts b/src/app/common/directives/node-download.directive.spec.ts index a239c2cb7..89875eb9b 100644 --- a/src/app/common/directives/node-download.directive.spec.ts +++ b/src/app/common/directives/node-download.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core'; -import { MdDialog } from '@angular/material'; +import { MatDialog } from '@angular/material'; import { Component, DebugElement } from '@angular/core'; import { DownloadFileDirective } from './node-download.directive'; @@ -33,10 +33,9 @@ describe('DownloadFileDirective', () => { let component: TestComponent; let fixture: ComponentFixture; let element: DebugElement; - let dialog: MdDialog; + let dialog: MatDialog; let apiService: AlfrescoApiService; let contentService; - let spySnackBar; let dialogSpy; beforeEach(() => { @@ -56,7 +55,7 @@ describe('DownloadFileDirective', () => { fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; element = fixture.debugElement.query(By.directive(DownloadFileDirective)); - dialog = TestBed.get(MdDialog); + dialog = TestBed.get(MatDialog); apiService = TestBed.get(AlfrescoApiService); contentService = apiService.getInstance().content; dialogSpy = spyOn(dialog, 'open'); diff --git a/src/app/common/services/node-actions.service.spec.ts b/src/app/common/services/node-actions.service.spec.ts index 626ebc518..1a1b6b777 100644 --- a/src/app/common/services/node-actions.service.spec.ts +++ b/src/app/common/services/node-actions.service.spec.ts @@ -1,5 +1,6 @@ import { TestBed, async } from '@angular/core/testing'; -import { MdDialog, OverlayModule } from '@angular/material'; +import { MatDialog } from '@angular/material'; +import { OverlayModule } from '@angular/cdk/overlay'; import { Observable } from 'rxjs/Rx'; import { CoreModule, AlfrescoApiService, NodesApiService } from 'ng2-alfresco-core'; import { DocumentListService, NodeMinimal, NodeMinimalEntry } from 'ng2-alfresco-documentlist'; @@ -78,7 +79,7 @@ describe('NodeActionsService', () => { OverlayModule ], providers: [ - MdDialog, + MatDialog, DocumentListService, AlfrescoApiService, NodesApiService, @@ -249,7 +250,7 @@ describe('NodeActionsService', () => { spyOn(service, 'getFirstParentId').and.returnValue('parent-id'); let testContentNodeSelectorComponentData; - const dialog = TestBed.get(MdDialog); + const dialog = TestBed.get(MatDialog); const spyOnDialog = spyOn(dialog, 'open').and.callFake((contentNodeSelectorComponent: any, data: any) => { testContentNodeSelectorComponentData = data; return {}; @@ -276,7 +277,7 @@ describe('NodeActionsService', () => { spyOn(service, 'getFirstParentId').and.returnValue('parent-id'); let testContentNodeSelectorComponentData; - const dialog = TestBed.get(MdDialog); + const dialog = TestBed.get(MatDialog); spyOn(dialog, 'open').and.callFake((contentNodeSelectorComponent: any, data: any) => { testContentNodeSelectorComponentData = data; return {}; @@ -295,7 +296,7 @@ describe('NodeActionsService', () => { spyOn(service, 'getFirstParentId').and.returnValue('parent-id'); let testContentNodeSelectorComponentData; - const dialog = TestBed.get(MdDialog); + const dialog = TestBed.get(MatDialog); spyOn(dialog, 'open').and.callFake((contentNodeSelectorComponent: any, data: any) => { testContentNodeSelectorComponentData = data; return {}; diff --git a/src/app/components/current-user/current-user.component.spec.ts b/src/app/components/current-user/current-user.component.spec.ts index 7ca5239a4..bc62a2b08 100644 --- a/src/app/components/current-user/current-user.component.spec.ts +++ b/src/app/components/current-user/current-user.component.spec.ts @@ -18,7 +18,7 @@ import { TestBed, async } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Observable } from 'rxjs/Rx'; -import { MaterialModule } from '@angular/material'; +import { MaterialModule } from '../../common/material.module'; import { CoreModule, PeopleContentService } from 'ng2-alfresco-core'; import { CurrentUserComponent } from './current-user.component';