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

handle fast forward merges

Browse Source
This commit is contained in:
Raghu Rajagopalan
2016-03-27 16:13:07 +05:30
parent 422d78cbcd
commit 462c3d3a6c
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/diagrams/gitGraph/gitGraphParser.spec.js
View File

@@ -85,14 +85,33 @@ describe('when parsing a gitGraph',function() {
'commit\n' +
'reset master\n';
console.log(parser.parse(str));
var commits = parser.yy.getCommits();
console.log(commits);
parser.parse(str);
var commits = parser.yy.getCommits();
expect(Object.keys(commits).length).toBe(3);
expect(parser.yy.getCurrentBranch()).toBe("newbranch");
expect(parser.yy.getBranches()["newbranch"]).toEqual(parser.yy.getBranches()["master"]);
expect(parser.yy.getHead().id).toEqual(parser.yy.getBranches()["newbranch"]);
});
it('it should handle fast forwardable merges', function () {
var str = 'gitGraph:\n' +
'commit\n' +
'branch newbranch\n' +
'checkout newbranch\n' +
'commit\n' +
'commit\n' +
'checkout master\n'+
'merge newbranch\n';
parser.parse(str);
var commits = parser.yy.getCommits();
console.log(commits);
expect(Object.keys(commits).length).toBe(3);
expect(parser.yy.getCurrentBranch()).toBe("master");
expect(parser.yy.getBranches()["newbranch"]).toEqual(parser.yy.getBranches()["master"]);
expect(parser.yy.getHead().id).toEqual(parser.yy.getBranches()["newbranch"]);
});
});