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

resolve PR comments

Browse Source
This commit is contained in:
darshanr0107
2025-07-03 13:57:36 +05:30
parent 592c5bb880
commit 648698a43a
2 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1569,37 +1569,4 @@ gitGraph TB:
{}
);
});
it('77:should render gitGraph with duplicate commit IDs and log warnings', () => {
imgSnapshotTest(
`gitGraph
commit id:"initial commit"
commit id:"work on first release"
commit id:"design freeze from here"
branch v1-rc
checkout v1-rc
commit id:"bugfix 1"
commit id:"bigfix 2" tag:"v1.0.1"
branch FORK-v1.0-MDR
checkout FORK-v1.0-MDR
commit id:"working on MDR"
checkout v1-rc
commit id:"minor design changes for MDR" tag:"v1.0.2"
checkout FORK-v1.0-MDR
merge v1-rc
checkout main
commit id:"new feature for v1.1…"
checkout FORK-v1.0-MDR
commit id:"working on MDR"
commit id:"finishing MDR"
branch v1.0-MDR
checkout v1.0-MDR
commit id:"brush up release" tag:"v1.0.2-MDR"
checkout v1-rc
commit id:"bugfix without MDR"
checkout main
commit id:"work on v1.1"`,
{}
);
cy.log('Warning: Commit ID "working on MDR" already exists');
});
});

40
packages/mermaid/src/diagrams/git/gitGraph.spec.ts
View File

@@ -1,4 +1,4 @@
import { rejects } from 'assert';
import { log } from '../../logger.js';
import { db } from './gitGraphAst.js';
import { parser } from './gitGraphParser.js';
@@ -1319,4 +1319,42 @@ describe('when parsing a gitGraph', function () {
}
});
});
it('should log a warning when two commits have the same ID', async () => {
const str = `gitGraph
commit id:"initial commit"
commit id:"work on first release"
commit id:"design freeze from here"
branch v1-rc
checkout v1-rc
commit id:"bugfix 1"
commit id:"bigfix 2" tag:"v1.0.1"
branch FORK-v1.0-MDR
checkout FORK-v1.0-MDR
commit id:"working on MDR"
checkout v1-rc
commit id:"minor design changes for MDR" tag:"v1.0.2"
checkout FORK-v1.0-MDR
merge v1-rc
checkout main
commit id:"new feature for v1.1…"
checkout FORK-v1.0-MDR
commit id:"working on MDR"
commit id:"finishing MDR"
branch v1.0-MDR
checkout v1.0-MDR
commit id:"brush up release" tag:"v1.0.2-MDR"
checkout v1-rc
commit id:"bugfix without MDR"
checkout main
commit id:"work on v1.1"
`;
const spyOn = vi.spyOn(log, 'warn').mockImplementation(() => undefined);
await parser.parse(str);
expect(spyOn).toHaveBeenCalledWith('Commit ID working on MDR already exists');
spyOn.mockRestore();
});
});