marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-10 02:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Sidharth Vinod
2023-08-11 16:47:05 +05:30
parent 18ce8ea865
commit df3de3dac7
3 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cypress/platform/e2e.html
View File

@@ -1,12 +1,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<script type="module"> <script type="module" src="./viewer.js"></script>
import { init } from './viewer.js';
import mermaid from './mermaid.esm.mjs';
import external from './mermaid-example-diagram.esm.mjs';
init(mermaid, external);
</script>
<link <link
href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap" href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap"
rel="stylesheet" rel="stylesheet"

32
cypress/platform/viewer.js
View File

@@ -1,6 +1,6 @@
import mermaid2 from './mermaid.esm.mjs'; import mermaid from './mermaid.esm.mjs';
import externalExample from '../../packages/mermaid-example-diagram/dist/mermaid-example-diagram.core.mjs'; import externalExample from './mermaid-example-diagram.core.mjs';
import zenUml from '../../packages/mermaid-zenuml/dist/mermaid-zenuml.core.mjs'; import zenUml from './mermaid-zenuml.core.mjs';
function b64ToUtf8(str) { function b64ToUtf8(str) {
return decodeURIComponent(escape(window.atob(str))); return decodeURIComponent(escape(window.atob(str)));
@@ -45,9 +45,9 @@ const contentLoaded = async function () {
document.getElementsByTagName('body')[0].appendChild(div); document.getElementsByTagName('body')[0].appendChild(div);
} }
await mermaid2.registerExternalDiagrams([externalExample, zenUml]); await mermaid.registerExternalDiagrams([externalExample, zenUml]);
mermaid2.initialize(graphObj.mermaid); mermaid.initialize(graphObj.mermaid);
await mermaid2.run(); await mermaid.run();
} }
}; };
@@ -99,14 +99,10 @@ const contentLoadedApi = async function () {
const cnf = merge(defaultE2eCnf, graphObj.mermaid); const cnf = merge(defaultE2eCnf, graphObj.mermaid);
mermaid2.initialize(cnf); mermaid.initialize(cnf);
for (let i = 0; i < numCodes; i++) { for (let i = 0; i < numCodes; i++) {
const { svg, bindFunctions } = await mermaid2.render( const { svg, bindFunctions } = await mermaid.render('newid' + i, graphObj.code[i], divs[i]);
'newid' + i,
graphObj.code[i],
divs[i]
);
div.innerHTML = svg; div.innerHTML = svg;
bindFunctions(div); bindFunctions(div);
} }
@@ -116,8 +112,8 @@ const contentLoadedApi = async function () {
div.className = 'mermaid'; div.className = 'mermaid';
console.warn('graphObj', graphObj); console.warn('graphObj', graphObj);
document.getElementsByTagName('body')[0].appendChild(div); document.getElementsByTagName('body')[0].appendChild(div);
mermaid2.initialize(graphObj.mermaid); mermaid.initialize(graphObj.mermaid);
const { svg, bindFunctions } = await mermaid2.render('newid', graphObj.code, div); const { svg, bindFunctions } = await mermaid.render('newid', graphObj.code, div);
div.innerHTML = svg; div.innerHTML = svg;
console.log(div.innerHTML); console.log(div.innerHTML);
bindFunctions(div); bindFunctions(div);
@@ -126,6 +122,9 @@ const contentLoadedApi = async function () {
}; };
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
mermaid.initialize({
startOnLoad: false,
});
/*! /*!
* Wait for document loaded before starting the execution * Wait for document loaded before starting the execution
*/ */
@@ -143,8 +142,3 @@ if (typeof document !== 'undefined') {
false false
); );
} }
export function init(mermaid, external) {
mermaid2 = mermaid;
externalExample = external;
}

10
cypress/platform/xss.html
View File

@@ -32,14 +32,6 @@
</script> </script>
</head> </head>
<body> <body>
<script type="module"> <script type="module" src="./viewer.js"></script>
import mermaid from './mermaid.esm.mjs';
import external from './mermaid-example-diagram.esm.mjs';
import { init } from './viewer.js';
mermaid.initialize({
startOnLoad: false,
});
init(mermaid, external);
</script>
</body> </body>
</html> </html>