From 5dd33ea3134ff4cf0625ac3d449c68690a286849 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 18 Aug 2015 14:10:53 +0100 Subject: [PATCH] changed back to standard /archive /unarchive --- services/docstore/app.coffee | 5 ----- .../test/acceptance/coffee/helpers/DocstoreClient.coffee | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/services/docstore/app.coffee b/services/docstore/app.coffee index 6fe9d308b6..3a01bead03 100644 --- a/services/docstore/app.coffee +++ b/services/docstore/app.coffee @@ -22,11 +22,6 @@ app.get '/project/:project_id/doc/:doc_id/raw', HttpController.getRawDoc app.post '/project/:project_id/doc/:doc_id', bodyParser.json(limit: "2mb"), HttpController.updateDoc app.del '/project/:project_id/doc/:doc_id', HttpController.deleteDoc - -app.post '/project/:project_id/deactivate', HttpController.archiveAllDocs -app.post '/project/:project_id/reactivate', HttpController.unArchiveAllDocs - -# can delete these two soon app.post '/project/:project_id/archive', HttpController.archiveAllDocs app.post '/project/:project_id/unarchive', HttpController.unArchiveAllDocs diff --git a/services/docstore/test/acceptance/coffee/helpers/DocstoreClient.coffee b/services/docstore/test/acceptance/coffee/helpers/DocstoreClient.coffee index 1bee3f0fdb..b81408b6f3 100644 --- a/services/docstore/test/acceptance/coffee/helpers/DocstoreClient.coffee +++ b/services/docstore/test/acceptance/coffee/helpers/DocstoreClient.coffee @@ -43,14 +43,10 @@ module.exports = DocstoreClient = archiveAllDoc: (project_id, callback = (error, res, body) ->) -> request.post { - url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/deactivate" - }, callback - - unArchiveAllDoc: (project_id, callback = (error, res, body) ->) -> - request.post { - url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/deactivate" + url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/archive" }, callback + getS3Doc: (project_id, doc_id, callback = (error, res, body) ->) -> options = DocArchiveManager.buildS3Options(true, project_id+"/"+doc_id) request.get options, callback