Skip to content

Commit

Permalink
Fix compat with Octokat v0.10 for paged results
Browse files Browse the repository at this point in the history
Also, use 100 results per page to limit number of requests for repo list

close #140
  • Loading branch information
dontcallmedom committed Nov 14, 2018
1 parent aeda688 commit 8eb8d38
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions gh.js
Expand Up @@ -79,17 +79,17 @@ GH.prototype = {
accountRepo = this.octo.orgs(account.login);
}
var repoPage =function(list) {
return function(err, {items: repos}) {
return function(err, {items: repos, nextPage}) {
if (err) return accountCB(err);
var names = repos.map(function(r) { return r.name;});
if (repos.nextPage) {
repos.nextPage(repoPage(list.concat(names)));
const names = repos.map(r => r.name);
if (nextPage) {
nextPage.fetch(repoPage(list.concat(names)));
} else {
accountCB(null, {login: account.login, repos: list.concat(names)});
}
};
};
accountRepo.repos.fetch(repoPage([]));
accountRepo.repos.fetch({per_page: 100}, repoPage([]));
}.bind(this),
function(err, results) {
if (err) return cb(err);
Expand Down
4 changes: 2 additions & 2 deletions test/server-spec.js
Expand Up @@ -400,10 +400,10 @@ describe('Server manages requests from regular logged-in users', function () {
.get('/user/orgs')
.reply(200, [testOrg]);
nock('https://api.github.com')
.get('/users/' + testUser.username + '/repos')
.get('/users/' + testUser.username + '/repos?per_page=100')
.reply(200, []);
nock('https://api.github.com')
.get('/orgs/' + testOrg.login + '/repos')
.get('/orgs/' + testOrg.login + '/repos?per_page=100')
.reply(200, [testExistingRepo]);

var repos = {};
Expand Down

0 comments on commit 8eb8d38

Please sign in to comment.