Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5532 from NodeBB/patch_5491

Browse Source 
Fix tests for #5491 fix
This commit is contained in:
Julian Lam
2017-03-15 23:11:09 -04:00
committed by GitHub
parent 23d4497c73 8f8babf90b
commit 2ef71e22aa
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/user/picture.js
View File

@@ -2,7 +2,6 @@
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var nconf = require('nconf');
var winston = require('winston'); var winston = require('winston');
var request = require('request'); var request = require('request');
var mime = require('mime'); var mime = require('mime');

2
test/uploads.js
View File

@@ -71,7 +71,7 @@ describe('Upload Controllers', function () {
assert.equal(res.statusCode, 200); assert.equal(res.statusCode, 200);
assert(Array.isArray(body)); assert(Array.isArray(body));
assert.equal(body.length, 1); assert.equal(body.length, 1);
assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/profile/' + regularUid + '-profileavatar.png'); assert.equal(body[0].url, '/assets/uploads/profile/' + regularUid + '-profileavatar.png');
done(); done();
}); });
}); });

2
test/user.js
View File

@@ -525,7 +525,7 @@ describe('User', function () {
}; };
User.uploadPicture(uid, picture, function (err, uploadedPicture) { User.uploadPicture(uid, picture, function (err, uploadedPicture) {
assert.ifError(err); assert.ifError(err);
assert.equal(uploadedPicture.url, nconf.get('relative_path') + '/assets/uploads/profile/' + uid + '-profileavatar.png'); assert.equal(uploadedPicture.url, '/assets/uploads/profile/' + uid + '-profileavatar.png');
assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png')); assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png'));
done(); done();
}); });