Просмотр исходного кода

Merge branches 'jpa-prepare-for-matrix-tests' and 'jpa-setup-session-helper' into jpa-matrix-tests

Jakob Ackermann 6 лет назад
Родитель
Сommit
4ec73acb88

+ 16 - 0
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')

+ 3 - 0
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)
       }
     )

+ 2 - 1
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']
     )
   },