FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Make `Remote.delete` async and return error messages correctly by johnhaley81 · Pull Request #544 · nodegit/nodegit · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .js  (1) .json  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 6 additions & 0 deletions generate/input/descriptor.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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

Back | FazBrowse Home | New Git URL