Merge branch 'master' into story-134624635

test/e2e/globals.js

@@ -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

@@ -75,6 +75,9 @@ describe('/api/v1/auth/local', () => {
           .send({email: 'maria@gmail.com', password: 'password!'})
           .catch((err) => {
             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);
           })