Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Merge pull request #2516 from novaugust/last_login

Browse source 
Added populate last login time per #2515
This commit is contained in:
Hannah Wolfe 2014-04-05 19:50:36 +01:00
commit 395d7fd3e2
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/server/models/user.js
View file

@ -177,7 +177,7 @@ User = ghostBookshelf.Model.extend({
}); });
} }
return when(user.set('status', 'active').save()).then(function (user) { return when(user.set({status : 'active', last_login : new Date()}).save()).then(function (user) {
return user; return user;
}); });
}, errors.logAndThrowError); }, errors.logAndThrowError);

9
core/test/integration/model/model_users_spec.js
View file

@ -141,6 +141,15 @@ describe('User Model', function run() {
}, done); }, done);
}); });
it('sets last login time on successful login', function (done) {
var userData = testUtils.DataGenerator.forModel.users[0];
UserModel.check({email: userData.email, pw:userData.password}).then(function (activeUser) {
should.exist(activeUser.get('last_login'));
done();
}).then(null, done);
});
it('can\'t add second', function (done) { it('can\'t add second', function (done) {
var userData = testUtils.DataGenerator.forModel.users[1]; var userData = testUtils.DataGenerator.forModel.users[1];