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

Make reset work with parent ref carets

Browse Source
This commit is contained in:
Raghu Rajagopalan
2016-05-07 10:52:24 +05:30
parent 8f8856b767
commit cbefb716e3
5 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ describe('when parsing a gitGraph',function() {
});
it('should handle set direction', function () {
var str = 'gitGraph TB:\n' +
var str = 'gitGraph BT:\n' +
'commit\n';
parser.parse(str);
@@ -81,7 +81,7 @@ describe('when parsing a gitGraph',function() {
expect(Object.keys(commits).length).toBe(1);
expect(parser.yy.getCurrentBranch()).toBe('master');
expect(parser.yy.getDirection()).toBe('TB');
expect(parser.yy.getDirection()).toBe('BT');
expect(Object.keys(parser.yy.getBranches()).length).toBe(1);
});
@@ -145,6 +145,24 @@ describe('when parsing a gitGraph',function() {
expect(parser.yy.getHead().id).toEqual(parser.yy.getBranches()['newbranch']);
});
it('reset can take an argument', function () {
var str = 'gitGraph:\n' +
'commit\n' +
'commit\n' +
'branch newbranch\n' +
'checkout newbranch\n' +
'commit\n' +
'reset master^\n';
parser.parse(str);
var commits = parser.yy.getCommits();
expect(Object.keys(commits).length).toBe(3);
expect(parser.yy.getCurrentBranch()).toBe('newbranch');
var master = commits[parser.yy.getBranches()['master']];
expect(parser.yy.getHead().id).toEqual(master.parent);
})
it('it should handle fast forwardable merges', function () {
var str = 'gitGraph:\n' +
'commit\n' +