mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-28 23:13:45 -05:00
return the origin of peeked docs
This commit is contained in:
parent
6ce28271eb
commit
69339aeb9d
2 changed files with 56 additions and 2 deletions
|
@ -55,6 +55,7 @@ module.exports = HttpController = {
|
||||||
if (doc == null) {
|
if (doc == null) {
|
||||||
return res.sendStatus(404)
|
return res.sendStatus(404)
|
||||||
} else {
|
} else {
|
||||||
|
res.setHeader('x-doc-status', doc.inS3 ? 'archived' : 'active')
|
||||||
return res.json(HttpController._buildDocView(doc))
|
return res.json(HttpController._buildDocView(doc))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -41,7 +41,7 @@ describe('Getting A Doc from Archive', function () {
|
||||||
await storage.createBucket(`${Settings.docstore.bucket}-deleted`)
|
await storage.createBucket(`${Settings.docstore.bucket}-deleted`)
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('archiving a single doc', function () {
|
describe('for an archived doc', function () {
|
||||||
before(function (done) {
|
before(function (done) {
|
||||||
this.project_id = ObjectId()
|
this.project_id = ObjectId()
|
||||||
this.timeout(1000 * 30)
|
this.timeout(1000 * 30)
|
||||||
|
@ -81,13 +81,66 @@ describe('Getting A Doc from Archive', function () {
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should get the doc lines and version', function (done) {
|
it('should return the doc lines and version from persistent storage', function (done) {
|
||||||
return DocstoreClient.peekDoc(
|
return DocstoreClient.peekDoc(
|
||||||
this.project_id,
|
this.project_id,
|
||||||
this.doc._id,
|
this.doc._id,
|
||||||
{},
|
{},
|
||||||
(error, res, doc) => {
|
(error, res, doc) => {
|
||||||
res.statusCode.should.equal(200)
|
res.statusCode.should.equal(200)
|
||||||
|
res.headers['x-doc-status'].should.equal('archived')
|
||||||
|
doc.lines.should.deep.equal(this.doc.lines)
|
||||||
|
doc.version.should.equal(this.doc.version)
|
||||||
|
doc.ranges.should.deep.equal(this.doc.ranges)
|
||||||
|
return done()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return the doc lines and version from persistent storage on subsequent requests', function (done) {
|
||||||
|
return DocstoreClient.peekDoc(
|
||||||
|
this.project_id,
|
||||||
|
this.doc._id,
|
||||||
|
{},
|
||||||
|
(error, res, doc) => {
|
||||||
|
res.statusCode.should.equal(200)
|
||||||
|
res.headers['x-doc-status'].should.equal('archived')
|
||||||
|
doc.lines.should.deep.equal(this.doc.lines)
|
||||||
|
doc.version.should.equal(this.doc.version)
|
||||||
|
doc.ranges.should.deep.equal(this.doc.ranges)
|
||||||
|
return done()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('for an non-archived doc', function () {
|
||||||
|
before(function (done) {
|
||||||
|
this.project_id = ObjectId()
|
||||||
|
this.timeout(1000 * 30)
|
||||||
|
this.doc = {
|
||||||
|
_id: ObjectId(),
|
||||||
|
lines: ['foo', 'bar'],
|
||||||
|
ranges: {},
|
||||||
|
version: 2,
|
||||||
|
}
|
||||||
|
DocstoreClient.createDoc(
|
||||||
|
this.project_id,
|
||||||
|
this.doc._id,
|
||||||
|
this.doc.lines,
|
||||||
|
this.doc.version,
|
||||||
|
this.doc.ranges,
|
||||||
|
done
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return the doc lines and version from mongo', function (done) {
|
||||||
|
return DocstoreClient.peekDoc(
|
||||||
|
this.project_id,
|
||||||
|
this.doc._id,
|
||||||
|
{},
|
||||||
|
(error, res, doc) => {
|
||||||
|
res.statusCode.should.equal(200)
|
||||||
|
res.headers['x-doc-status'].should.equal('active')
|
||||||
doc.lines.should.deep.equal(this.doc.lines)
|
doc.lines.should.deep.equal(this.doc.lines)
|
||||||
doc.version.should.equal(this.doc.version)
|
doc.version.should.equal(this.doc.version)
|
||||||
doc.ranges.should.deep.equal(this.doc.ranges)
|
doc.ranges.should.deep.equal(this.doc.ranges)
|
||||||
|
|
Loading…
Reference in a new issue