sartography/cr-connect-bpmn
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-bpmn.git synced 2025-01-23 15:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes sporadically-failing unit tests (I hope)

Browse Source
This commit is contained in:
Aaron Louie 2020-02-25 16:34:55 -05:00
parent f228e7f5b7
commit 4e256ad17c
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/modeler/modeler.component.spec.ts
View File

@ -26,7 +26,7 @@ import {
mockWorkflowSpec0,
mockWorkflowSpecs
} from 'sartography-workflow-lib';
import {BPMN_DIAGRAM, BPMN_DIAGRAM_WITH_WARNINGS} from '../../testing/mocks/diagram.mocks';
import {BPMN_DIAGRAM, BPMN_DIAGRAM_EMPTY, BPMN_DIAGRAM_WITH_WARNINGS} from '../../testing/mocks/diagram.mocks';
import {FileMetaDialogComponent} from '../_dialogs/file-meta-dialog/file-meta-dialog.component';
import {NewFileDialogComponent} from '../_dialogs/new-file-dialog/new-file-dialog.component';
import {OpenFileDialogComponent} from '../_dialogs/open-file-dialog/open-file-dialog.component';
@ -238,11 +238,11 @@ describe('ModelerComponent', () => {
});
it('should update the diagram file on change', () => {
const valBefore = BPMN_DIAGRAM.replace('REPLACE_ME', 'raindrops_on_roses');
const valBefore = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'raindrops_on_roses');
component.diagramComponent.writeValue(valBefore);
expect(component.diagramComponent.value).toEqual(valBefore);
const newValue = BPMN_DIAGRAM.replace('REPLACE_ME', 'whiskers_on_kittens');
const newValue = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'whiskers_on_kittens');
component.diagramComponent.writeValue(newValue);
expect(component.diagramComponent.value).toEqual(newValue);
@ -252,10 +252,14 @@ describe('ModelerComponent', () => {
it('should save file changes when existing diagram is modified and then saved', () => {
const saveFileChangesSpy = spyOn(component, 'saveFileChanges').and.stub();
const editFileMetaSpy = spyOn(component, 'editFileMeta').and.stub();
const val = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'bright_copper_kettles');
component.diagramComponent.xml = val;
component.workflowSpec = mockWorkflowSpec0;
component.diagramFileMeta = mockFileMeta0;
component.diagramComponent.writeValue(BPMN_DIAGRAM.replace('REPLACE_ME', 'bright_copper_kettles'));
const newerValue = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'warm_woolen_mittens')
component.diagramComponent.writeValue(newerValue);
expect(component.diagramComponent.value).toEqual(newerValue);
component.saveChanges();
expect(saveFileChangesSpy).toHaveBeenCalled();
@ -269,7 +273,9 @@ describe('ModelerComponent', () => {
component.newDiagram(FileType.BPMN);
expect(component.diagramFileMeta).toBeFalsy();
component.diagramComponent.writeValue(BPMN_DIAGRAM.replace('REPLACE_ME', 'warm_woolen_mittens'));
const val = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'brown_paper_packages_tied_up_with_strings');
component.diagramComponent.writeValue(val);
expect(component.diagramComponent.value).toEqual(val);
component.saveChanges();
expect(saveFileChangesSpy).not.toHaveBeenCalled();
@ -283,7 +289,7 @@ describe('ModelerComponent', () => {
component.workflowSpec = mockWorkflowSpec0;
component.diagramFileMeta = mockFileMeta0;
component.diagramComponent.writeValue(BPMN_DIAGRAM.replace('REPLACE_ME', 'brown_paper_packages_tied_up_with_strings'));
component.diagramComponent.writeValue(BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'cream_colored_ponies'));
component.saveFileChanges();
expect(updateFileMetaSpy).toHaveBeenCalledWith(mockFileMeta0);
@ -306,7 +312,7 @@ describe('ModelerComponent', () => {
});
it('should update file metadata for existing file', () => {
const newXml = BPMN_DIAGRAM.replace('REPLACE_ME', 'cream_colored_ponies');
const newXml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'crisp_apple_strudels');
const data: FileMetaDialogData = {
fileName: mockFileMeta0.name,
fileType: FileType.BPMN,
@ -336,7 +342,7 @@ describe('ModelerComponent', () => {
});
it('should create new file metadata for new file', () => {
const newXml = BPMN_DIAGRAM.replace('REPLACE_ME', 'crisp_apple_strudels');
const newXml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'doorbells');
const data: FileMetaDialogData = {
fileName: mockFileMeta0.name,
fileType: FileType.BPMN,
@ -400,8 +406,8 @@ describe('ModelerComponent', () => {
});
it('should start a new diagram', () => {
component.xml = BPMN_DIAGRAM.replace('REPLACE_ME', 'doorbells');
component.draftXml = BPMN_DIAGRAM.replace('REPLACE_ME', 'sleigh_bells');
component.xml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'sleigh_bells');
component.draftXml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'schnitzel_with_noodles');
component.diagramFileMeta = mockFileMeta0;
component.diagramFile = mockFileMeta0.file;
component.workflowSpec = mockWorkflowSpec0;

16
src/testing/mocks/diagram.mocks.ts
View File

@ -1,3 +1,19 @@
export const BPMN_DIAGRAM_EMPTY = `
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
id="sid-REPLACE_ME"
targetNamespace="http://bpmn.io/bpmn"
exporter="http://bpmn.io"
exporterVersion="0.10.1">
<process id="Process_REPLACE_ME" isExecutable="false" />
<bpmndi:BPMNDiagram id="BpmnDiagram_REPLACE_ME">
<bpmndi:BPMNPlane id="BpmnPlane_REPLACE_ME" bpmnElement="Process_REPLACE_ME" />
</bpmndi:BPMNDiagram>
</definitions>
`;
export const BPMN_DIAGRAM = `
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"