From 8b39eb5098fa28c05443d7827e1d692ac62f6c88 Mon Sep 17 00:00:00 2001
From: Kelly McDonald <kelly@fammcdonald.net>
Date: Thu, 28 Jan 2021 10:54:36 -0500
Subject: [PATCH] Make changes to tests to reflect what has been done in the UI

---
 .../confirm-dialog.component.spec.ts          | 19 ++++++++++++--
 src/app/modeler/modeler.component.spec.ts     | 26 +++----------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/app/_dialogs/confirm-dialog/confirm-dialog.component.spec.ts b/src/app/_dialogs/confirm-dialog/confirm-dialog.component.spec.ts
index ccea433..1483f34 100644
--- a/src/app/_dialogs/confirm-dialog/confirm-dialog.component.spec.ts
+++ b/src/app/_dialogs/confirm-dialog/confirm-dialog.component.spec.ts
@@ -1,14 +1,29 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { ConfirmDialogComponent } from './confirm-dialog.component';
 
+
 describe('ConfirmDialogComponent', () => {
   let component: ConfirmDialogComponent;
   let fixture: ComponentFixture<ConfirmDialogComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ConfirmDialogComponent ]
+      declarations: [ ConfirmDialogComponent ],
+      imports : [MatDialogModule],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: {
+            close: (dialogResult: any) => {
+            }
+          }
+        },
+        {provide: MAT_DIALOG_DATA, useValue: {
+            confirm: false,
+          }},
+      ]
+
     })
     .compileComponents();
   }));
diff --git a/src/app/modeler/modeler.component.spec.ts b/src/app/modeler/modeler.component.spec.ts
index dafe1a9..79fe2ac 100644
--- a/src/app/modeler/modeler.component.spec.ts
+++ b/src/app/modeler/modeler.component.spec.ts
@@ -182,25 +182,6 @@ describe('ModelerComponent', () => {
     expect(component.importWarnings).toEqual(warnings);
   });
 
-  it('loads a diagram from URL', () => {
-    component.diagramUrl = 'some-url';
-    component.openMethod = 'url';
-    component.onSubmitFileToOpen();
-
-    const sReq = httpMock.expectOne(component.diagramUrl);
-    expect(sReq.request.method).toEqual('GET');
-    sReq.flush(BPMN_DIAGRAM);
-  });
-
-  it('loads a diagram from URL with warnings', () => {
-    component.diagramUrl = 'some-url';
-    component.openMethod = 'url';
-    component.onSubmitFileToOpen();
-
-    const sReq = httpMock.expectOne(component.diagramUrl);
-    expect(sReq.request.method).toEqual('GET');
-    sReq.flush(BPMN_DIAGRAM_WITH_WARNINGS);
-  });
 
   it('loads a diagram from File', () => {
     const readFileSpy = spyOn(component, 'readFile').and.stub();
@@ -499,12 +480,13 @@ describe('ModelerComponent', () => {
     const data: OpenFileDialogData = {
       file: mockFileMeta0.file
     };
+    const expectedFile = new File([], mockFileMeta0.name, {type: mockFileMeta0.content_type});
+    const event = {target: {files: [expectedFile]}};
 
     const onSubmitFileToOpenSpy = spyOn(component, 'onSubmitFileToOpen').and.stub();
-    const openDialogSpy = spyOn(component.dialog, 'open')
-      .and.returnValue({afterClosed: () => of(data)});
     component.openFileDialog();
-    expect(openDialogSpy).toHaveBeenCalled();
+    expect(component.requestFileClick).toBeTrue();
+    component.onFileSelected(event);
     expect(component.diagramFile).toEqual(data.file);
     expect(onSubmitFileToOpenSpy).toHaveBeenCalled();
   });