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

Fix tests after decaf cleanup

Browse source 
* Camel casing in logs
* The Express request object always has query and body properties
This commit is contained in:
Eric Mc Sween 2020-05-11 11:37:59 -04:00
parent 0b1c7e90af
commit 16c0ed23db
1 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
services/document-updater/test/unit/js/HttpController/HttpControllerTests.js
View file

@ -44,7 +44,9 @@ describe('HttpController', function () {
params: { params: {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id doc_id: this.doc_id
} },
query: {},
body: {}
} }
}) })
@ -86,7 +88,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ doc_id: this.doc_id, project_id: this.project_id }, { docId: this.doc_id, projectId: this.project_id },
'getting doc via http' 'getting doc via http'
) )
.should.equal(true) .should.equal(true)
@ -136,7 +138,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ doc_id: this.doc_id, project_id: this.project_id }, { docId: this.doc_id, projectId: this.project_id },
'getting doc via http' 'getting doc via http'
) )
.should.equal(true) .should.equal(true)
@ -187,6 +189,7 @@ describe('HttpController', function () {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id doc_id: this.doc_id
}, },
query: {},
body: { body: {
lines: this.lines, lines: this.lines,
source: this.source, source: this.source,
@ -223,11 +226,11 @@ describe('HttpController', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ {
doc_id: this.doc_id, docId: this.doc_id,
project_id: this.project_id, projectId: this.project_id,
lines: this.lines, lines: this.lines,
source: this.source, source: this.source,
user_id: this.user_id, userId: this.user_id,
undoing: this.undoing undoing: this.undoing
}, },
'setting doc via http' 'setting doc via http'
@ -279,7 +282,9 @@ describe('HttpController', function () {
this.req = { this.req = {
params: { params: {
project_id: this.project_id project_id: this.project_id
} },
query: {},
body: {}
} }
}) })
@ -302,7 +307,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id }, { projectId: this.project_id },
'flushing project via http' 'flushing project via http'
) )
.should.equal(true) .should.equal(true)
@ -335,7 +340,9 @@ describe('HttpController', function () {
params: { params: {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id doc_id: this.doc_id
} },
query: {},
body: {}
} }
}) })
@ -360,7 +367,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ doc_id: this.doc_id, project_id: this.project_id }, { docId: this.doc_id, projectId: this.project_id },
'flushing doc via http' 'flushing doc via http'
) )
.should.equal(true) .should.equal(true)
@ -392,7 +399,8 @@ describe('HttpController', function () {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id doc_id: this.doc_id
}, },
query: {} query: {},
body: {}
} }
}) })
@ -425,7 +433,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ doc_id: this.doc_id, project_id: this.project_id }, { docId: this.doc_id, projectId: this.project_id },
'deleting doc via http' 'deleting doc via http'
) )
.should.equal(true) .should.equal(true)
@ -479,7 +487,9 @@ describe('HttpController', function () {
this.req = { this.req = {
params: { params: {
project_id: this.project_id project_id: this.project_id
} },
query: {},
body: {}
} }
}) })
@ -504,7 +514,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id }, { projectId: this.project_id },
'deleting project via http' 'deleting project via http'
) )
.should.equal(true) .should.equal(true)
@ -552,7 +562,9 @@ describe('HttpController', function () {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id, doc_id: this.doc_id,
change_id: (this.change_id = 'mock-change-od-1') change_id: (this.change_id = 'mock-change-od-1')
} },
query: {},
body: {}
} }
}) })
@ -577,7 +589,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id, doc_id: this.doc_id }, { projectId: this.project_id, docId: this.doc_id },
'accepting 1 changes via http' 'accepting 1 changes via http'
) )
.should.equal(true) .should.equal(true)
@ -612,7 +624,7 @@ describe('HttpController', function () {
it('should log the request with the correct number of changes', function () { it('should log the request with the correct number of changes', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id, doc_id: this.doc_id }, { projectId: this.project_id, docId: this.doc_id },
`accepting ${this.change_ids.length} changes via http` `accepting ${this.change_ids.length} changes via http`
) )
.should.equal(true) .should.equal(true)
@ -640,7 +652,9 @@ describe('HttpController', function () {
project_id: this.project_id, project_id: this.project_id,
doc_id: this.doc_id, doc_id: this.doc_id,
comment_id: (this.comment_id = 'mock-comment-id') comment_id: (this.comment_id = 'mock-comment-id')
} },
query: {},
body: {}
} }
}) })
@ -666,9 +680,9 @@ describe('HttpController', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ {
project_id: this.project_id, projectId: this.project_id,
doc_id: this.doc_id, docId: this.doc_id,
comment_id: this.comment_id commentId: this.comment_id
}, },
'deleting comment via http' 'deleting comment via http'
) )
@ -707,7 +721,8 @@ describe('HttpController', function () {
}, },
query: { query: {
state: this.state state: this.state
} },
body: {}
} }
}) })
@ -736,7 +751,7 @@ describe('HttpController', function () {
it('should log the request', function () { it('should log the request', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id, exclude: [] }, { projectId: this.project_id, exclude: [] },
'getting docs via http' 'getting docs via http'
) )
.should.equal(true) .should.equal(true)
@ -745,7 +760,7 @@ describe('HttpController', function () {
it('should log the response', function () { it('should log the response', function () {
this.logger.log this.logger.log
.calledWith( .calledWith(
{ project_id: this.project_id, result: ['1234:23', '4567:45'] }, { projectId: this.project_id, result: ['1234:23', '4567:45'] },
'got docs via http' 'got docs via http'
) )
.should.equal(true) .should.equal(true)
@ -802,6 +817,7 @@ describe('HttpController', function () {
this.fileUpdates = sinon.stub() this.fileUpdates = sinon.stub()
this.version = 1234567 this.version = 1234567
this.req = { this.req = {
query: {},
body: { body: {
projectHistoryId: this.projectHistoryId, projectHistoryId: this.projectHistoryId,
userId: this.userId, userId: this.userId,
@ -866,6 +882,7 @@ describe('HttpController', function () {
this.files = sinon.stub() this.files = sinon.stub()
this.fileUpdates = sinon.stub() this.fileUpdates = sinon.stub()
this.req = { this.req = {
query: {},
body: { body: {
projectHistoryId: this.projectHistoryId, projectHistoryId: this.projectHistoryId,
docs: this.docs, docs: this.docs,