From 1b576cda17aab112b8f3f2b7c9507a3a1d9daf6e Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Sun, 1 Dec 2019 13:21:06 +0100 Subject: [PATCH] test(project): make sinon an allowed global --- test/spec/.eslintrc | 5 ++++ test/spec/ViewerSpec.js | 1 - .../spec/features/auto-place/AutoPlaceSpec.js | 2 -- .../features/copy-paste/BpmnCopyPasteSpec.js | 2 -- .../keyboard/BpmnKeyboardBindingsSpec.js | 2 -- .../spec/features/modeling/BpmnUpdaterSpec.js | 2 -- .../spec/features/modeling/LabelBoundsSpec.js | 2 -- .../AdaptiveLabelPositioningBehaviorSpec.js | 7 ++---- .../behavior/AttachEventBehaviorSpec.js | 2 -- .../behavior/DataStoreBehaviorSpec.js | 2 -- .../behavior/DetachEventBehaviorSpec.js | 2 -- .../modeling/behavior/FixHoverBehaviorSpec.js | 23 ++++++++----------- .../modeling/behavior/LabelBehaviorSpec.js | 6 +---- .../popup-menu/ReplaceMenuProviderSpec.js | 12 ++++------ test/spec/import/BpmnTreeWalkerSpec.js | 2 -- 15 files changed, 22 insertions(+), 50 deletions(-) create mode 100644 test/spec/.eslintrc diff --git a/test/spec/.eslintrc b/test/spec/.eslintrc new file mode 100644 index 00000000..6464c897 --- /dev/null +++ b/test/spec/.eslintrc @@ -0,0 +1,5 @@ +{ + "globals": { + "sinon": true + } +} \ No newline at end of file diff --git a/test/spec/ViewerSpec.js b/test/spec/ViewerSpec.js index bf59f516..29bc3824 100644 --- a/test/spec/ViewerSpec.js +++ b/test/spec/ViewerSpec.js @@ -1574,7 +1574,6 @@ describe('Viewer', function() { // assume expect(viewer._container.parentNode).not.to.exist; - /* global sinon */ var resizedSpy = sinon.spy(); viewer.on('canvas.resized', resizedSpy); diff --git a/test/spec/features/auto-place/AutoPlaceSpec.js b/test/spec/features/auto-place/AutoPlaceSpec.js index 9f94db43..993b45db 100644 --- a/test/spec/features/auto-place/AutoPlaceSpec.js +++ b/test/spec/features/auto-place/AutoPlaceSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject diff --git a/test/spec/features/copy-paste/BpmnCopyPasteSpec.js b/test/spec/features/copy-paste/BpmnCopyPasteSpec.js index f85a0c81..0fe2f3fd 100644 --- a/test/spec/features/copy-paste/BpmnCopyPasteSpec.js +++ b/test/spec/features/copy-paste/BpmnCopyPasteSpec.js @@ -27,8 +27,6 @@ import { is } from 'lib/util/ModelUtil'; -/* global sinon */ - describe('features/copy-paste', function() { diff --git a/test/spec/features/keyboard/BpmnKeyboardBindingsSpec.js b/test/spec/features/keyboard/BpmnKeyboardBindingsSpec.js index 5daea629..17941720 100644 --- a/test/spec/features/keyboard/BpmnKeyboardBindingsSpec.js +++ b/test/spec/features/keyboard/BpmnKeyboardBindingsSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapViewer, inject diff --git a/test/spec/features/modeling/BpmnUpdaterSpec.js b/test/spec/features/modeling/BpmnUpdaterSpec.js index 2da363f6..c57f163a 100644 --- a/test/spec/features/modeling/BpmnUpdaterSpec.js +++ b/test/spec/features/modeling/BpmnUpdaterSpec.js @@ -6,8 +6,6 @@ import { import modelingModule from 'lib/features/modeling'; import coreModule from 'lib/core'; -/* global sinon */ - var testModules = [ modelingModule, coreModule ]; diff --git a/test/spec/features/modeling/LabelBoundsSpec.js b/test/spec/features/modeling/LabelBoundsSpec.js index dbac85a7..445d525d 100644 --- a/test/spec/features/modeling/LabelBoundsSpec.js +++ b/test/spec/features/modeling/LabelBoundsSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject diff --git a/test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehaviorSpec.js b/test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehaviorSpec.js index a5d99b8a..be909333 100644 --- a/test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehaviorSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject @@ -15,10 +13,9 @@ var testModules = [ coreModule ]; -var spy = sinon.spy; - var ATTACH = { attach: true }; + describe('modeling/behavior - AdaptiveLabelPositioningBehavior', function() { function expectLabelOrientation(element, expectedOrientation) { @@ -431,7 +428,7 @@ describe('modeling/behavior - AdaptiveLabelPositioningBehavior', function() { var exclusiveGateway = elementRegistry.get('ExclusiveGateway_1'), endEvent = elementRegistry.get('EndEvent_1'); - var moveShapeSpy = spy(modeling, 'moveShape'); + var moveShapeSpy = sinon.spy(modeling, 'moveShape'); // when copyPaste.copy([ exclusiveGateway, endEvent ]); diff --git a/test/spec/features/modeling/behavior/AttachEventBehaviorSpec.js b/test/spec/features/modeling/behavior/AttachEventBehaviorSpec.js index 66b76733..19ee8d07 100644 --- a/test/spec/features/modeling/behavior/AttachEventBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/AttachEventBehaviorSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject diff --git a/test/spec/features/modeling/behavior/DataStoreBehaviorSpec.js b/test/spec/features/modeling/behavior/DataStoreBehaviorSpec.js index b3b3dc02..1a50c65f 100644 --- a/test/spec/features/modeling/behavior/DataStoreBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/DataStoreBehaviorSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject diff --git a/test/spec/features/modeling/behavior/DetachEventBehaviorSpec.js b/test/spec/features/modeling/behavior/DetachEventBehaviorSpec.js index 2458546f..27280a16 100644 --- a/test/spec/features/modeling/behavior/DetachEventBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/DetachEventBehaviorSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject diff --git a/test/spec/features/modeling/behavior/FixHoverBehaviorSpec.js b/test/spec/features/modeling/behavior/FixHoverBehaviorSpec.js index df80ff22..61d709a4 100644 --- a/test/spec/features/modeling/behavior/FixHoverBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/FixHoverBehaviorSpec.js @@ -13,9 +13,6 @@ import bendpointsModule from 'diagram-js/lib/features/bendpoints'; import { createCanvasEvent as canvasEvent } from '../../../../util/MockEvents'; -/* global sinon */ -var spy = sinon.spy; - var testModules = [ coreModule, createModule, @@ -238,7 +235,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_lanes = elementRegistry.get('Participant_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.context.startTarget).to.eql(participant_lanes); }); @@ -266,7 +263,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_lanes = elementRegistry.get('Participant_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.hover).to.eql(participant_lanes); }); @@ -293,7 +290,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_lanes = elementRegistry.get('Participant_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.hover).to.eql(participant_lanes); }); @@ -328,7 +325,7 @@ describe('features/modeling/behavior - fix hover', function() { var messageFlow = elementRegistry.get('MessageFlow_2'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.context.hover).to.equal(participant_lanes); }); @@ -356,7 +353,7 @@ describe('features/modeling/behavior - fix hover', function() { var messageFlow = elementRegistry.get('MessageFlow_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.context.target).to.eql(participant_lanes); }); @@ -387,7 +384,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_no_lanes = elementRegistry.get('Participant_No_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.context.source).to.eql(participant_lanes); }); @@ -416,7 +413,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_no_lanes = elementRegistry.get('Participant_No_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { var context = event.context, target = context.target; @@ -450,7 +447,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_no_lanes = elementRegistry.get('Participant_No_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.hover).to.eql(participant_lanes); }); @@ -478,7 +475,7 @@ describe('features/modeling/behavior - fix hover', function() { var participant_no_lanes = elementRegistry.get('Participant_No_Lanes'); var lane_1 = elementRegistry.get('Lane_1'); - var connectSpy = spy(function(event) { + var connectSpy = sinon.spy(function(event) { expect(event.hover).to.eql(participant_lanes); }); @@ -531,7 +528,7 @@ describe('features/modeling/behavior - fix hover', function() { var rootElement = canvas.getRootElement(), rootElementGfx = canvas.getGraphics(rootElement); - var moveEndSpy = spy(function(event) { + var moveEndSpy = sinon.spy(function(event) { expect(event.context.shape).to.equal(participant); }); diff --git a/test/spec/features/modeling/behavior/LabelBehaviorSpec.js b/test/spec/features/modeling/behavior/LabelBehaviorSpec.js index 14a7fb80..46fce5ea 100644 --- a/test/spec/features/modeling/behavior/LabelBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/LabelBehaviorSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, inject @@ -22,8 +20,6 @@ import modelingModule from 'lib/features/modeling'; import coreModule from 'lib/core'; import gridSnappingModule from 'lib/features/grid-snapping'; -var spy = sinon.spy; - describe('behavior - LabelBehavior', function() { @@ -209,7 +205,7 @@ describe('behavior - LabelBehavior', function() { // given var parentShape = elementRegistry.get('Process_1'); - var createLabelSpy = spy(modeling, 'createLabel'); + var createLabelSpy = sinon.spy(modeling, 'createLabel'); var exclusiveGatewayBo = bpmnFactory.create('bpmn:ExclusiveGateway', { name: 'Foo' diff --git a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js index ef25f76e..bd63ca5d 100644 --- a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js +++ b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import { bootstrapModeler, getBpmnJS, @@ -26,8 +24,6 @@ import { is } from 'lib/util/ModelUtil'; import { isExpanded } from 'lib/util/DiUtil'; -var spy = sinon.spy; - describe('features/popup-menu - replace menu provider', function() { @@ -1685,7 +1681,7 @@ describe('features/popup-menu - replace menu provider', function() { // given var subProcess = elementRegistry.get('SubProcess_1'); - var resizeShapeSpy = spy(modeling, 'resizeShape'); + var resizeShapeSpy = sinon.spy(modeling, 'resizeShape'); // when openPopup(subProcess); @@ -1702,7 +1698,7 @@ describe('features/popup-menu - replace menu provider', function() { // given var subProcess = elementRegistry.get('SubProcess_1'); - var layoutConnectionSpy = spy(modeling, 'layoutConnection'); + var layoutConnectionSpy = sinon.spy(modeling, 'layoutConnection'); // when openPopup(subProcess); @@ -1722,7 +1718,7 @@ describe('features/popup-menu - replace menu provider', function() { // given var adhocSubProcess = elementRegistry.get('AdhocSubProcess_1'); - var resizeShapeSpy = spy(modeling, 'resizeShape'); + var resizeShapeSpy = sinon.spy(modeling, 'resizeShape'); // when openPopup(adhocSubProcess); @@ -1739,7 +1735,7 @@ describe('features/popup-menu - replace menu provider', function() { // given var adhocSubProcess = elementRegistry.get('AdhocSubProcess_1'); - var layoutConnectionSpy = spy(modeling, 'layoutConnection'); + var layoutConnectionSpy = sinon.spy(modeling, 'layoutConnection'); // when openPopup(adhocSubProcess); diff --git a/test/spec/import/BpmnTreeWalkerSpec.js b/test/spec/import/BpmnTreeWalkerSpec.js index 24aefd0b..fe412d55 100644 --- a/test/spec/import/BpmnTreeWalkerSpec.js +++ b/test/spec/import/BpmnTreeWalkerSpec.js @@ -1,5 +1,3 @@ -/* global sinon */ - import BpmnTreeWalker from 'lib/import/BpmnTreeWalker'; import BpmnModdle from 'bpmn-moddle';