From 47bdc01cd0049d65f0ae3c51d9e53e7282237a66 Mon Sep 17 00:00:00 2001
From: Maciej Barelkowski <maciej.barelkowski@camunda.com>
Date: Wed, 9 Feb 2022 10:21:17 +0100
Subject: [PATCH] ci: test both supported bpmn-js versions

---
 .github/workflows/CI.yml                      |   5 +
 package.json                                  |   1 -
 test/TestHelper.js                            |  18 ++-
 test/spec/BpmnPropertiesPanelRenderer.spec.js | 114 ------------------
 4 files changed, 19 insertions(+), 119 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1d7279c37..f1f1029cb 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -7,6 +7,9 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         node-version: [ 14 ]
+        integration-deps:
+        - diagram-js@7.x bpmn-js@8.x
+        - diagram-js@8.x bpmn-js@9.0.0-alpha.2
 
     runs-on: ${{ matrix.os }}
 
@@ -28,6 +31,8 @@ jobs:
           ${{ runner.OS }}-
     - name: Install dependencies
       run: npm ci
+    - name: Install dependencies for integration
+      run: npm install ${{ matrix.integration-deps }}
     - name: Build
       env:
         COVERAGE: 1
diff --git a/package.json b/package.json
index dc7eb31bd..49214e99e 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "@testing-library/preact": "^2.0.1",
     "babel-loader": "^8.2.2",
     "bpmn-js": "9.0.0-alpha.2",
-    "bpmn-js-legacy": "npm:bpmn-js@^8.9.1",
     "bpmn-moddle": "^7.1.2",
     "camunda-bpmn-moddle": "^6.1.1",
     "chai": "^4.3.4",
diff --git a/test/TestHelper.js b/test/TestHelper.js
index fe5f3fafb..22c90f751 100644
--- a/test/TestHelper.js
+++ b/test/TestHelper.js
@@ -99,10 +99,20 @@ export function insertBpmnStyles() {
     require('bpmn-js/dist/assets/diagram-js.css').default
   );
 
-  insertCSS(
-    'bpmn-js.css',
-    require('bpmn-js/dist/assets/bpmn-js.css').default
-  );
+  // @barmac: this fails before bpmn-js@9
+  try {
+    insertCSS(
+      'bpmn-js.css',
+      require('bpmn-js/dist/assets/bpmn-js.css').default
+    );
+  } catch (error) {
+    const bpmnJsVersion = require('bpmn-js/package.json').version;
+
+    // rethrow for unexpected error
+    if (!bpmnJsVersion.startsWith('8')) {
+      throw error;
+    }
+  }
 
   insertCSS(
     'bpmn-font.css',
diff --git a/test/spec/BpmnPropertiesPanelRenderer.spec.js b/test/spec/BpmnPropertiesPanelRenderer.spec.js
index 02d8cefaf..1f48f537e 100644
--- a/test/spec/BpmnPropertiesPanelRenderer.spec.js
+++ b/test/spec/BpmnPropertiesPanelRenderer.spec.js
@@ -19,8 +19,6 @@ import {
 
 import Modeler from 'bpmn-js/lib/Modeler';
 
-import LegacyModeler from 'bpmn-js-legacy/lib/Modeler';
-
 import BpmnPropertiesPanel from 'src/render';
 
 import BpmnPropertiesProvider from 'src/provider/bpmn';
@@ -246,118 +244,6 @@ describe('<BpmnPropertiesPanelRenderer>', function() {
   });
 
 
-  describe('bpmn-js@8', function() {
-
-    it('should import simple process (cloud)', async function() {
-
-      // given
-      const diagramXml = require('test/fixtures/simple.bpmn').default;
-
-      // when
-      const result = await createModeler(
-        diagramXml,
-        {
-          additionalModules: [
-            ZeebeModdleExtension,
-            BpmnPropertiesPanel,
-            BpmnPropertiesProvider,
-            ZeebePropertiesProvider
-          ],
-          moddleExtensions: {
-            zeebe: ZeebeModdle
-          },
-          description: DescriptionProvider
-        },
-        LegacyModeler
-      );
-
-      // then
-      expect(result.error).not.to.exist;
-    });
-
-
-    it('should import simple process (platform)', async function() {
-
-      // given
-      const diagramXml = require('test/fixtures/simple.bpmn').default;
-
-      // when
-      const result = await createModeler(
-        diagramXml,
-        {
-          additionalModules: [
-            CamundaModdleExtension,
-            BpmnPropertiesPanel,
-            BpmnPropertiesProvider,
-            CamundaPropertiesProvider
-          ],
-          moddleExtensions: {
-            camunda: CamundaModdle
-          }
-        },
-        LegacyModeler
-      );
-
-      // then
-      expect(result.error).not.to.exist;
-    });
-
-
-    it('should import simple process (bpmn)', async function() {
-
-      // given
-      const diagramXml = require('test/fixtures/simple.bpmn').default;
-
-      // when
-      const result = await createModeler(
-        diagramXml,
-        {
-          additionalModules: [
-            CamundaModdleExtension,
-            BpmnPropertiesPanel,
-            BpmnPropertiesProvider
-          ]
-        },
-        LegacyModeler
-      );
-
-      // then
-      expect(result.error).not.to.exist;
-    });
-
-
-    it('should import simple process (templates)', async function() {
-
-      // given
-      const diagramXml = require('test/spec/provider/element-templates/fixtures/complex.bpmn').default;
-
-      const elementTemplates = require('test/spec/provider/element-templates/fixtures/complex.json');
-
-      // when
-      const result = await createModeler(
-        diagramXml,
-        {
-          additionalModules: [
-            CamundaModdleExtension,
-            BpmnPropertiesPanel,
-            BpmnPropertiesProvider,
-            ElementTemplatesPropertiesProvider
-          ],
-          moddleExtensions: {
-            camunda: CamundaModdle
-          },
-          elementTemplates
-        },
-        LegacyModeler
-      );
-
-      // then
-      expect(result.error).not.to.exist;
-    });
-
-  });
-
-
   it('should attach on diagram.init', async function() {
 
     // given