Fix for broken test

surelion · Oct 7, 2022 · 646f76d · 646f76d
1 parent 047e159
commit 646f76d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/V10-BreakingChanges.md b/V10-BreakingChanges.md
@@ -0,0 +1,5 @@
+# A collection of updates that change the behaviour
+
+## Lazy loading and asynchronisity
+
+- Invalid dates are rendered as syntax error instead of returning best guess or the current date
diff --git a/cypress/integration/rendering/gantt.spec.js b/cypress/integration/rendering/gantt.spec.js
@@ -92,7 +92,7 @@ describe('Gantt diagram', () => {
       {}
     );
   });
-  it('should render a gantt chart for issue #1060', () => {
+  it('should FAIL redering a gantt chart for issue #1060 with invalid date', () => {
     imgSnapshotTest(
       `
       gantt

diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html
@@ -56,7 +56,7 @@
   <body>
     <div>Security check</div>
     <pre id="diagram" class="mermaid">
-      classDiagram
+classDiagram
         direction LR
         class Student {
           -idCard : IdCard

diff --git a/package.json b/package.json
@@ -126,7 +126,6 @@
     "jsdom": "^20.0.1",
     "lint-staged": "^13.0.3",
     "markdown-it": "^13.0.1",
-    "moment": "^2.23.0",
     "path-browserify": "^1.0.1",
     "pnpm": "^7.13.2",
     "prettier": "^2.7.1",

diff --git a/packages/mermaid/src/diagrams/class/svgDraw.js b/packages/mermaid/src/diagrams/class/svgDraw.js
@@ -372,11 +372,11 @@ const buildLegacyDisplay = function (text) {
 
     const parameters = text.substring(methodStart + 1, methodEnd);
     const classifier = text.substring(methodEnd + 1, 1);
-    cssStyle = parseClassifier(classifier);
+    cssStyle = parseClassifier(text.substring(methodEnd + 1, methodEnd + 2));
 
     displayText = visibility + methodName + '(' + parseGenericTypes(parameters.trim()) + ')';
 
-    if (methodEnd < memberText.length) {
+    if (methodEnd < text.length) {
       returnType = text.substring(methodEnd + 2).trim();
       if (returnType !== '') {
         returnType = ' : ' + parseGenericTypes(returnType);

diff --git a/packages/mermaid/src/diagrams/gantt/ganttDb.js b/packages/mermaid/src/diagrams/gantt/ganttDb.js
@@ -217,10 +217,12 @@ const getStartDate = function (prevTime, dateFormat, str) {
   } else {
     log.debug('Invalid date:' + str);
     log.debug('With date format:' + dateFormat.trim());
+    const d = new Date(str);
+    if (typeof d === 'undefined' || isNaN(d.getTime())) {
+      throw new Error('Invalid date:' + str);
+    }
+    return d;
   }
-
-  // Default date - now
-  return new Date();
 };
 
 /**

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ describe('Gantt diagram', () => { @@
           {}
         );
       });
-      it('should render a gantt chart for issue #1060', () => {
+      it('should FAIL redering a gantt chart for issue #1060 with invalid date', () => {
         imgSnapshotTest(
           `
           gantt
@@ Expand Down @@