marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-15 06:19:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into next

Browse Source 
* develop:
  Resolves E2E testing issues and issue #5343
This commit is contained in:
Sidharth Vinod
2024-03-01 12:20:45 +05:30
parent 5807d521b7 2ac4e08e75
commit 70df6bbbca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -946,11 +946,11 @@ gitGraph TB:
it('46: should render GitGraph with merge back and merge forward', () => {
imgSnapshotTest(
`gitGraph LR:
commit
commit id:"1-abcdefg"
branch branch-A
branch branch-B
commit
commit id:"2-abcdefg"
checkout branch-A
merge branch-B
@@ -964,11 +964,11 @@ gitGraph TB:
it('47: should render GitGraph with merge back and merge forward | Vertical Branch', () => {
imgSnapshotTest(
`gitGraph TB:
commit
commit id:"1-abcdefg"
branch branch-A
branch branch-B
commit
commit id:"2-abcdefg"
checkout branch-A
merge branch-B
@@ -982,10 +982,10 @@ gitGraph TB:
it('48: should render GitGraph with merge on a new branch | Vertical Branch', () => {
imgSnapshotTest(
`gitGraph LR:
commit
commit id:"1-abcdefg"
branch branch-B order: 2
commit
commit id:"2-abcdefg"
branch branch-A
merge main
@@ -999,10 +999,10 @@ gitGraph TB:
it('49: should render GitGraph with merge on a new branch | Vertical Branch', () => {
imgSnapshotTest(
`gitGraph TB:
commit
commit id:"1-abcdefg"
branch branch-B order: 2
commit
commit id:"2-abcdefg"
branch branch-A
merge main