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

Replace alternateEmail with fallbackEmail

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-21 14:50:24 +01:00
parent 1e8aa209b1
commit 48d557b242
18 changed files with 65 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ var USER_0 = {
username: 'uuid0',
password: 'secret',
email: 'safe@me.com',
fallbackEmail: 'safer@me.com',
salt: 'morton',
createdAt: 'sometime back',
modifiedAt: 'now',
@@ -42,6 +43,7 @@ var USER_1 = {
username: 'uuid1',
password: 'secret',
email: 'safe2@me.com',
fallbackEmail: 'safer2@me.com',
salt: 'tata',
createdAt: 'sometime back',
modifiedAt: 'now',
@@ -54,6 +56,7 @@ var USER_2 = {
username: 'uuid2',
password: 'secret',
email: 'safe3@me.com',
fallbackEmail: 'safer3@me.com',
salt: 'tata',
createdAt: 'sometime back',
modifiedAt: 'now',
@@ -65,8 +68,7 @@ const TEST_DOMAIN = {
domain: 'example.com',
zoneName: 'example.com',
provider: 'manual',
config: {
}
config: {}
};
describe('database', function () {

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

@@ -210,7 +210,7 @@ describe('User', function () {
expect(result).to.be.ok();
expect(result.username).to.equal(USERNAME.toLowerCase());
expect(result.email).to.equal(EMAIL.toLowerCase());
expect(result.alternateEmail).not.to.be.ok();
expect(result.fallbackEmail).to.equal(EMAIL.toLowerCase());
// first user is owner, do not send mail to admins
checkMails(0, done);
@@ -268,7 +268,7 @@ describe('User', function () {
});
});
it('succeeds and attempts to send invite to alternateEmail', function (done) {
it('succeeds and attempts to send invite to fallbackEmail', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
@@ -277,8 +277,8 @@ describe('User', function () {
expect(error).not.to.be.ok();
expect(result).to.be.ok();
expect(result.username).to.equal(USERNAME_1.toLowerCase());
expect(result.email).to.equal(USERNAME_1.toLowerCase() + '@' + config.fqdn());
expect(result.alternateEmail).to.equal(EMAIL_1.toLowerCase());
expect(result.email).to.equal(EMAIL_1.toLowerCase());
expect(result.fallbackEmail).to.equal(EMAIL_1.toLowerCase());
// first user is owner, do not send mail to admins
checkMails(2, { sentTo: EMAIL_1.toLowerCase() }, function (error) {
@@ -636,7 +636,7 @@ describe('User', function () {
expect(result).to.be.ok();
expect(result.id).to.equal(userObject.id);
expect(result.email).to.equal(EMAIL.toLowerCase());
expect(result.alternateEmail).not.to.be.ok();
expect(result.fallbackEmail).to.equal(EMAIL.toLowerCase());
expect(result.username).to.equal(USERNAME.toLowerCase());
expect(result.displayName).to.equal(DISPLAY_NAME);
@@ -653,8 +653,8 @@ describe('User', function () {
expect(error).to.not.be.ok();
expect(result).to.be.ok();
expect(result.id).to.equal(userObject.id);
expect(result.email).to.equal(USERNAME.toLowerCase() + '@' + config.fqdn());
expect(result.alternateEmail).to.equal(EMAIL.toLowerCase());
expect(result.email).to.equal(EMAIL.toLowerCase());
expect(result.fallbackEmail).to.equal(EMAIL.toLowerCase());
expect(result.username).to.equal(USERNAME.toLowerCase());
expect(result.displayName).to.equal(DISPLAY_NAME);