From 8f8babf90bca84f9442ff36527e7947a629030d6 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak
Date: Wed, 15 Mar 2017 20:09:07 -0700
Subject: [PATCH] Fix tests
---
src/user/picture.js | 1 -
test/uploads.js | 2 +-
test/user.js | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/user/picture.js b/src/user/picture.js
index a4dee130fe..2b4f45d344 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -2,7 +2,6 @@
var async = require('async');
var fs = require('fs');
-var nconf = require('nconf');
var winston = require('winston');
var request = require('request');
var mime = require('mime');
diff --git a/test/uploads.js b/test/uploads.js
index 624b1c25b7..0daf0407b9 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -71,7 +71,7 @@ describe('Upload Controllers', function () {
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
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();
});
});
diff --git a/test/user.js b/test/user.js
index c956bfdcde..e417dac2d7 100644
--- a/test/user.js
+++ b/test/user.js
@@ -522,7 +522,7 @@ describe('User', function () {
};
User.uploadPicture(uid, picture, function (err, uploadedPicture) {
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'));
done();
});