Skip to content

Make Remote.delete async and return error messages correctly #544

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
johnhaley81 merged 1 commit into from
Apr 20, 2015
Merged

Make Remote.delete async and return error messages correctly #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,12 @@
"git_remote_default_branch": {
"ignore": true
},
"git_remote_delete": {
"isAsync": true,
"return": {
"isErrorCode": true
}
},
"git_remote_fetch": {
"args": {
"reflog_message": {
Expand Down
23 changes: 15 additions & 8 deletions test/tests/remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ describe("Remote", function() {
var url2 = "https://github.com/nodegit/test2";

function removeOrigins(repository) {
Remote.delete(repository, "origin1");
Remote.delete(repository, "origin2");
Remote.delete(repository, "origin3");
Remote.delete(repository, "test2");
return Promise.all([
Remote.delete(repository, "origin1"),
Remote.delete(repository, "origin2"),
Remote.delete(repository, "origin3"),
Remote.delete(repository, "test2")
])
.catch(function() {
// We don't care if a remote was unable to be deleted. Just try to wipe
// everything and we'll start from a clean slate each time.
});
}

beforeEach(function() {
Expand Down Expand Up @@ -76,9 +82,10 @@ describe("Remote", function() {
var repository = this.repository;
Remote.create(repository, "origin3", url);

Remote.delete(repository, "origin3");

return Remote.lookup(repository, "origin3")
return Remote.delete(repository, "origin3")
.then(function() {
return Remote.lookup(repository, "origin3");
})
.then(Promise.reject, Promise.resolve);
});

Expand Down Expand Up @@ -131,7 +138,7 @@ describe("Remote", function() {
.then(function() {
assert.ok(wasCalled);

Remote.delete(repo, "test2");
return Remote.delete(repo, "test2");
});
});

Expand Down