github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-05 02:46:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into doc-collection-only

Browse source 
Conflicts:
	app/coffee/DocManager.coffee
This commit is contained in:
Henry Oswald 2015-02-27 14:58:38 +00:00
commit d59fb0d590
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/docstore/app/coffee/DocManager.coffee
View file

@ -28,8 +28,11 @@ module.exports = DocManager =
if err?
logger.err project_id: project_id, doc_id: doc_id, err:err, "error getting document for update"
return callback(err)
if _.isEqual(doc?.lines, lines)
isNewDoc = lines.length == 0
linesAreSame = _.isEqual(doc?.lines, lines)
if linesAreSame and !isNewDoc
logger.log project_id: project_id, doc_id: doc_id, rev: doc?.rev, "doc lines have not changed - not updating"
return callback null, false, doc?.rev
else

14
services/docstore/test/unit/coffee/DocManagerTests.coffee
View file

@ -199,6 +199,20 @@ describe "DocManager", ->
it "should return the callback with the existing rev", ->
@callback.calledWith(null, false, @rev).should.equal true
describe "when the doc lines are an empty array", ->
beforeEach ->
@doc.lines = []
@MongoManager.findDoc = sinon.stub().callsArgWith(1, null, @doc)
@DocManager.updateDoc @project_id, @doc_id, @doc.lines, @callback
it "should upsert the document to the doc collection", ->
@MongoManager.upsertIntoDocCollection
.calledWith(@project_id, @doc_id, @doc.lines)
.should.equal true
describe "when the doc does not exist", ->
beforeEach ->
@MongoManager.findDoc = sinon.stub().callsArgWith(1, null, null, null)