chore(project): move {modeling->}/rules

This syncs the bpmn-js structure with diagram-js.

lib/features/modeling/index.js

@@ -1,9 +1,9 @@
 module.exports = {
   __init__: [ 'modeling', 'bpmnUpdater', 'bpmnLabelSupport' ],
   __depends__: [
-    require('../label-editing'),
-    require('./rules'),
     require('./behavior'),
+    require('../label-editing'),
+    require('../rules'),
     require('../ordering'),
     require('../replace'),
     require('diagram-js/lib/command'),

lib/features/rules/BpmnRules.js

@@ -7,17 +7,17 @@ var groupBy = require('lodash/collection/groupBy'),
     forEach = require('lodash/collection/forEach'),
     inherits = require('inherits');
 
-var getParents = require('../ModelingUtil').getParents,
-    is = require('../../../util/ModelUtil').is,
-    getBusinessObject = require('../../../util/ModelUtil').getBusinessObject,
-    isExpanded = require('../../../util/DiUtil').isExpanded,
-    isEventSubProcess = require('../../../util/DiUtil').isEventSubProcess,
-    isInterrupting = require('../../../util/DiUtil').isInterrupting;
+var getParents = require('../modeling/ModelingUtil').getParents,
+    is = require('../../util/ModelUtil').is,
+    getBusinessObject = require('../../util/ModelUtil').getBusinessObject,
+    isExpanded = require('../../util/DiUtil').isExpanded,
+    isEventSubProcess = require('../../util/DiUtil').isEventSubProcess,
+    isInterrupting = require('../../util/DiUtil').isInterrupting;
 
 
 var RuleProvider = require('diagram-js/lib/features/rules/RuleProvider');
 
-var isBoundaryAttachment = require('../../snapping/BpmnSnappingUtil').getBoundaryAttachment;
+var isBoundaryAttachment = require('../snapping/BpmnSnappingUtil').getBoundaryAttachment;
 
 /**
  * BPMN specific modeling rule

test/spec/features/rules/BpmnRulesSpec.js

@@ -8,8 +8,8 @@ var expectCanConnect = Helper.expectCanConnect,
 
 /* global bootstrapModeler, inject */
 
-var modelingModule = require('../../../../../lib/features/modeling'),
-    coreModule = require('../../../../../lib/core');
+var modelingModule = require('../../../../lib/features/modeling'),
+    coreModule = require('../../../../lib/core');
 
 
 describe('features/modeling/rules - BpmnRules', function() {
@@ -545,7 +545,7 @@ describe('features/modeling/rules - BpmnRules', function() {
 
   describe('event move', function() {
 
-    var testXML = require('../../../../fixtures/bpmn/boundary-events.bpmn');
+    var testXML = require('../../../fixtures/bpmn/boundary-events.bpmn');
 
     beforeEach(bootstrapModeler(testXML, { modules: testModules }));
 
@@ -638,7 +638,7 @@ describe('features/modeling/rules - BpmnRules', function() {
 
   describe('event create', function() {
 
-    var testXML = require('../../../../fixtures/bpmn/boundary-events.bpmn');
+    var testXML = require('../../../fixtures/bpmn/boundary-events.bpmn');
 
     beforeEach(bootstrapModeler(testXML, { modules: testModules }));
 
@@ -731,7 +731,7 @@ describe('features/modeling/rules - BpmnRules', function() {
 
   describe('event append', function() {
 
-    var testXML = require('../../../../fixtures/bpmn/boundary-events.bpmn');
+    var testXML = require('../../../fixtures/bpmn/boundary-events.bpmn');
 
     beforeEach(bootstrapModeler(testXML, { modules: testModules }));
 

test/spec/features/rules/Helper.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var TestHelper = require('../../../../TestHelper');
+var TestHelper = require('../../../TestHelper');
 
 
 function expectCanConnect(source, target, rules) {

test/spec/features/snapping/BpmnSnappingSpec.js

@@ -12,7 +12,7 @@ var coreModule = require('../../../../lib/core'),
     createModule = require('diagram-js/lib/features/create'),
     resizeModule = require('diagram-js/lib/features/resize'),
     moveModule = require('diagram-js/lib/features/move'),
-    rulesModule = require('../../../../lib/features/modeling/rules');
+    rulesModule = require('../../../../lib/features/rules');
 
 var pick = require('lodash/object/pick');