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 #2132 from overleaf/spd-collabratec-tests

Browse source 
Make collabratec tests not depend on previous run state

GitOrigin-RevId: 264f946e05b848fa253b6fbdd8e97a4998e4158e
This commit is contained in:
Hugh O'Brien 2019-09-10 10:52:41 +01:00 committed by sharelatex
parent 4defd2b6b5
commit a319073a08
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/src/infrastructure/RateLimiter.js
View file

@ -20,6 +20,9 @@ const RollingRateLimiter = require('rolling-rate-limiter')
module.exports = RateLimiter = { module.exports = RateLimiter = {
addCount(opts, callback) { addCount(opts, callback) {
if (settings.disableRateLimits) {
return callback(null, true)
}
if (callback == null) { if (callback == null) {
callback = function(err, shouldProcess) {} callback = function(err, shouldProcess) {}
} }

12
services/web/test/acceptance/src/helpers/User.js
View file

@ -411,10 +411,14 @@ class User {
} }
if ((body != null ? body.project_id : undefined) == null) { if ((body != null ? body.project_id : undefined) == null) {
error = new Error( error = new Error(
'SOMETHING WENT WRONG CREATING PROJECT', JSON.stringify([
response.statusCode, 'SOMETHING WENT WRONG CREATING PROJECT',
response.headers['location'], name,
body options,
response.statusCode,
response.headers['location'],
body
])
) )
return callback(error) return callback(error)
} else { } else {

18
services/web/test/acceptance/src/helpers/request.js
View file

@ -1,7 +1,23 @@
// TODO: This file was created by bulk-decaffeinate. // TODO: This file was created by bulk-decaffeinate.
// Sanity-check the conversion and remove this comment. // Sanity-check the conversion and remove this comment.
const BASE_URL = `http://${process.env['HTTP_TEST_HOST'] || 'localhost'}:3000` const BASE_URL = `http://${process.env['HTTP_TEST_HOST'] || 'localhost'}:3000`
module.exports = require('request').defaults({ const request = require('request').defaults({
baseUrl: BASE_URL, baseUrl: BASE_URL,
followRedirect: false followRedirect: false
}) })
module.exports = request
module.exports.promises = {
request: function(options) {
return new Promise((resolve, reject) => {
request(options, (err, response) => {
if (err) {
reject(err)
} else {
resolve(response)
}
})
})
}
}