wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 18:49:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes for tests

Browse Source
This commit is contained in:
Wyatt Johnson
2018-04-30 16:13:48 -06:00
parent 7a0c9c85bc
commit b42d325cb0
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/users.js
+1 -1
View File
@@ -296,7 +296,7 @@ class Users {
if (
!['UNSET', 'APPROVED', 'SET'].includes(user.status.username.status) ||
!user.status.username.history.some(({ created_at }) =>
user.status.username.history.some(({ created_at }) =>
moment(created_at).isAfter(oldestEditTime)
)
) {
test/server/services/users.js
+43 -43
View File
@@ -304,63 +304,63 @@ describe('services.UsersService', () => {
await UsersService[func](user.id, user.username);
}
});
});
if (func === 'setUsername') {
it('should let a user set their username from UNSET', async () => {
const user = mockUsers[0];
if (func === 'setUsername') {
it('should let a user set their username from UNSET', async () => {
const user = mockUsers[0];
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, 'UNSET');
await UsersService.setUsername(user.id, 'new_username', null);
});
describe('time based', () => {
afterEach(() => {
timekeeper.reset();
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, 'UNSET');
await UsersService.setUsername(user.id, 'new_username', null);
});
['SET', 'APPROVED'].forEach(status => {
it(`should not allow users to change their username if it was changed within 14 of today from ${status}`, async () => {
const user = mockUsers[0];
describe('time based', () => {
afterEach(() => {
timekeeper.reset();
});
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, status);
['SET', 'APPROVED'].forEach(status => {
it(`should not allow users to change their username if it was changed within 14 of today from ${status}`, async () => {
const user = mockUsers[0];
timekeeper.travel(
moment()
.add(5, 'days')
.toDate()
);
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, status);
try {
await UsersService.setUsername(user.id, 'new_username', null);
throw new Error('edit was processed successfully');
} catch (err) {
expect(err).have.property(
'translation_key',
'EDIT_USERNAME_NOT_AUTHORIZED'
timekeeper.travel(
moment()
.add(5, 'days')
.toDate()
);
}
});
it(`allows users to change their username if it was changed 14 days before today from ${status}`, async () => {
const user = mockUsers[0];
try {
await UsersService.setUsername(user.id, 'new_username', null);
throw new Error('edit was processed successfully');
} catch (err) {
expect(err).have.property(
'translation_key',
'EDIT_USERNAME_NOT_AUTHORIZED'
);
}
});
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, status);
it(`allows users to change their username if it was changed 14 days before today from ${status}`, async () => {
const user = mockUsers[0];
timekeeper.travel(
moment()
.add(15, 'days')
.toDate()
);
// Set the user to the desired status.
await UsersService.setUsernameStatus(user.id, status);
await UsersService.setUsername(user.id, 'new_username', null);
timekeeper.travel(
moment()
.add(15, 'days')
.toDate()
);
await UsersService.setUsername(user.id, 'new_username', null);
});
});
});
});
}
}
});
});
describe('#isValidUsername', () => {