From 4f860995d87895dc336dff3ba3ba0bff849d6aa5 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 1 Oct 2020 12:25:41 +0100 Subject: [PATCH 1/3] [MockDocUpdaterServer] return a 404 when a requested doc does not exist --- .../test/acceptance/js/helpers/MockDocUpdaterServer.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/real-time/test/acceptance/js/helpers/MockDocUpdaterServer.js b/services/real-time/test/acceptance/js/helpers/MockDocUpdaterServer.js index f9dcc57bf7..26cc4722a0 100644 --- a/services/real-time/test/acceptance/js/helpers/MockDocUpdaterServer.js +++ b/services/real-time/test/acceptance/js/helpers/MockDocUpdaterServer.js @@ -43,6 +43,9 @@ module.exports = MockDocUpdaterServer = { if (error != null) { return next(error) } + if (!data) { + return res.sendStatus(404) + } return res.json(data) } ) From 78fbd04ef805564d76434a9ac7d7ddd384d2764e Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 1 Oct 2020 12:28:39 +0100 Subject: [PATCH 2/3] [MockWebServer] grant users at least the privileges of anonymous users --- services/real-time/test/acceptance/js/helpers/MockWebServer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/real-time/test/acceptance/js/helpers/MockWebServer.js b/services/real-time/test/acceptance/js/helpers/MockWebServer.js index 2de9e61275..160996c6b9 100644 --- a/services/real-time/test/acceptance/js/helpers/MockWebServer.js +++ b/services/real-time/test/acceptance/js/helpers/MockWebServer.js @@ -31,7 +31,8 @@ module.exports = MockWebServer = { return callback( null, MockWebServer.projects[project_id], - MockWebServer.privileges[project_id][user_id] + MockWebServer.privileges[project_id][user_id] || + MockWebServer.privileges[project_id]['anonymous-user'] ) }, From 2900c60c4a04c40e42af3e14f20de156087742ef Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 1 Oct 2020 12:33:15 +0100 Subject: [PATCH 3/3] [FixturesManager] add a helper for setting up project and doc together --- .../acceptance/js/helpers/FixturesManager.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/services/real-time/test/acceptance/js/helpers/FixturesManager.js b/services/real-time/test/acceptance/js/helpers/FixturesManager.js index 3e72961cbf..b3b7aaa78d 100644 --- a/services/real-time/test/acceptance/js/helpers/FixturesManager.js +++ b/services/real-time/test/acceptance/js/helpers/FixturesManager.js @@ -109,6 +109,22 @@ module.exports = FixturesManager = { }) }, + setUpEditorSession(options, callback) { + FixturesManager.setUpProject(options, (err, detailsProject) => { + if (err) return callback(err) + + FixturesManager.setUpDoc( + detailsProject.project_id, + options, + (err, detailsDoc) => { + if (err) return callback(err) + + callback(null, Object.assign({}, detailsProject, detailsDoc)) + } + ) + }) + }, + getRandomId() { return require('crypto') .createHash('sha1')