Skip to content

Commit 25dc7e8

Browse files
author
Tobias Fuhrimann
committed
bugfix to read repos
1 parent c0b7d76 commit 25dc7e8

File tree

5 files changed

+43
-8
lines changed

5 files changed

+43
-8
lines changed

lib/api.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ function get(config, uri, done) {
5959

6060
if (res.headers.link) {
6161
var numberOfPages = parseLinkHeader(res.headers.link).last.page;
62-
var i = 1;
62+
var i = 0;
6363

6464
async.whilst(
6565
function() {
6666
return i < numberOfPages;
67-
},
67+
},
6868
function(callback) {
69+
i++;
6970
superagent
7071
.get(url)
7172
.query({
@@ -74,14 +75,12 @@ function get(config, uri, done) {
7475
page: i
7576
})
7677
.set('User-Agent', 'StriderCD (http://stridercd.com)')
77-
.end(function(err, res) {
78-
if (err) return callback(err);
78+
.end(function(err1, res) {
79+
if (err1) return callback(err1);
7980

8081
results = results.concat(res.body);
8182
callback(null, i);
8283
});
83-
84-
i++;
8584
},
8685
function(err, n) {
8786
if(err) return done(err);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "strider-gitlab",
3-
"version": "1.1.3",
3+
"version": "1.2.1",
44
"description": "A gitlab provider for strider",
55
"scripts": {
66
"test": "npm run lint && npm run tests",

test/mocks/gitlab_get.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,24 @@ module.exports = function () {
3434
'content-encoding': 'gzip'
3535
});
3636

37+
nock('http://localhost:80')
38+
.get('/api/v3/projects')
39+
.query({"private_token": "zRtVsmeznn7ySatTrnrp", "per_page": "100", "page": "1"})
40+
.reply(200, ["1f8b0800000000000003e5966d6f9b3010c7bf0af2eb94674862a9dabec3fa6a5d850c5c823702cc36a0aaea77df199c2c84e6a1daa44a9b9444e87c773eff7df7238f2f84e7842e1724079909de285e57849287824b0b3fcc6a44fd1d3265ed18af147e21b7d2674b15607d5182e720ac07900a84b4da4ac7ea4c1bd6962a4905abb20293ed9876c015c5b649c9a522f4f169419a362d7946e8869512168489ace01d6035c6d071c9535e72f59c94d04149a8bb205216492bca44d58980a6c6ec5bae3e57750e1d5558c8508433fc9aca3d1b3d70f342a9e624549ba8e30cd1cee5e81e521d8cfbdd1284db556c07e83da9c498939eab22d10eb26199f63aec6d39a38cfbda31a2614a8b789a489b2f249a4a8069b8942dc8042a96965a64255a147d07620ba8e44f5c53b3d59effe0a711b2e24d03c7bee6ba32014c419e30bc5ee2bb5e74e7aeeebcd5831b537f4923d7f6d7abaf584889dd90b04cf14edfec5bde6b1a2e6ddff7b5f790b51689ee526f54d58836766e7050faa0e16fcd8e4d755fc198a66acbd2247ebb5cac38f2ed78e9e902da263f77ac89dfb9f9d135585b51b78db5a985d540dd9460692bafb6961c67c8c68d58c7141384be90a1cf7495afaf7bf3d87b836d311e3cbe30b2c360ed271753bf7722c7deb86120fd2b13698ea74f0bc2c1817fe74c5e8b3f339567c3508ba10fb4ca6640a714d3172e4198b5491e5cd24d880d2715760436f9d0c470b8ba291ffabeb7b762bc543bab77cef8e8041b6c2cc85731e441eee35310876eb664ae17a7ee7abdfc24ef43f75bebba7e9cdf235f2bc533c42a768229ea4845dc5a1be718981e0aa1320d3248991be7992e49f9a148096918d9ebd58d48896810da61384cf431520c3e2648090f529fdebfd1edd4fc1b2d98ee02063d9706911dae822b5c99f84db972c4891106061b733e44333e6810eddfe69e26ce7bb1f0d75ed4274d2578f7675c9827b80d0c4771ff0419a6e7b9150dd3a83d1be6d6ab7098867c241dbc80466b7be9c5b7fde1086888effb20fc0fe8f0f40bfc3991d8f20b0000"], {
41+
server: 'nginx',
42+
date: 'Tue, 18 Aug 2015 14:32:30 GMT',
43+
'content-type': 'application/json',
44+
'transfer-encoding': 'chunked',
45+
connection: 'close',
46+
status: '200 OK',
47+
link: '<http://localhost/api/v3/projects?page=1&per_page=100>; rel="first", <http://localhost/api/v3/projects?page=1&per_page=100>; rel="last"',
48+
etag: 'W/"29dc98e2063c4571f4a98da2b681bb60"',
49+
'cache-control': 'max-age=0, private, must-revalidate',
50+
'x-request-id': '374db4c9-de67-4408-b9e8-49651bf8a7f3',
51+
'x-runtime': '0.616995',
52+
'content-encoding': 'gzip'
53+
});
54+
3755
//mocks a response when incorrect credentials are specified
3856
nock('http://localhost:80')
3957
.get('/api/v3/projects')

test/mocks/gitlab_webapp_listrepos.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,24 @@ module.exports = function () {
3838
'content-encoding': 'gzip'
3939
});
4040

41+
nock('http://localhost:80')
42+
.get('/api/v3/projects')
43+
.query({"private_token": "zRtVsmeznn7ySatTrnrp", "per_page": "100", "page": "1"})
44+
.reply(200, ["1f8b0800000000000003e5966d6f9b3010c7bf8ac5eb94e7474bd5f61dd657eb2ae4c0257823c06c03aaaa7ef79d816421340fd52655daa4248ace77e7f3df773f787c31786ed06865e42033c11bc5ebcaa0c643c125c10f238da8bf43a6c88ef14ae11772b27e26aa00f245099e83200f20150849da4ac7ea4c1bd6962a5d0b56650526db31ed802b8a6dd3924b65d0c7a795d1b4eb926706ddb052c2ca60222b780758cd64e8b8e46b5e72f59c96d04169507b654859a4ad285355a7029a1ab36fb9fa5cd539745461214311d6f03b55ee98e8819b174a3527a1da442d6b88b62e47f7b0d6c1b8df2d41b85dc57680deb34a2673da7355a4da41362cd35e87bd8935cab8af1d231aa6b488a789b4f942a2b90498864bd9824ca162eb528bac448ba2ef406c0195fc896b6ab1daf31ffc344256bc69e0d877baae4c005390a70cafd7706d27b8b3e33b277eb043ea4634b04d3789bf6221257643ca32c53b7db36f7927d48f4cd775b5f790b516a9ee52675475126dec5cefa0f441c3df9a1d9beabe82314dd596e594f8ed72b1e2c035c3c8d105b44d7eee5833bf73f3a36b205b51b70dd9d48234503725106de5d596c871864cdc88754c3161d01763e8335de5ebebde3cf6de605b8d070f2f8cec3058fbc9c5d4ef9dc8b1376e1848f7ca444ec7d3a70561e1c0bf7326afc59f99cab361a8c5d0075ae56940e714d3172e414c6bb33cb8a49b101b4e2aec086cf2a189e17075733ef47d6f6ec578a96656efacf1afe56db0b1208f43c8bddcc57f5ee8db59c46c275cdb49127d92f7befdadb56d37ccef91af95e21962153b612aea4845dc5a1b9718981f0aa1320f9a90b2342e335d92f24391e2533f3093f846a404d4f34ddf1f26fa1829133e6648f10f529fdeffa4dba9f9375a30dd050c3a36f502d38fbd2b5c99f9cdb972c48911061336967c08167cd020da3fcd1d4d9cf762e1af3da84f9a4af0eecfb8b04c701b188ee2fe0932cccf732b1ae6517b362cad57e1300ff9483a381e0d123372c22b2f1caeab5f4f8298baaee925d17f4087a75f735e9d4af20b0000"], {
45+
server: 'nginx',
46+
date: 'Sat, 22 Aug 2015 08:21:19 GMT',
47+
'content-type': 'application/json',
48+
'transfer-encoding': 'chunked',
49+
connection: 'close',
50+
status: '200 OK',
51+
link: '<http://localhost/api/v3/projects?page=1&per_page=100>; rel="first", <http://localhost/api/v3/projects?page=1&per_page=100>; rel="last"',
52+
etag: 'W/"4568d3770abe645a4a67a538d64ae3d3"',
53+
'cache-control': 'max-age=0, private, must-revalidate',
54+
'x-request-id': '1f82c7d6-2948-487a-bbcd-9e2a485b4fb0',
55+
'x-runtime': '0.089518',
56+
'content-encoding': 'gzip'
57+
});
58+
4159
//--------------------------------------------------------------------------------------
4260
//Simulate a 401 on bad credentials being sent
4361
nock('http://localhost:80')

test/test_webapp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ describe('gitlab webapp', function () {
295295
webapp.listRepos(config, function (err, repos) {
296296
expect(err).to.not.be.ok();
297297
expect(repos).to.be.an('array');
298-
expect(repos.length).to.eql(3);
298+
expect(repos.length).to.eql(6);
299299
done();
300300
});
301301
});

0 commit comments

Comments
 (0)