From 2c34f56541a3345429dafc354900adf2a2d667f6 Mon Sep 17 00:00:00 2001
From: "Tuan N. Truong" <t.truong@vehikl.com>
Date: Tue, 30 Apr 2019 16:20:51 -0400
Subject: [PATCH 1/3] Change references of dataName to variableName

---
 .../intermediateMessageCatchEvent/index.js     | 18 +++++++++---------
 .../IntermediateMessageCatchEvent.spec.js      |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/nodes/intermediateMessageCatchEvent/index.js b/src/components/nodes/intermediateMessageCatchEvent/index.js
index a2df922b1..afc5dc6df 100644
--- a/src/components/nodes/intermediateMessageCatchEvent/index.js
+++ b/src/components/nodes/intermediateMessageCatchEvent/index.js
@@ -18,7 +18,7 @@ export default {
       eventDefinitions: [
         moddle.create('bpmn:MessageEventDefinition', {
           id: '',
-          dataName: '',
+          variableName: '',
         }),
       ],
     });
@@ -37,7 +37,7 @@ export default {
     return Object.entries(node.definition).reduce((data, [key, value]) => {
       if (key === 'eventDefinitions') {
         data.eventDefinitionId = value[0].get('id');
-        data.dataName = value[0].get('dataName');
+        data.variableName = value[0].get('variableName');
       } else {
         data[key] = value;
       }
@@ -46,7 +46,7 @@ export default {
     }, {});
   },
   inspectorHandler(value, node, setNodeProp, moddle) {
-    for (const key in omit(value, ['$type', 'eventDefinitionId', 'dataName'])) {
+    for (const key in omit(value, ['$type', 'eventDefinitionId', 'variableName'])) {
       if (node.definition[key] === value[key]) {
         continue;
       }
@@ -55,13 +55,13 @@ export default {
     }
 
     if (
-      node.definition.eventDefinitions[0].get('id') !== value.dataName ||
-      node.definition.eventDefinitions[0].get('dataName') !== value.eventDefinitionId
+      node.definition.eventDefinitions[0].get('id') !== value.variableName ||
+      node.definition.eventDefinitions[0].get('variableName') !== value.eventDefinitionId
     ) {
       setNodeProp(node, 'eventDefinitions', [
         moddle.create('bpmn:MessageEventDefinition', {
           id: value['eventDefinitionId'],
-          dataName: value['dataName'],
+          variableName: value['variableName'],
         }),
       ]);
     }
@@ -114,9 +114,9 @@ export default {
             {
               component: 'FormInput',
               config: {
-                label: 'Data Name',
-                helper: 'The Name of the data name',
-                name: 'dataName',
+                label: 'Variable Name',
+                helper: 'The Name of the variable name',
+                name: 'variableName',
               },
             },
             {
diff --git a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
index c7a5bd7ba..264651f39 100644
--- a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
+++ b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
@@ -26,8 +26,8 @@ describe('Intermediate Message Catch Event', () => {
     const eventId = '1234';
     typeIntoTextInput('[name=eventDefinitionId]', eventId);
 
-    const dataName = 'test dataname';
-    typeIntoTextInput('[name=dataName]', dataName);
+    const dataName = 'test variablename';
+    typeIntoTextInput('[name=variableName]', dataName);
 
     cy.get('[name=allowedUsers]').select('1,10');
     cy.get('[name=allowedGroups]').select('20,30');

From 83ad4da70f2bb8b65fe3cdc04b21dbca153fdeac Mon Sep 17 00:00:00 2001
From: "Tuan N. Truong" <t.truong@vehikl.com>
Date: Tue, 30 Apr 2019 16:28:10 -0400
Subject: [PATCH 2/3] Fix broken test

---
 tests/e2e/specs/IntermediateMessageCatchEvent.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
index 264651f39..bed21e996 100644
--- a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
+++ b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
@@ -26,8 +26,8 @@ describe('Intermediate Message Catch Event', () => {
     const eventId = '1234';
     typeIntoTextInput('[name=eventDefinitionId]', eventId);
 
-    const dataName = 'test variablename';
-    typeIntoTextInput('[name=variableName]', dataName);
+    const variableName = 'test variablename';
+    typeIntoTextInput('[name=variableName]', variableName);
 
     cy.get('[name=allowedUsers]').select('1,10');
     cy.get('[name=allowedGroups]').select('20,30');
@@ -36,7 +36,7 @@ describe('Intermediate Message Catch Event', () => {
     typeIntoTextInput('[name=whitelist]', whiteList);
 
     const validXML = `<bpmn:intermediateCatchEvent id="node_2" name="${name}" pm:allowedUsers="1,10" pm:allowedGroups="20,30" pm:whitelist="${whiteList}">
-      <bpmn:messageEventDefinition id="${eventId}" pm:dataName="${dataName}" />
+      <bpmn:messageEventDefinition id="${eventId}" pm:variableName="${variableName}" />
     </bpmn:intermediateCatchEvent>`;
 
     cy.get('[data-test=downloadXMLBtn]').click();

From 87fc730962b9992fe92a4a2f269b964ea55d6c7c Mon Sep 17 00:00:00 2001
From: "Tuan N. Truong" <t.truong@vehikl.com>
Date: Tue, 30 Apr 2019 16:47:43 -0400
Subject: [PATCH 3/3] Refactor test

---
 tests/e2e/specs/IntermediateMessageCatchEvent.spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
index bed21e996..639962d9b 100644
--- a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
+++ b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
@@ -35,8 +35,9 @@ describe('Intermediate Message Catch Event', () => {
     const whiteList = 'example.com';
     typeIntoTextInput('[name=whitelist]', whiteList);
 
-    const validXML = `<bpmn:intermediateCatchEvent id="node_2" name="${name}" pm:allowedUsers="1,10" pm:allowedGroups="20,30" pm:whitelist="${whiteList}">
-      <bpmn:messageEventDefinition id="${eventId}" pm:variableName="${variableName}" />
+    const validXML =
+    `<bpmn:intermediateCatchEvent id="node_2" name="${name}" pm:allowedUsers="1,10" pm:allowedGroups="20,30" pm:whitelist="${whiteList}">
+      <bpmn:messageEventDefinition id="${eventId}" variableName="${variableName}" />
     </bpmn:intermediateCatchEvent>`;
 
     cy.get('[data-test=downloadXMLBtn]').click();