From f4d6ca8c92f22328d7c14057083d442d14238c85 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 6 Jun 2021 12:27:10 +0530 Subject: [PATCH 1/2] Cypress regex fix --- cypress/snapshots.js | 2 +- cypress/support/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/snapshots.js b/cypress/snapshots.js index f94d5e4a..e2663900 100644 --- a/cypress/snapshots.js +++ b/cypress/snapshots.js @@ -7,7 +7,7 @@ module.exports = { "1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":false}" } }, - "__version": "7.3.0", + "__version": "7.4.0", "Auto sync tests": { "should dim diagram when code is edited": { "1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Test\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}" diff --git a/cypress/support/index.js b/cypress/support/index.js index 01ff920f..6e3de8ab 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -18,10 +18,10 @@ import './commands'; // Alternatively you can use CommonJS syntax: // require('./commands') -const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/; + Cypress.on('uncaught:exception', (err) => { /* returning false here prevents Cypress from failing the test */ - if (resizeObserverLoopErrRe.test(err.message)) { + if (err.message.includes('ResizeObserver loop limit exceeded')) { return false; } }); From 09f4b4f35e971b5380b46b1329b6479342152027 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Tue, 8 Jun 2021 21:06:31 +0800 Subject: [PATCH 2/2] Fix typo in grammer --- src/lib/components/editor/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 6fcfbde9..b5e734be 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -19,7 +19,7 @@ export const initEditor = (monacoEditor): void => { 'gitGraph', 'journey' ], - keywords: ['patricipant', 'as'], + keywords: ['participant', 'as'], arrows: ['---', '===', '-->', '==>', '->>', '->'], tokenizer: { root: [