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

Merge branch 'develop' into feature/5114_add_parallel_commit_config

Browse Source
This commit is contained in:
Matheus B
2023-12-22 21:32:20 -03:00
parent eb3e924c44 60280361b0
commit 46583cf4eb
32 changed files with 1208 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cypress/integration/rendering/gitGraph.spec.js
View File

@@ -811,7 +811,22 @@ gitGraph TB:
{}
);
});
it('40: should render default GitGraph with parallelCommits set to false', () => {
it('40: should render a simple gitgraph with cherry pick merge commit', () => {
imgSnapshotTest(
`gitGraph
commit id: "ZERO"
branch feature
branch release
checkout feature
commit id: "A"
commit id: "B"
checkout main
merge feature id: "M"
checkout release
cherry-pick id: "M" parent:"B"`
);
});
it('41: should render default GitGraph with parallelCommits set to false', () => {
imgSnapshotTest(
`gitGraph
commit id:"1-abcdefg"
@@ -830,7 +845,7 @@ gitGraph TB:
{ gitGraph: { parallelCommits: false } }
);
});
it('41: should render GitGraph with parallel commits', () => {
it('42: should render GitGraph with parallel commits', () => {
imgSnapshotTest(
`gitGraph
commit id:"1-abcdefg"
@@ -849,7 +864,7 @@ gitGraph TB:
{ gitGraph: { parallelCommits: true } }
);
});
it('42: should render GitGraph with parallel commits | Vertical Branch', () => {
it('43: should render GitGraph with parallel commits | Vertical Branch', () => {
imgSnapshotTest(
`gitGraph TB:
commit id:"1-abcdefg"