Skip to content

Commit d9c41ae

Browse files
author
Ilya Radchenko
committed
Merge pull request #49 from deriven/master
Fix for webapp.getFile()
2 parents 0f6ae16 + a63fb0e commit d9c41ae

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

lib/webapp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = {
4747
var encodedFileName = encodeURIComponent(filename);
4848
var uri = util.format('projects/%d/repository/blobs/%s?filepath=%s', repoId, branch, encodedFileName);
4949

50-
api.get(account.config, uri, function (err, data, res) {
50+
api.get(account, uri, function (err, data, res) {
5151
if(err) {
5252
return done(err, null);
5353
} else {

test/test_webapp.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var providerConfig = {
4949
auth: {type: 'ssh'}
5050
};
5151

52-
var providerConfigForProjectWithMissingStriderJson =
52+
var providerConfigForProjectWithMissingStriderJson =
5353
{ whitelist: [],
5454
pull_requests: 'none',
5555
repo: 'http://nodev/stridertester/priproject2',
@@ -61,7 +61,7 @@ var providerConfigForProjectWithMissingStriderJson =
6161
name: 'Strider Tester' },
6262
url: 'git@nodev:stridertester/priproject2.git',
6363
scm: 'git',
64-
auth: { type: 'ssh' }
64+
auth: { type: 'ssh' }
6565
};
6666

6767
var repoProject = {
@@ -150,10 +150,8 @@ describe('gitlab webapp', function () {
150150

151151
//getFile only uses account.config
152152
var account = {
153-
config: {
154153
api_key: 'zRtVsmeznn7ySatTrnrp',
155154
api_url: 'http://localhost:80/api/v3'
156-
}
157155
};
158156

159157

0 commit comments

Comments
 (0)