mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 00:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

big command factoring

Browse source
This commit is contained in:
Peter Cottle 2013-07-27 22:46:46 -07:00
parent af3d440874
commit 5ec8a2916f
9 changed files with 351 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spec/git.spec.js
View file

@ -1,6 +1,10 @@
var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
var TreeCompare = require('../src/js/git/treeCompare').TreeCompare;
var TIME = 150;
// useful for throwing garbage and then expecting one commit
var oneCommit = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
var loadTree = function(json) {
return JSON.parse(unescape(json));
};
@ -14,12 +18,21 @@ var compareAnswer = function(headless, expectedJSON) {
var expectTreeAsync = function(command, expectedJSON) {
var headless = new HeadlessGit();
var start = Date.now();
var haveReported = false;
runs(function() {
headless.sendCommand(command);
});
waitsFor(function() {
var diff = (Date.now() - start);
if (diff > TIME - 50 && !haveReported) {
haveReported = true;
console.log('not going to match', command);
console.log('expected', loadTree(expectedJSON), 'actual', headless.gitEngine.exportTree());
}
return compareAnswer(headless, expectedJSON);
}, 'trees should be equal', 750);
}, 'trees should be equal', 100);
};
describe('GitEngine', function() {
@ -30,6 +43,20 @@ describe('GitEngine', function() {
);
});
it('handles commit options', function() {
expectTreeAsync(
'git commit; git commit --amend;',
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
);
});
it('throws with bad arg options', function() {
expectTreeAsync(
'git commit foo; git commit -am -m; git commit -am -a; git commit -am "hi" "ho"; git commit',
oneCommit
);
});
it('Checkouts', function() {
expectTreeAsync(
'git checkout -b side',