github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

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

GitOrigin-RevId: 859187579e8d410f5890e863a46a9440b724c543
This commit is contained in:
Jakob Ackermann 2023-08-18 09:09:35 +02:00 committed by Copybot
parent 4b2ecd8b19
commit 94a4659672
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/test/acceptance/config/settings.test.server-ce.js
View file

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

4
services/web/test/acceptance/config/settings.test.server-pro.js
View file

@ -1,9 +1,9 @@
const { merge } = require('@overleaf/settings/merge') const { merge } = require('@overleaf/settings/merge')
const baseApp = require('../../../config/settings.overrides.server-pro') 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( module.exports = baseApp.mergeWith(
baseTest.mergeWith({ baseTestServerCE.mergeWith({
proxyLearn: true, proxyLearn: true,
}) })
) )