Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolves E2E testing issues and issue #5343 #5344

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Resolves E2E testing issues and issue #5343 #5344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cypress/integration/rendering/gitGraph.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading