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

make ADMIN_GROUP_ID a constant

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-09-20 15:07:11 -07:00
parent 7fde57f7de
commit 9a000ddaf0
10 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/apps-test.js
View File

@@ -114,7 +114,7 @@ describe('Apps', function () {
userdb.add.bind(null, USER_1.id, USER_1),
groups.create.bind(null, GROUP_0),
groups.create.bind(null, GROUP_1),
groups.addMember.bind(null, groups.ADMIN_GROUP_ID, ADMIN_0.id),
groups.addMember.bind(null, constants.ADMIN_GROUP_ID, ADMIN_0.id),
groups.addMember.bind(null, GROUP_0, USER_1.id),
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0),
appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1),

3
src/test/groups-test.js
View File

@@ -7,6 +7,7 @@
'use strict';
var async = require('async'),
constants = require('../constants.js'),
database = require('../database.js'),
expect = require('expect.js'),
groups = require('../groups.js'),
@@ -287,7 +288,7 @@ describe('Admin group', function () {
after(cleanup);
it('cannot delete admin group ever', function (done) {
groups.remove(groups.ADMIN_GROUP_ID, function (error) {
groups.remove(constants.ADMIN_GROUP_ID, function (error) {
expect(error.reason).to.equal(GroupError.NOT_ALLOWED);
done();

6
src/test/user-test.js
View File

@@ -634,7 +634,7 @@ describe('User', function () {
user1.id = result.id;
user.setGroups(user1.id, [ groups.ADMIN_GROUP_ID ], function (error) {
user.setGroups(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
expect(error).to.not.be.ok();
// one mail for user creation, one mail for admin change
@@ -644,7 +644,7 @@ describe('User', function () {
});
it('add user to non admin group does not trigger admin mail', function (done) {
user.setGroups(user1.id, [ groups.ADMIN_GROUP_ID, NON_ADMIN_GROUP ], function (error) {
user.setGroups(user1.id, [ constants.ADMIN_GROUP_ID, NON_ADMIN_GROUP ], function (error) {
expect(error).to.equal(null);
checkMails(0, done);
@@ -687,7 +687,7 @@ describe('User', function () {
user1.id = result.id;
groups.setGroups(user1.id, [ groups.ADMIN_GROUP_ID ], function (error) {
groups.setGroups(user1.id, [ constants.ADMIN_GROUP_ID ], function (error) {
expect(error).to.eql(null);
user.getAllAdmins(function (error, admins) {