diff --git a/test/role.test.js b/test/role.test.js index d11f4b37..e2de4f92 100644 --- a/test/role.test.js +++ b/test/role.test.js @@ -15,7 +15,6 @@ var async = require('async'); var expect = require('chai').expect; function checkResult(err, result) { - // console.log(err, result); assert(!err); } @@ -65,11 +64,10 @@ describe('role model', function() { }); it('should define role/user relations', function() { - - User.create({name: 'Raymond', email: 'x@y.com', password: 'foobar'}, function(err, user) { - // console.log('User: ', user.id); - Role.create({name: 'userRole'}, function(err, role) { - role.principals.create({principalType: RoleMapping.USER, principalId: user.id}, function(err, p) { + User.create({ name: 'Raymond', email: 'x@y.com', password: 'foobar' }, function(err, user) { + Role.create({ name: 'userRole' }, function(err, role) { + role.principals.create({ principalType: RoleMapping.USER, principalId: user.id }, + function(err, p) { Role.find(function(err, roles) { assert(!err); assert.equal(roles.length, 1); @@ -77,7 +75,6 @@ describe('role model', function() { }); role.principals(function(err, principals) { assert(!err); - // console.log(principals); assert.equal(principals.length, 1); assert.equal(principals[0].principalType, RoleMapping.USER); assert.equal(principals[0].principalId, user.id); @@ -110,10 +107,8 @@ describe('role model', function() { }); it('should automatically generate role id', function() { - - User.create({name: 'Raymond', email: 'x@y.com', password: 'foobar'}, function(err, user) { - // console.log('User: ', user.id); - Role.create({name: 'userRole'}, function(err, role) { + User.create({ name: 'Raymond', email: 'x@y.com', password: 'foobar' }, function(err, user) { + Role.create({ name: 'userRole' }, function(err, role) { assert(role.id); role.principals.create({principalType: RoleMapping.USER, principalId: user.id}, function(err, p) { assert(p.id); @@ -125,7 +120,6 @@ describe('role model', function() { }); role.principals(function(err, principals) { assert(!err); - // console.log(principals); assert.equal(principals.length, 1); assert.equal(principals[0].principalType, RoleMapping.USER); assert.equal(principals[0].principalId, user.id); @@ -142,13 +136,12 @@ describe('role model', function() { }); it('should support getRoles() and isInRole()', function() { - User.create({name: 'Raymond', email: 'x@y.com', password: 'foobar'}, function(err, user) { - // console.log('User: ', user.id); - Role.create({name: 'userRole'}, function(err, role) { - role.principals.create({principalType: RoleMapping.USER, principalId: user.id}, function(err, p) { - // Role.find(console.log); - // role.principals(console.log); - Role.isInRole('userRole', {principalType: RoleMapping.USER, principalId: user.id}, function(err, exists) { + User.create({ name: 'Raymond', email: 'x@y.com', password: 'foobar' }, function(err, user) { + Role.create({ name: 'userRole' }, function(err, role) { + role.principals.create({ principalType: RoleMapping.USER, principalId: user.id }, + function(err, p) { + Role.isInRole('userRole', { principalType: RoleMapping.USER, principalId: user.id }, + function(err, exists) { assert(!err && exists === true); }); @@ -225,9 +218,9 @@ describe('role model', function() { assert(!err && yes); }); - // console.log('User: ', user.id); - Album.create({name: 'Album 1', userId: user.id}, function(err, album1) { - Role.isInRole(Role.OWNER, {principalType: ACL.USER, principalId: user.id, model: Album, id: album1.id}, function(err, yes) { + Album.create({ name: 'Album 1', userId: user.id }, function(err, album1) { + var role = { principalType: ACL.USER, principalId: user.id, model: Album, id: album1.id }; + Role.isInRole(Role.OWNER, role, function(err, yes) { assert(!err && yes); }); Album.create({name: 'Album 2'}, function(err, album2) {