From 0fb3fa14ce8f840182e5e21a51ff56b779d50980 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian.mihalache@thinslices.com>
Date: Thu, 29 Mar 2018 16:24:32 +0300
Subject: [PATCH] feat(component-invite): fix invite tests
---
.../src/controllers/inviteGlobalRole.js | 10 +++++++++-
.../component-invite/src/tests/fixtures/collections.js | 2 +-
.../component-invite/src/tests/fixtures/userData.js | 4 ++++
packages/component-invite/src/tests/fixtures/users.js | 6 +++---
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/packages/component-invite/src/controllers/inviteGlobalRole.js b/packages/component-invite/src/controllers/inviteGlobalRole.js
index 43ec7b51c..1bc713320 100644
--- a/packages/component-invite/src/controllers/inviteGlobalRole.js
+++ b/packages/component-invite/src/controllers/inviteGlobalRole.js
@@ -26,7 +26,7 @@ module.exports = async (body, models, res, url) => {
return res.status(500).json({ error: e.details[0].message })
}
- return userHelper.setupNewUser(
+ const newUser = await userHelper.setupNewUser(
body,
url,
res,
@@ -35,5 +35,13 @@ module.exports = async (body, models, res, url) => {
models.User,
'invite',
)
+
+ if (newUser.error !== undefined) {
+ return res.status(newUser.status).json({
+ error: newUser.message,
+ })
+ }
+
+ return res.status(200).json(newUser)
}
}
diff --git a/packages/component-invite/src/tests/fixtures/collections.js b/packages/component-invite/src/tests/fixtures/collections.js
index cebc801fd..e391a07a1 100644
--- a/packages/component-invite/src/tests/fixtures/collections.js
+++ b/packages/component-invite/src/tests/fixtures/collections.js
@@ -8,7 +8,7 @@ module.exports = {
title: 'Standard Collection',
type: 'collection',
fragments: [],
- owners: [],
+ owners: [submittingAuthor.id],
save: jest.fn(),
assignedPeople: [
{
diff --git a/packages/component-invite/src/tests/fixtures/userData.js b/packages/component-invite/src/tests/fixtures/userData.js
index 8b03a81e7..1aa723ca0 100644
--- a/packages/component-invite/src/tests/fixtures/userData.js
+++ b/packages/component-invite/src/tests/fixtures/userData.js
@@ -15,4 +15,8 @@ module.exports = {
firstName: chance.first(),
lastName: chance.last(),
},
+ admin: {
+ id: chance.guid(),
+ email: chance.email(),
+ },
}
diff --git a/packages/component-invite/src/tests/fixtures/users.js b/packages/component-invite/src/tests/fixtures/users.js
index ffd92ce7a..65eebb6d7 100644
--- a/packages/component-invite/src/tests/fixtures/users.js
+++ b/packages/component-invite/src/tests/fixtures/users.js
@@ -1,6 +1,6 @@
const { standardCollection } = require('./collections')
const { heTeamID, reviewerTeamID } = require('./teamIDs')
-const { handlingEditor, submittingAuthor } = require('./userData')
+const { handlingEditor, submittingAuthor, admin } = require('./userData')
const Chance = require('chance')
const chance = new Chance()
@@ -8,10 +8,10 @@ const users = {
admin: {
type: 'user',
username: 'admin',
- email: 'admin@example.com',
+ email: admin.email,
password: 'test',
admin: true,
- id: 'admin123',
+ id: admin.id,
},
editorInChief: {
type: 'user',
--
GitLab