[misc] switch from settings-sharelatex to @overleaf/settings

This commit is contained in:
Jakob Ackermann
2021-07-12 17:47:16 +01:00
parent 7495d2114a
commit b5bb7c3b04
29 changed files with 33 additions and 43 deletions
@@ -13,7 +13,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const request = require('request')
const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now
@@ -17,7 +17,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { db, ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const request = require('request')
const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now
@@ -13,7 +13,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const request = require('request')
const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now
@@ -12,7 +12,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const TrackChangesApp = require('./helpers/TrackChangesApp')
const TrackChangesClient = require('./helpers/TrackChangesClient')
@@ -13,7 +13,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const TrackChangesApp = require('./helpers/TrackChangesApp')
const TrackChangesClient = require('./helpers/TrackChangesClient')
@@ -11,7 +11,7 @@
*/
const sinon = require('sinon')
const { expect } = require('chai')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const LockManager = require('../../../app/js/LockManager')
const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now
const TrackChangesApp = require('./helpers/TrackChangesApp')
@@ -12,7 +12,7 @@
const sinon = require('sinon')
const { expect } = require('chai')
const { ObjectId } = require('../../../app/js/mongodb')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const TrackChangesApp = require('./helpers/TrackChangesApp')
const TrackChangesClient = require('./helpers/TrackChangesClient')
@@ -15,7 +15,7 @@
const app = require('../../../../app')
const { waitForDb } = require('../../../../app/js/mongodb')
const logger = require('logger-sharelatex')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
module.exports = {
running: false,
@@ -16,7 +16,7 @@ let TrackChangesClient
const async = require('async')
const zlib = require('zlib')
const request = require('request')
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const rclient = require('@overleaf/redis-wrapper').createClient(
Settings.redis.history
) // Only works locally for now
@@ -21,7 +21,7 @@ describe('MongoAWS', function () {
this.MongoAWS = SandboxedModule.require(modulePath, {
singleOnly: true,
requires: {
'settings-sharelatex': (this.settings = {
'@overleaf/settings': (this.settings = {
trackchanges: {
s3: {
secret: 's3-secret',
@@ -19,7 +19,7 @@ describe('DocumentUpdaterManager', function () {
this.DocumentUpdaterManager = SandboxedModule.require(modulePath, {
requires: {
request: (this.request = {}),
'settings-sharelatex': (this.settings = {
'@overleaf/settings': (this.settings = {
apis: { documentupdater: { url: 'http://example.com' } }
})
}
@@ -34,7 +34,7 @@ describe('LockManager', function () {
return (this.rclient = { auth: sinon.stub() })
}
},
'settings-sharelatex': this.Settings
'@overleaf/settings': this.Settings
}
})
@@ -30,7 +30,7 @@ describe('PackManager', function () {
'./MongoAWS': {},
'@overleaf/metrics': { inc() {} },
'./ProjectIterator': require('../../../../app/js/ProjectIterator.js'), // Cache for speed
'settings-sharelatex': {
'@overleaf/settings': {
redis: { lock: { key_schema: {} } }
}
}
@@ -28,7 +28,7 @@ describe('RedisManager', function () {
})
}
},
'settings-sharelatex': {
'@overleaf/settings': {
redis: {
history: {
key_schema: {
@@ -32,7 +32,7 @@ describe('UpdatesManager', function () {
'./WebApiManager': (this.WebApiManager = {}),
'./UpdateTrimmer': (this.UpdateTrimmer = {}),
'./DocArchiveManager': (this.DocArchiveManager = {}),
'settings-sharelatex': {
'@overleaf/settings': {
redis: {
lock: {
key_schema: {
@@ -19,7 +19,7 @@ describe('WebApiManager', function () {
this.WebApiManager = SandboxedModule.require(modulePath, {
requires: {
requestretry: (this.request = {}),
'settings-sharelatex': (this.settings = {
'@overleaf/settings': (this.settings = {
apis: {
web: {
url: 'http://example.com',