Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	public/src/admin/extend/plugins.js
This commit is contained in:
Baris Usakli
2017-08-11 11:33:06 -04:00
parent d9ad26c7c5 24bbf8fe00
commit bc6b1a8f56
164 changed files with 1042 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/user.js
View File

@@ -446,15 +446,16 @@ describe('User', function () {
});
});
it('.commit() should update the user\'s password', function (done) {
it('.commit() should update the user\'s password and confirm their email', function (done) {
User.reset.commit(code, 'newpassword', function (err) {
assert.ifError(err);
db.getObjectField('user:' + uid, 'password', function (err, newPassword) {
db.getObject('user:' + uid, function (err, userData) {
assert.ifError(err);
Password.compare('newpassword', newPassword, function (err, match) {
Password.compare('newpassword', userData.password, function (err, match) {
assert.ifError(err);
assert(match);
assert.equal(parseInt(userData['email:confirmed'], 10), 1);
done();
});
});