wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-12 13:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore the userCreated event

Browse Source
This commit is contained in:
Wyatt Johnson
2018-03-12 16:39:38 -06:00
parent 2f5fc03e9c
commit f826db1edf
22 changed files with 176 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/server/services/comments.js
+10 -5
View File
@@ -1,9 +1,9 @@
const CommentModel = require('../../../models/comment');
const ActionModel = require('../../../models/action');
const UsersService = require('../../../services/users');
const SettingsService = require('../../../services/settings');
const CommentModel = require('../../../models/comment');
const CommentsService = require('../../../services/comments');
const Context = require('../../../graph/context');
const SettingsService = require('../../../services/settings');
const UsersService = require('../../../services/users');
const settings = {
id: '1',
@@ -119,9 +119,14 @@ describe('services.CommentsService', () => {
beforeEach(async () => {
await SettingsService.init(settings);
const ctx = Context.forSystem();
await Promise.all([
CommentModel.create(comments),
UsersService.createLocalUsers(users),
Promise.all(
users.map(({ email, password, username }) =>
UsersService.createLocalUser(ctx, email, password, username)
)
),
ActionModel.create(actions),
]);
});
test/server/services/tags.js
+3 -1
View File
@@ -1,8 +1,8 @@
const TagsService = require('../../../services/tags');
const UsersService = require('../../../services/users');
const SettingsService = require('../../../services/settings');
const CommentModel = require('../../../models/comment');
const Context = require('../../../graph/context');
const chai = require('chai');
const expect = chai.expect;
@@ -11,7 +11,9 @@ describe('services.TagsService', () => {
let comment, user;
beforeEach(async () => {
await SettingsService.init();
const ctx = Context.forSystem();
user = await UsersService.createLocalUser(
ctx,
'stampi@gmail.com',
'1Coral!!',
'Stampi'
test/server/services/tokens.js
+3
View File
@@ -1,6 +1,7 @@
const TokensService = require('../../../services/tokens');
const UsersService = require('../../../services/users');
const SettingsService = require('../../../services/settings');
const Context = require('../../../graph/context');
const chai = require('chai');
chai.use(require('chai-as-promised'));
@@ -10,7 +11,9 @@ describe('services.TokensService', () => {
let user;
beforeEach(async () => {
await SettingsService.init();
const ctx = Context.forSystem();
user = await UsersService.createLocalUser(
ctx,
'sockmonster@gmail.com',
'2Coral!!',
'Sockmonster'
test/server/services/users.js
+33 -30
View File
@@ -1,6 +1,7 @@
const UsersService = require('../../../services/users');
const SettingsService = require('../../../services/settings');
const mailer = require('../../../services/mailer');
const Context = require('../../../graph/context');
const chai = require('chai');
chai.use(require('chai-as-promised'));
@@ -18,23 +19,28 @@ describe('services.UsersService', () => {
};
await SettingsService.init(settings);
mockUsers = await UsersService.createLocalUsers([
{
email: 'stampi@gmail.com',
username: 'Stampi',
password: '1Coral!-',
},
{
email: 'sockmonster@gmail.com',
username: 'Sockmonster',
password: '2Coral!2',
},
{
email: 'marvel@gmail.com',
username: 'Marvel',
password: '3Coral!3',
},
]);
const ctx = Context.forSystem();
mockUsers = await Promise.all(
[
{
email: 'stampi@gmail.com',
username: 'Stampi',
password: '1Coral!-',
},
{
email: 'sockmonster@gmail.com',
username: 'Sockmonster',
password: '2Coral!2',
},
{
email: 'marvel@gmail.com',
username: 'Marvel',
password: '3Coral!3',
},
].map(({ email, username, password }) =>
UsersService.createLocalUser(ctx, email, password, username)
)
);
sinon.spy(mailer, 'send');
});
@@ -89,19 +95,16 @@ describe('services.UsersService', () => {
describe('#createLocalUser', () => {
it('should not create a user with duplicate username', () => {
return UsersService.createLocalUsers([
{
email: 'otrostampi@gmail.com',
username: 'StampiTheSecond',
password: '1Coralito!',
},
])
.then(user => {
expect(user).to.be.null;
})
.catch(error => {
expect(error).to.not.be.null;
});
const ctx = Context.forSystem();
return expect(
UsersService.createLocalUser(
ctx,
'otrostampi@gmail.com',
'1Coralito!',
'Stampi'
)
).be.rejected;
});
});