Merge pull request #3985 from aloisklink/test/fix-docs-semantic-merge…

…-conflict

Fix failing tests due to semantic merge conflict

package.json

@@ -106,7 +106,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4",
     "vite": "^3.2.3",
-    "vitest": "^0.25.3"
+    "vitest": "^0.27.1"
   },
   "volta": {
     "node": "18.12.1"

packages/mermaid/src/diagrams/sequence/sequenceDiagram.spec.js

@@ -48,9 +48,19 @@ vi.mock('d3', () => {
       return new NewD3();
     },
 
+    // TODO: In d3 these are CurveFactory types, not strings
     curveBasis: 'basis',
+    curveBasisClosed: 'basisClosed',
+    curveBasisOpen: 'basisOpen',
     curveLinear: 'linear',
     curveCardinal: 'cardinal',
+    curveLinearClosed: 'linearClosed',
+    curveMonotoneX: 'monotoneX',
+    curveMonotoneY: 'monotoneY',
+    curveNatural: 'natural',
+    curveStep: 'step',
+    curveStepAfter: 'stepAfter',
+    curveStepBefore: 'stepBefore',
   };
 });
 // -------------------------------

packages/mermaid/src/docs.spec.ts

@@ -1,7 +1,21 @@
 import { transformBlocks, transformToBlockQuote } from './docs.mjs';
 
-import { remark } from 'remark'; // import it this way so we can mock it
-vi.mock('remark');
+import { remark as remarkBuilder } from 'remark'; // import it this way so we can mock it
+
+const remark = remarkBuilder();
+
+vi.mock('remark', async (importOriginal) => {
+  const { remark: originalRemarkBuilder } = (await importOriginal()) as {
+    remark: typeof remarkBuilder;
+  };
+
+  // make sure that both `docs.mts` and this test file are using the same remark
+  // object so that we can mock it
+  const sharedRemark = originalRemarkBuilder();
+  return {
+    remark: () => sharedRemark,
+  };
+});
 
 afterEach(() => {
   vi.restoreAllMocks();