Skip to content

Commit

Permalink
Test for invite users error
Browse files Browse the repository at this point in the history
refs #3433
  • Loading branch information
ErisDS committed Jul 29, 2014
1 parent f5a3a05 commit 49660ff
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
26 changes: 25 additions & 1 deletion core/test/integration/model/model_users_spec.js
Expand Up @@ -5,9 +5,11 @@ var testUtils = require('../../utils'),
when = require('when'),
sinon = require('sinon'),
uuid = require('node-uuid'),
_ = require('lodash'),

// Stuff we are testing
UserModel = require('../../../server/models').User,
RoleModel = require('../../../server/models').Role,
context = testUtils.context.admin,
sandbox = sinon.sandbox.create();

Expand Down Expand Up @@ -125,7 +127,7 @@ describe('User Model', function run() {
});

describe('Basic Operations', function () {
beforeEach(testUtils.setup('owner'));
beforeEach(testUtils.setup('owner', 'role'));

it('sets last login time on successful login', function (done) {
var userData = testUtils.DataGenerator.forModel.users[0];
Expand Down Expand Up @@ -211,6 +213,28 @@ describe('User Model', function run() {
}).catch(done);
});

it('can add', function (done) {
var userData = testUtils.DataGenerator.forModel.users[2];

sandbox.stub(UserModel, 'gravatarLookup', function (userData) {
return when.resolve(userData);
});

RoleModel.findOne().then(function (role) {
userData.roles = [role.toJSON()];

return UserModel.add(userData, _.extend({}, context));
}).then(function (createdUser) {
should.exist(createdUser);
createdUser.has('uuid').should.equal(true);
createdUser.get('password').should.not.equal(userData.password, 'password was hashed');
createdUser.get('email').should.eql(userData.email, 'email address correct');
createdUser.related('roles').toJSON()[0].name.should.eql('Administrator', 'role set correctly');

done();
}).catch(done);
});

it('can destroy', function (done) {
var firstUser = {id: 1};

Expand Down
10 changes: 8 additions & 2 deletions core/test/utils/fixtures/data-generator.js
Expand Up @@ -414,7 +414,8 @@ DataGenerator.forModel = (function () {

var posts,
tags,
users;
users,
roles;

posts = _.map(DataGenerator.Content.posts, function (post) {
return _.pick(post, 'title', 'markdown');
Expand All @@ -430,10 +431,15 @@ DataGenerator.forModel = (function () {
}, user);
});

roles = _.map(DataGenerator.Content.roles, function (role, id) {
return _.extend({}, role, {id: id + 1});
});

return {
posts: posts,
tags: tags,
users: users
users: users,
roles: roles
};

}());
Expand Down

0 comments on commit 49660ff

Please sign in to comment.