Browse Source

Merge pull request #14382 from overleaf/jpa-change-ci-defaults

[web] use representative defaultFeatures for Server Pro/CE in tests

GitOrigin-RevId: 859187579e8d410f5890e863a46a9440b724c543
Jakob Ackermann 3 years ago
parent
commit
94a4659672

+ 4 - 1
services/web/test/acceptance/config/settings.test.server-ce.js

@@ -1,7 +1,10 @@
 const { merge } = require('@overleaf/settings/merge')
+const ServerCEDefaults = require('../../../config/settings.defaults')
 const base = require('./settings.test.defaults')
 
-module.exports = base.mergeWith({})
+module.exports = base.mergeWith({
+  defaultFeatures: ServerCEDefaults.defaultFeatures,
+})
 
 module.exports.mergeWith = function (overrides) {
   return merge(overrides, module.exports)

+ 2 - 2
services/web/test/acceptance/config/settings.test.server-pro.js

@@ -1,9 +1,9 @@
 const { merge } = require('@overleaf/settings/merge')
 const baseApp = require('../../../config/settings.overrides.server-pro')
-const baseTest = require('./settings.test.defaults')
+const baseTestServerCE = require('./settings.test.server-ce')
 
 module.exports = baseApp.mergeWith(
-  baseTest.mergeWith({
+  baseTestServerCE.mergeWith({
     proxyLearn: true,
   })
 )