github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from sharelatex/sk-upgrade-mongojs

Browse source 
Upgrade mongojs dependency to version 2.4.0
This commit is contained in:
Shane Kilkelly 2017-08-29 10:27:17 +01:00 committed by GitHub
commit 3cb59f365f
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/docstore/app/coffee/mongojs.coffee
View file

@ -1,6 +1,6 @@
Settings = require "settings-sharelatex"
mongojs = require "mongojs"
db = mongojs.connect(Settings.mongo.url, ["docs", "docOps"])
db = mongojs(Settings.mongo.url, ["docs", "docOps"])
module.exports =
db: db
ObjectId: mongojs.ObjectId

4
services/docstore/package.json
View file

@ -11,7 +11,7 @@
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.4.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1",
"mongojs": "0.18.2",
"mongojs": "2.4.0",
"express": "~4.1.1",
"underscore": "~1.6.0",
"body-parser": "~1.0.2",
@ -26,7 +26,7 @@
"grunt": "~0.4.4",
"bunyan": "~0.22.3",
"grunt-bunyan": "~0.5.0",
"sinon": "~1.5.2",
"sinon": "~3.2.1",
"sandboxed-module": "~0.3.0",
"chai": "~1.9.1",
"grunt-forever": "~0.4.4",

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

@ -184,7 +184,7 @@ describe "DocManager", ->
it "should return a NotFoundError", ->
@callback
.calledWith(new Errors.NotFoundError("No such doc: #{@doc_id} in project #{@project_id}"))
.calledWith(sinon.match.has('message', "No such doc: #{@doc_id} in project #{@project_id}"))
.should.equal true
describe "getAllNonDeletedDocs", ->
@ -212,7 +212,7 @@ describe "DocManager", ->
it "should return a NotFoundError", ->
@callback
.calledWith(new Errors.NotFoundError("No docs for project #{@project_id}"))
.calledWith(sinon.match.has('message', "No docs for project #{@project_id}"))
.should.equal true
describe "deleteDoc", ->
@ -244,7 +244,7 @@ describe "DocManager", ->
it "should return a NotFoundError", ->
@callback
.calledWith(new Errors.NotFoundError("No such doc: #{@doc_id}"))
.calledWith(sinon.match.has('message', "No such project/doc to delete: #{@project_id}/#{@doc_id}"))
.should.equal true
describe "updateDoc", ->
@ -349,21 +349,21 @@ describe "DocManager", ->
@DocManager.updateDoc @project_id, @doc_id, @newDocLines, null, @originalRanges, @callback
it "should return an error", ->
@callback.calledWith(new Error("no lines, version or ranges provided")).should.equal true
@callback.calledWith(sinon.match.has('message', "no lines, version or ranges provided")).should.equal true
describe "when the lines are null", ->
beforeEach ->
@DocManager.updateDoc @project_id, @doc_id, null, @version, @originalRanges, @callback
it "should return an error", ->
@callback.calledWith(new Error("no lines, version or ranges provided")).should.equal true
@callback.calledWith(sinon.match.has('message', "no lines, version or ranges provided")).should.equal true
describe "when the ranges are null", ->
beforeEach ->
@DocManager.updateDoc @project_id, @doc_id, @newDocLines, @version, null, @callback
it "should return an error", ->
@callback.calledWith(new Error("no lines, version or ranges provided")).should.equal true
@callback.calledWith(sinon.match.has('message', "no lines, version or ranges provided")).should.equal true
describe "when there is a generic error getting the doc", ->
beforeEach ->

4
services/docstore/test/unit/coffee/HttpControllerTests.coffee
View file

@ -174,7 +174,7 @@ describe "HttpController", ->
it "should log out an error", ->
@logger.error
.calledWith(
err: new Error("null doc")
err: sinon.match.has('message', "null doc")
project_id: @project_id
"encountered null doc"
)
@ -325,4 +325,4 @@ describe "HttpController", ->
it "should return a 204 (No Content)", ->
@res.send
.calledWith(204)
.should.equal true
.should.equal true