alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3277 from overleaf/revert-3257-jpa-mongoose-latest

Browse Source 
Revert "[misc] upgrade mongoose to the latest version"

GitOrigin-RevId: d5957fca68be65a08a687476742ffbb9c3cb86e8
This commit is contained in:
Simon Detheridge
2020-10-13 02:04:31 +00:00
committed by Copybot
parent dba5127856
commit c257b9695a
59 changed files with 655 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/launchpad/app/src/LaunchpadController.js
+2 -2
View File
@@ -168,7 +168,7 @@ module.exports = LaunchpadController = {
return next(err)
}
return User.updateOne(
return User.update(
{ _id: user._id },
{
$set: { isAdmin: true },
@@ -225,7 +225,7 @@ module.exports = LaunchpadController = {
}
logger.log({ user_id: user._id }, 'making user an admin')
User.updateOne(
User.update(
{ _id: user._id },
{
$set: {
services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.js
+22 -22
View File
@@ -337,7 +337,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, null, this.user)
this.User.updateOne = sinon.stub().callsArgWith(2, null)
this.User.update = sinon.stub().callsArgWith(2, null)
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()
@@ -365,8 +365,8 @@ describe('LaunchpadController', function() {
})
it('should have updated the user to make them an admin', function() {
this.User.updateOne.callCount.should.equal(1)
return this.User.updateOne
this.User.update.callCount.should.equal(1)
return this.User.update
.calledWithMatch(
{ _id: this.user._id },
{
@@ -401,7 +401,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -440,7 +440,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -479,7 +479,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -514,7 +514,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -555,7 +555,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, new Error('woops'))
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()
@@ -583,7 +583,7 @@ describe('LaunchpadController', function() {
})
it('should not call update', function() {
return this.User.updateOne.callCount.should.equal(0)
return this.User.update.callCount.should.equal(0)
})
})
@@ -601,7 +601,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, null, this.user)
this.User.updateOne = sinon.stub().callsArgWith(2, new Error('woops'))
this.User.update = sinon.stub().callsArgWith(2, new Error('woops'))
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()
@@ -645,7 +645,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, null, this.user)
this.User.updateOne = sinon.stub().callsArgWith(2, null)
this.User.update = sinon.stub().callsArgWith(2, null)
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.UserGetter.getUser = sinon
.stub()
@@ -676,7 +676,7 @@ describe('LaunchpadController', function() {
})
it('should have updated the user to make them an admin', function() {
return this.User.updateOne
return this.User.update
.calledWith(
{ _id: this.user._id },
{
@@ -725,7 +725,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, null, this.user)
this.User.updateOne = sinon.stub().callsArgWith(2, null)
this.User.update = sinon.stub().callsArgWith(2, null)
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()
@@ -758,8 +758,8 @@ describe('LaunchpadController', function() {
})
it('should have updated the user to make them an admin', function() {
this.User.updateOne.callCount.should.equal(1)
return this.User.updateOne
this.User.update.callCount.should.equal(1)
return this.User.update
.calledWith(
{ _id: this.user._id },
{
@@ -790,7 +790,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -825,7 +825,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -862,7 +862,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -895,7 +895,7 @@ describe('LaunchpadController', function() {
email: this.email
}
this.UserRegistrationHandler.registerNewUser = sinon.stub()
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.sendStatus = sinon.stub()
this.next = sinon.stub()
@@ -934,7 +934,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, new Error('woops'))
this.User.updateOne = sinon.stub()
this.User.update = sinon.stub()
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()
@@ -967,7 +967,7 @@ describe('LaunchpadController', function() {
})
it('should not call update', function() {
return this.User.updateOne.callCount.should.equal(0)
return this.User.update.callCount.should.equal(0)
})
})
@@ -983,7 +983,7 @@ describe('LaunchpadController', function() {
this.UserRegistrationHandler.registerNewUser = sinon
.stub()
.callsArgWith(1, null, this.user)
this.User.updateOne = sinon.stub().callsArgWith(2, new Error('woops'))
this.User.update = sinon.stub().callsArgWith(2, new Error('woops'))
this.AuthenticationController.setRedirectInSession = sinon.stub()
this.res.json = sinon.stub()
this.next = sinon.stub()