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

groups.create() now needs source argument

Browse Source
This commit is contained in:
Johannes Zellner
2020-06-04 14:17:56 +02:00
parent 812bdcd462
commit 42cbcc6ce3
6 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,42 +79,49 @@ describe('Groups', function () {
after(cleanup);
it('cannot create group - too small', function (done) {
groups.create('', function (error) {
groups.create('', '', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('cannot create group - too big', function (done) {
groups.create(new Array(256).join('a'), function (error) {
groups.create(new Array(256).join('a'), '', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('cannot create group - bad name', function (done) {
groups.create('bad:name', function (error) {
groups.create('bad:name', '', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('cannot create group - reserved', function (done) {
groups.create('users', function (error) {
groups.create('users', '', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('cannot create group - invalid', function (done) {
groups.create('cloudron+admin', function (error) {
groups.create('cloudron+admin', '', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('cannot create group - invalid source', function (done) {
groups.create('cloudron+admin', 'unknownsource', function (error) {
expect(error.reason).to.be(BoxError.BAD_FIELD);
done();
});
});
it('can create valid group', function (done) {
groups.create(GROUP0_NAME, function (error, result) {
groups.create(GROUP0_NAME, '', function (error, result) {
expect(error).to.be(null);
group0Object = result;
done();
@@ -123,14 +130,14 @@ describe('Groups', function () {
it('cannot create existing group with mixed case', function (done) {
var name = GROUP0_NAME[0].toUpperCase() + GROUP0_NAME.substr(1);
groups.create(name, function (error) {
groups.create(name, '', function (error) {
expect(error.reason).to.be(BoxError.ALREADY_EXISTS);
done();
});
});
it('cannot add existing group', function (done) {
groups.create(GROUP0_NAME, function (error) {
groups.create(GROUP0_NAME, 'ldap', function (error) {
expect(error.reason).to.be(BoxError.ALREADY_EXISTS);
done();
});
@@ -178,7 +185,7 @@ describe('Group membership', function () {
async.series([
setup,
function (next) {
groups.create(GROUP0_NAME, function (error, result) {
groups.create(GROUP0_NAME, '', function (error, result) {
if (error) return next(error);
group0Object = result;
next();
@@ -295,7 +302,7 @@ describe('Group membership', function () {
});
it('can remove group with member', function (done) {
groups.create(GROUP0_NAME, function (error, result) {
groups.create(GROUP0_NAME, '', function (error, result) {
expect(error).to.eql(null);
group0Object = result;
@@ -316,14 +323,14 @@ describe('Set user groups', function () {
async.series([
setup,
function (next) {
groups.create(GROUP0_NAME, function (error, result) {
groups.create(GROUP0_NAME, '', function (error, result) {
if (error) return next(error);
group0Object = result;
next();
});
},
function (next) {
groups.create(GROUP1_NAME, function (error, result) {
groups.create(GROUP1_NAME, '', function (error, result) {
if (error) return next(error);
group1Object = result;
next();

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

@@ -133,7 +133,7 @@ function setup(done) {
});
},
function (callback) {
groups.create(GROUP_NAME, function (error, result) {
groups.create(GROUP_NAME, '', function (error, result) {
if (error) return callback(error);
GROUP_ID = result.id;

4
src/test/users-test.js
View File

@@ -8,13 +8,11 @@
var async = require('async'),
BoxError = require('../boxerror.js'),
database = require('../database.js'),
constants = require('../constants.js'),
expect = require('expect.js'),
fs = require('fs'),
groupdb = require('../groupdb.js'),
groups = require('../groups.js'),
domains = require('../domains.js'),
mail = require('../mail.js'),
mailboxdb = require('../mailboxdb.js'),
maildb = require('../maildb.js'),
mailer = require('../mailer.js'),
@@ -738,7 +736,7 @@ describe('User', function () {
auditSource = _.extend({}, AUDIT_SOURCE, { userId: owner.id });
groups.create(NON_ADMIN_GROUP, done);
groups.create(NON_ADMIN_GROUP, '', done);
});
});