mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-09-09 18:39:41 +02:00
Lint fixes + fix for unit tests
This commit is contained in:
@@ -65,7 +65,9 @@ const sanitizeMore = (text, config) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const sanitizeText = (text, config) => {
|
export const sanitizeText = (text, config) => {
|
||||||
if(!text) return text;
|
const level = config.securityLevel;
|
||||||
|
console.log('security level', level);
|
||||||
|
if (!text) return text;
|
||||||
const txt = DOMPurify.sanitize(sanitizeMore(text, config));
|
const txt = DOMPurify.sanitize(sanitizeMore(text, config));
|
||||||
return txt;
|
return txt;
|
||||||
};
|
};
|
||||||
|
@@ -112,7 +112,7 @@ describe('[Singlenodes] when parsing', () => {
|
|||||||
expect(vert['a'].type).toBe('diamond');
|
expect(vert['a'].type).toBe('diamond');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should handle a single diamond node with html in it', function() {
|
it('should handle a single diamond node with html in it (SN3)', function() {
|
||||||
// Silly but syntactically correct
|
// Silly but syntactically correct
|
||||||
const res = flow.parser.parse('graph TD;a{A <br> end};');
|
const res = flow.parser.parse('graph TD;a{A <br> end};');
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ describe('[Singlenodes] when parsing', () => {
|
|||||||
|
|
||||||
expect(edges.length).toBe(0);
|
expect(edges.length).toBe(0);
|
||||||
expect(vert['a'].type).toBe('diamond');
|
expect(vert['a'].type).toBe('diamond');
|
||||||
expect(vert['a'].text).toBe('A <br/> end');
|
expect(vert['a'].text).toBe('A <br> end');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should handle a single hexagon node', function() {
|
it('should handle a single hexagon node', function() {
|
||||||
@@ -144,7 +144,7 @@ describe('[Singlenodes] when parsing', () => {
|
|||||||
|
|
||||||
expect(edges.length).toBe(0);
|
expect(edges.length).toBe(0);
|
||||||
expect(vert['a'].type).toBe('hexagon');
|
expect(vert['a'].type).toBe('hexagon');
|
||||||
expect(vert['a'].text).toBe('A <br/> end');
|
expect(vert['a'].text).toBe('A <br> end');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should handle a single round node with html in it', function() {
|
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(edges.length).toBe(0);
|
||||||
expect(vert['a'].type).toBe('round');
|
expect(vert['a'].type).toBe('round');
|
||||||
expect(vert['a'].text).toBe('A <br/> end');
|
expect(vert['a'].text).toBe('A <br> end');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should handle a single node with alphanumerics starting on a char', function() {
|
it('should handle a single node with alphanumerics starting on a char', function() {
|
||||||
|
@@ -328,7 +328,7 @@ describe('[Text] when parsing', () => {
|
|||||||
const edges = flow.parser.yy.getEdges();
|
const edges = flow.parser.yy.getEdges();
|
||||||
|
|
||||||
expect(vert['C'].type).toBe('round');
|
expect(vert['C'].type).toBe('round');
|
||||||
expect(vert['C'].text).toBe('Chimpansen hoppar åäö <br/> - ÅÄÖ');
|
expect(vert['C'].text).toBe('Chimpansen hoppar åäö <br> - ÅÄÖ');
|
||||||
});
|
});
|
||||||
// xit('it should handle åäö, minus and space and br',function(){
|
// xit('it should handle åäö, minus and space and br',function(){
|
||||||
// const res = flow.parser.parse('graph TD; A[Object(foo,bar)]-->B(Thing);');
|
// const res = flow.parser.parse('graph TD; A[Object(foo,bar)]-->B(Thing);');
|
||||||
|
@@ -195,7 +195,11 @@ export const addRelation = function (_id1, _id2, title) {
|
|||||||
}
|
}
|
||||||
addState(id1, type1);
|
addState(id1, type1);
|
||||||
addState(id2, type2);
|
addState(id2, type2);
|
||||||
currentDocument.relations.push({ id1, id2, title: common.sanitizeText(title, configApi.getConfig()) });
|
currentDocument.relations.push({
|
||||||
|
id1,
|
||||||
|
id2,
|
||||||
|
title: common.sanitizeText(title, configApi.getConfig()),
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const addDescription = function (id, _descr) {
|
const addDescription = function (id, _descr) {
|
||||||
@@ -204,7 +208,7 @@ const addDescription = function (id, _descr) {
|
|||||||
if (descr[0] === ':') {
|
if (descr[0] === ':') {
|
||||||
descr = descr.substr(1).trim();
|
descr = descr.substr(1).trim();
|
||||||
}
|
}
|
||||||
theState.descriptions.push(common.sanitizeText(descr, config));
|
theState.descriptions.push(common.sanitizeText(descr, configApi.getConfig()));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanupLabel = function (label) {
|
export const cleanupLabel = function (label) {
|
||||||
|
@@ -16,7 +16,6 @@ export const setConf = function (cnf) {
|
|||||||
conf[keys[i]] = cnf[keys[i]];
|
conf[keys[i]] = cnf[keys[i]];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let mainConfig = getConfig();
|
|
||||||
|
|
||||||
let nodeDb = {};
|
let nodeDb = {};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user