Skip to content

Fix publishing #310

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

Merged
maxkorp merged 5 commits into from
Dec 5, 2014
Merged

Fix publishing #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7ee51c
start prepublishing generation
maxkorp Dec 4, 2014
a34e978
add default gitconfig user info to CI
maxkorp Dec 4, 2014
791a7ce
fix invalid error code returns from tests
maxkorp Dec 4, 2014
f0bebe4
fix and add tests
maxkorp Dec 4, 2014
bf20af5
Only test master and pull requests on appveyor
maxkorp Dec 5, 2014
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
Prev Previous commit
Next Next commit
fix and add tests
  • Loading branch information
@maxkorp
maxkorp committed Dec 4, 2014
commit f0bebe4490d1dd71626d592bbb01baabf6397d31
5 changes: 4 additions & 1 deletion test/tests/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,10 @@ describe("Merge", function() {
});
})
.then(function() {
return repository.mergeBranches(ourBranchName, theirBranchName);
return repository.mergeBranches(
ourBranchName,
theirBranchName,
ourSignature);
})
.then(function(oid) {
assert.equal(oid.toString(),
Expand Down
7 changes: 7 additions & 0 deletions test/tests/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ describe("Repository", function() {

var Repository = require("../../lib/repository");
var Index = require("../../lib/index");
var Signature = require("../../lib/signature");

before(function() {
var test = this;
Expand Down Expand Up @@ -58,4 +59,10 @@ describe("Repository", function() {
assert.equal(branch.shorthand(), "master");
});
});

it("can get the default signature", function() {
var sig = this.repository.defaultSignature();

assert(sig instanceof Signature);
});
});