From 7d802a71c19f9f2a67212f81cb9f2046cd285bc8 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Thu, 29 Jul 2021 18:11:48 +0200 Subject: [PATCH] Fix for tests --- src/diagrams/common/common.js | 8 +++++--- src/diagrams/flowchart/parser/flow-singlenode.spec.js | 6 +++--- src/diagrams/flowchart/parser/flow-text.spec.js | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/diagrams/common/common.js b/src/diagrams/common/common.js index 48c33a8bf..f23add312 100644 --- a/src/diagrams/common/common.js +++ b/src/diagrams/common/common.js @@ -63,8 +63,8 @@ const sanitizeMore = (text, config) => { return txt; }; -export const sanitizeText = (text) => { - const txt = sanitizeMore(DOMPurify.sanitize(text)); +export const sanitizeText = (text, config) => { + const txt = sanitizeMore(DOMPurify.sanitize(text), config); return txt; }; @@ -78,7 +78,9 @@ export const hasBreaks = (text) => { export const splitBreaks = (text) => { return text.split(//gi); }; - +const placeholderToBreak = (s) => { + return s.replace(/#br#/g, '
'); +}; const breakToPlaceholder = (s) => { return s.replace(lineBreakRegex, '#br#'); }; diff --git a/src/diagrams/flowchart/parser/flow-singlenode.spec.js b/src/diagrams/flowchart/parser/flow-singlenode.spec.js index 46df523b4..15f7cc169 100644 --- a/src/diagrams/flowchart/parser/flow-singlenode.spec.js +++ b/src/diagrams/flowchart/parser/flow-singlenode.spec.js @@ -121,7 +121,7 @@ describe('[Singlenodes] when parsing', () => { expect(edges.length).toBe(0); expect(vert['a'].type).toBe('diamond'); - expect(vert['a'].text).toBe('A
end'); + expect(vert['a'].text).toBe('A
end'); }); it('should handle a single hexagon node', function() { @@ -144,7 +144,7 @@ describe('[Singlenodes] when parsing', () => { expect(edges.length).toBe(0); expect(vert['a'].type).toBe('hexagon'); - expect(vert['a'].text).toBe('A
end'); + expect(vert['a'].text).toBe('A
end'); }); it('should handle a single round node with html in it', function() { @@ -156,7 +156,7 @@ describe('[Singlenodes] when parsing', () => { expect(edges.length).toBe(0); expect(vert['a'].type).toBe('round'); - expect(vert['a'].text).toBe('A
end'); + expect(vert['a'].text).toBe('A
end'); }); it('should handle a single node with alphanumerics starting on a char', function() { diff --git a/src/diagrams/flowchart/parser/flow-text.spec.js b/src/diagrams/flowchart/parser/flow-text.spec.js index b5c8a6eab..61703000a 100644 --- a/src/diagrams/flowchart/parser/flow-text.spec.js +++ b/src/diagrams/flowchart/parser/flow-text.spec.js @@ -328,7 +328,7 @@ describe('[Text] when parsing', () => { const edges = flow.parser.yy.getEdges(); expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe('Chimpansen hoppar åäö
- ÅÄÖ'); + expect(vert['C'].text).toBe('Chimpansen hoppar åäö
- ÅÄÖ'); }); // xit('it should handle åäö, minus and space and br',function(){ // const res = flow.parser.parse('graph TD; A[Object(foo,bar)]-->B(Thing);');