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

Merge pull request #3479 from elliot-nelson/enelson/git-cherry-pick-tag

Browse Source 
feat(git): cherry-pick keyword supports tag attribute
This commit is contained in:
Ashish Jain
2022-09-20 17:38:01 +02:00
committed by GitHub
parent 8e3f9868eb 183fc35fea
commit a266a9c539
5 changed files with 123 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,48 @@ describe('Git Graph diagram', () => {
{}
);
});
it('11: should render a gitgraph with cherry pick commit with custom tag', () => {
imgSnapshotTest(
`
gitGraph
commit id: "ZERO"
branch develop
commit id:"A"
checkout main
commit id:"ONE"
checkout develop
commit id:"B"
checkout main
commit id:"TWO"
cherry-pick id:"A" tag: "snapshot"
commit id:"THREE"
checkout develop
commit id:"C"
`,
{}
);
});
it('11: should render a gitgraph with cherry pick commit with no tag', () => {
imgSnapshotTest(
`
gitGraph
commit id: "ZERO"
branch develop
commit id:"A"
checkout main
commit id:"ONE"
checkout develop
commit id:"B"
checkout main
commit id:"TWO"
cherry-pick id:"A" tag: ""
commit id:"THREE"
checkout develop
commit id:"C"
`,
{}
);
});
it('11: should render a simple gitgraph with two cherry pick commit', () => {
imgSnapshotTest(
`
@@ -207,7 +248,6 @@ describe('Git Graph diagram', () => {
{}
);
});
it('12: should render commits for more than 8 branches', () => {
imgSnapshotTest(
`