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

Merge branch 'master' into design-pass-tweaks

Browse Source
This commit is contained in:
Belén Curcio
2017-02-02 07:55:41 -03:00
committed by GitHub
parent d1cf6fd19b 13114e7530
commit b4a03a5133
49 changed files with 928 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/globals.js
+1 -1
View File
@@ -1,6 +1,6 @@
module.exports = {
waitForConditionTimeout: 8000,
baseUrl: 'http://localhost:3000',
baseUrl: 'http://localhost:3011',
users: {
admin: {
email: 'admin@test.com',
test/routes/api/auth/index.js
+5 -2
View File
@@ -66,7 +66,7 @@ describe('/api/v1/auth/local', () => {
describe('email confirmation enabled', () => {
beforeEach(() => SettingsService.init({requireEmailConfirmation: true}));
beforeEach(() => SettingsService.update({requireEmailConfirmation: true}));
describe('#post', () => {
it('should not allow a login from a user that is not confirmed', () => {
@@ -74,7 +74,10 @@ describe('/api/v1/auth/local', () => {
.post('/api/v1/auth/local')
.send({email: 'maria@gmail.com', password: 'password!'})
.catch((err) => {
err.response.should.have.status(401);
expect(err).to.have.status(401);
err.response.body.should.have.property('error');
err.response.body.error.should.have.property('metadata');
err.response.body.error.metadata.should.have.property('message', 'maria@gmail.com');
return UsersService.createEmailConfirmToken(mockUser.id, mockUser.profiles[0].id);
})