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

make all tests work after group changes

Browse Source
This commit is contained in:
girish@cloudron.io
2016-02-09 09:37:12 -08:00
parent 199eb2b3e1
commit e752949752
8 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/database-test.js
View File

@@ -16,7 +16,8 @@ var appdb = require('../appdb.js'),
async = require('async'),
settingsdb = require('../settingsdb.js'),
tokendb = require('../tokendb.js'),
userdb = require('../userdb.js');
userdb = require('../userdb.js'),
_ = require('underscore');
describe('database', function () {
before(function (done) {
@@ -118,12 +119,16 @@ describe('database', function () {
});
});
it('can get all', function (done) {
userdb.getAll(function (error, all) {
it('can get all with group ids', function (done) {
userdb.getAllWithGroupIds(function (error, all) {
expect(error).to.not.be.ok();
expect(all.length).to.equal(2);
expect(all[0]).to.eql(USER_0);
expect(all[1]).to.eql(USER_1);
var user0Copy = _.extend({}, USER_0);
user0Copy.groupIds = [ ];
expect(all[0]).to.eql(user0Copy);
var user1Copy = _.extend({}, USER_1);
user1Copy.groupIds = [ ];
expect(all[1]).to.eql(user1Copy);
done();
});
});

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

@@ -15,18 +15,20 @@ var database = require('../database.js'),
ldapServer = require('../ldap.js'),
ldap = require('ldapjs');
// owner
var USER_0 = {
username: 'foobar0',
password: 'Foobar?1234',
email: 'foo0@bar.com',
displayName: 'Bob bobson'
username: 'username0',
password: 'Username0pass?1234',
email: 'user0@email.com',
displayName: 'User 0'
};
// normal user
var USER_1 = {
username: 'foobar1',
password: 'Foobar?12345',
email: 'foo1@bar.com',
displayName: 'Jesus'
username: 'username1',
password: 'Username1pass?12345',
email: 'user1@email.com',
displayName: 'User 1'
};
function setup(done) {
@@ -34,7 +36,7 @@ function setup(done) {
database.initialize.bind(null),
database._clear.bind(null),
ldapServer.start.bind(null),
user.create.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName),
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName),
user.create.bind(null, USER_1.username, USER_1.password, USER_1.email, USER_0.displayName, { invitor: USER_0 })
], done);
}
@@ -81,7 +83,7 @@ describe('Ldap', function () {
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
var opts = {
filter: '(&(l=Seattle)(email=*@foo.com))'
filter: '(&(l=Seattle)(email=*@email.com))'
};
client.search('o=example', opts, function (error, result) {
@@ -127,7 +129,7 @@ describe('Ldap', function () {
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
var opts = {
filter: '&(objectcategory=person)(username=foobar*)'
filter: '&(objectcategory=person)(username=username*)'
};
client.search('ou=users,dc=cloudron', opts, function (error, result) {

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

@@ -29,7 +29,6 @@ var userObject = null;
function cleanupUsers(done) {
async.series([
groupdb._clear,
database.query.bind(null, 'INSERT INTO groups (id, name) VALUES (?, ?)', [ groups.ADMIN_GROUP_ID, 'admin' ]),
userdb._clear,
mailer._clearMailQueue
], done);