Преглед изворни кода

Merge pull request #14409 from overleaf/jpa-open-source-history-v1-tests

[web] enable history-v1 tests for Server Pro/CE

GitOrigin-RevId: 74119a09c101ed74c37833384722f85b0e3830dd
Jakob Ackermann пре 2 година
родитељ
комит
e23c2dafef

+ 6 - 1
services/web/config/settings.defaults.js

@@ -812,7 +812,12 @@ module.exports = {
     managedGroupEnrollmentInvite: [],
     managedGroupEnrollmentInvite: [],
   },
   },
 
 
-  moduleImportSequence: ['launchpad', 'server-ce-scripts', 'user-activate'],
+  moduleImportSequence: [
+    'history-v1',
+    'launchpad',
+    'server-ce-scripts',
+    'user-activate',
+  ],
 
 
   csp: {
   csp: {
     enabled: process.env.CSP_ENABLED === 'true',
     enabled: process.env.CSP_ENABLED === 'true',

+ 7 - 1
services/web/modules/history-v1/test/acceptance/src/HistoryTests.js

@@ -295,6 +295,12 @@ describe('History', function () {
           (appRoute.route != null ? appRoute.route.path : undefined) ===
           (appRoute.route != null ? appRoute.route.path : undefined) ===
           '/api/projects/:project_id/version/:version/zip'
           '/api/projects/:project_id/version/:version/zip'
       )
       )
+      MockV1HistoryApi.app.get(
+        '/api/projects/:project_id/version/:version/zip',
+        (req, res, next) => {
+          res.sendStatus(500)
+        }
+      )
       MockV1HistoryApi.app.post(
       MockV1HistoryApi.app.post(
         '/api/projects/:project_id/version/:version/zip',
         '/api/projects/:project_id/version/:version/zip',
         (req, res, next) => {
         (req, res, next) => {
@@ -309,7 +315,7 @@ describe('History', function () {
       MockV1HistoryApi.applyRoutes()
       MockV1HistoryApi.applyRoutes()
     })
     })
 
 
-    it('should produce 404 when post request produces 404', function (done) {
+    it('should produce 500', function (done) {
       this.owner.createProject('example-project', (error, projectId) => {
       this.owner.createProject('example-project', (error, projectId) => {
         if (error) {
         if (error) {
           return done(error)
           return done(error)

+ 1 - 0
services/web/test/acceptance/src/mocks/MockV1HistoryApi.js

@@ -17,6 +17,7 @@ class MockV1HistoryApi extends AbstractMockApi {
     this.app.get(
     this.app.get(
       '/api/projects/:project_id/version/:version/zip',
       '/api/projects/:project_id/version/:version/zip',
       (req, res, next) => {
       (req, res, next) => {
+        this.sentChunks++
         zipAttachment(
         zipAttachment(
           res,
           res,
           `Mock zip for ${req.params.project_id} at version ${req.params.version}`,
           `Mock zip for ${req.params.project_id} at version ${req.params.version}`,