mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3574 from mermaid-js/sidv/fixE2E 

fix(tests): E2E
This commit is contained in:
Knut Sveidqvist 2022-10-07 10:25:55 +02:00 committed by GitHub
parent 883d0d5039 1fb671c561
commit 931120f73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/platform/knsv2.html
View File

@ -100,7 +100,7 @@ mindmap
logLevel: 0, logLevel: 0,
// basePath: './packages/', // basePath: './packages/',
// themeVariables: { darkMode: true }, // themeVariables: { darkMode: true },
extraDiagrams: ['./mermaid-mindmap-detector.core.mjs'], extraDiagrams: ['./mermaid-mindmap-detector.esm.mjs'],
// extraDiagrams: ['../../mermaid-mindmap/registry.ts'], // extraDiagrams: ['../../mermaid-mindmap/registry.ts'],
}); });
function callback() { function callback() {

17
cypress/platform/render-after-error.html
View File

@ -14,15 +14,16 @@
mermaid.init({ startOnLoad: false }); mermaid.init({ startOnLoad: false });
mermaid.mermaidAPI.initialize({ securityLevel: 'strict' }); mermaid.mermaidAPI.initialize({ securityLevel: 'strict' });
(async () => {
try {
console.log('rendering');
await mermaid.mermaidAPI.render('graphDiv', `>`);
} catch (e) {}
try { await mermaid.mermaidAPI.render('graphDiv', `graph LR\n a --> b`, (html) => {
console.log('rendering'); document.getElementById('graph').innerHTML = html;
mermaid.mermaidAPI.render('graphDiv', `>`); });
} catch (e) {} })();
mermaid.mermaidAPI.render('graphDiv', `graph LR\n a --> b`, (html) => {
document.getElementById('graph').innerHTML = html;
});
</script> </script>
</body> </body>
</html> </html>

2
cypress/platform/viewer.js
View File

@ -36,7 +36,7 @@ const contentLoaded = function () {
document.getElementsByTagName('body')[0].appendChild(div); document.getElementsByTagName('body')[0].appendChild(div);
} }
graphObj.mermaid.extraDiagrams = ['/mermaid-mindmap-detector.core.mjs']; graphObj.mermaid.extraDiagrams = ['/mermaid-mindmap-detector.esm.mjs'];
mermaid2.initialize(graphObj.mermaid); mermaid2.initialize(graphObj.mermaid);
mermaid2.init(); mermaid2.init();

3
packages/mermaid/src/diagram-api/detectType.ts
View File

@ -54,9 +54,6 @@ export const addDetector = (
loader: DiagramLoader | null loader: DiagramLoader | null
) => { ) => {
detectors[key] = { detector, loader }; detectors[key] = { detector, loader };
// TODO: Remove
// eslint-disable-next-line no-console
console.log(detectors);
}; };
export const getDiagramLoader = (key: string) => detectors[key].loader; export const getDiagramLoader = (key: string) => detectors[key].loader;

3
packages/mermaid/src/mermaid.ts
View File

@ -58,9 +58,6 @@ const init = async function (
if (typeof conf.extraDiagrams !== 'undefined' && conf.extraDiagrams.length > 0) { if (typeof conf.extraDiagrams !== 'undefined' && conf.extraDiagrams.length > 0) {
// config.extraDiagrams.forEach(async (diagram: string) => { // config.extraDiagrams.forEach(async (diagram: string) => {
const { id, detector, loadDiagram } = await import(conf.extraDiagrams[0]); const { id, detector, loadDiagram } = await import(conf.extraDiagrams[0]);
// TODO: Remove
// eslint-disable-next-line no-console
console.log(id, detector, loadDiagram);
addDetector(id, detector, loadDiagram); addDetector(id, detector, loadDiagram);
// }); // });
} }