jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rename to get/setMembership (to indicate IDs and not group objects

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-06-18 13:57:17 -07:00
parent 1dbcf2a46a
commit 7f3114e67d
8 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/database-test.js
+2 -2
View File
@@ -1553,14 +1553,14 @@ describe('database', function () {
});
it('can set groups', function (done) {
groupdb.setGroups(USER_0.id, [ 'admin', GROUP_ID_1 ], function (error) {
groupdb.setMembership(USER_0.id, [ 'admin', GROUP_ID_1 ], function (error) {
expect(error).to.be(null);
done();
});
});
it('can get groups', function (done) {
groupdb.getGroups(USER_0.id, function (error, result) {
groupdb.getMembership(USER_0.id, function (error, result) {
expect(error).to.be(null);
expect(result).to.eql([ 'admin', GROUP_ID_1 ]);
done();
src/test/groups-test.js
+5 -5
View File
@@ -337,10 +337,10 @@ describe('Set user groups', function () {
after(cleanup);
it('can set user to single group', function (done) {
groups.setGroups(USER_0.id, [ group0Object.id ], function (error) {
groups.setMembership(USER_0.id, [ group0Object.id ], function (error) {
expect(error).to.be(null);
groups.getGroups(USER_0.id, function (error, groupIds) {
groups.getMembership(USER_0.id, function (error, groupIds) {
expect(error).to.be(null);
expect(groupIds.length).to.be(1);
expect(groupIds[0]).to.be(group0Object.id);
@@ -350,10 +350,10 @@ describe('Set user groups', function () {
});
it('can set user to multiple groups', function (done) {
groups.setGroups(USER_0.id, [ group0Object.id, group1Object.id ], function (error) {
groups.setMembership(USER_0.id, [ group0Object.id, group1Object.id ], function (error) {
expect(error).to.be(null);
groups.getGroups(USER_0.id, function (error, groupIds) {
groups.getMembership(USER_0.id, function (error, groupIds) {
expect(error).to.be(null);
expect(groupIds.length).to.be(2);
expect(groupIds.sort()).to.eql([ group0Object.id, group1Object.id ].sort());
@@ -391,7 +391,7 @@ describe('Roles', function () {
if (error) return next(error);
group0Object = result;
groups.setGroups(USER_0.id, [ group0Object.id ], next);
groups.setMembership(USER_0.id, [ group0Object.id ], next);
});
},
], done);
src/test/users-test.js
+4 -4
View File
@@ -673,7 +673,7 @@ describe('User', function () {
user1.id = result.id;
users.setGroups(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
users.setMembership(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
expect(error).to.not.be.ok();
// one mail for user creation, one mail for admin change
@@ -683,7 +683,7 @@ describe('User', function () {
});
it('add user to non admin group does not trigger admin mail', function (done) {
users.setGroups(user1.id, [ constants.ADMIN_GROUP_ID, groupObject.id ], function (error) {
users.setMembership(user1.id, [ constants.ADMIN_GROUP_ID, groupObject.id ], function (error) {
expect(error).to.equal(null);
checkMails(0, done);
@@ -691,7 +691,7 @@ describe('User', function () {
});
it('succeeds to remove admin flag', function (done) {
users.setGroups(user1.id, [ groupObject.id ], function (error) {
users.setMembership(user1.id, [ groupObject.id ], function (error) {
expect(error).to.eql(null);
checkMails(1, done);
@@ -726,7 +726,7 @@ describe('User', function () {
user1.id = result.id;
groups.setGroups(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
groups.setMembership(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
expect(error).to.eql(null);
users.getAllAdmins(function (error, admins) {