From 5c31e8006286a130c37cbec721166fa656299a9b Mon Sep 17 00:00:00 2001
From: Henrique Dias <heukirne@gmail.com>
Date: Tue, 2 Jun 2015 16:29:32 -0300
Subject: [PATCH] more refactoring

---
 services/docstore/app.coffee                  |  2 +-
 ...rchive.coffee => DocArchiveManager.coffee} |  0
 .../docstore/app/coffee/DocManager.coffee     |  2 +-
 .../docstore/app/coffee/HttpController.coffee |  2 +-
 .../acceptance/coffee/ArchiveDocsTests.coffee | 71 ++++++++++---------
 5 files changed, 40 insertions(+), 37 deletions(-)
 rename services/docstore/app/coffee/{DocArchive.coffee => DocArchiveManager.coffee} (100%)

diff --git a/services/docstore/app.coffee b/services/docstore/app.coffee
index 5f45f5a8c3..3c3a35d213 100644
--- a/services/docstore/app.coffee
+++ b/services/docstore/app.coffee
@@ -21,7 +21,7 @@ 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
 
-if Settings.filestore.backend == "s3"
+if Settings.filestore?.backend == "s3"
 	app.get  '/project/:project_id/archive', HttpController.archiveAllDocs
 
 app.get '/status', (req, res)->
diff --git a/services/docstore/app/coffee/DocArchive.coffee b/services/docstore/app/coffee/DocArchiveManager.coffee
similarity index 100%
rename from services/docstore/app/coffee/DocArchive.coffee
rename to services/docstore/app/coffee/DocArchiveManager.coffee
diff --git a/services/docstore/app/coffee/DocManager.coffee b/services/docstore/app/coffee/DocManager.coffee
index 5ffad57b9d..85beac7031 100644
--- a/services/docstore/app/coffee/DocManager.coffee
+++ b/services/docstore/app/coffee/DocManager.coffee
@@ -7,7 +7,7 @@ settings = require("settings-sharelatex")
 request = require("request")
 crypto = require("crypto")
 thirtySeconds = 30 * 1000
-DocArchive = require "./DocArchive"
+DocArchive = require "./DocArchiveManager"
 
 module.exports = DocManager =
 
diff --git a/services/docstore/app/coffee/HttpController.coffee b/services/docstore/app/coffee/HttpController.coffee
index 86d2dec470..77d129811d 100644
--- a/services/docstore/app/coffee/HttpController.coffee
+++ b/services/docstore/app/coffee/HttpController.coffee
@@ -1,6 +1,6 @@
 DocManager = require "./DocManager"
 logger = require "logger-sharelatex"
-DocArchive = require "./DocArchive"
+DocArchive = require "./DocArchiveManager"
 
 module.exports = HttpController =
 	getDoc: (req, res, next = (error) ->) ->
diff --git a/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee b/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
index 9569f97cda..7b886bec9c 100644
--- a/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
+++ b/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
@@ -3,44 +3,47 @@ chai = require("chai")
 chai.should()
 {ObjectId} = require "mongojs"
 async = require "async"
+Settings = require("settings-sharelatex")
 
 DocstoreClient = require "./helpers/DocstoreClient"
 
-describe "Archiving all docs", ->
-	beforeEach (done) ->
-		@project_id = ObjectId()
-		@docs = [{
-			_id: ObjectId()
-			lines: ["one", "two", "three"]
-			rev: 2
-		}, {
-			_id: ObjectId()
-			lines: ["aaa", "bbb", "ccc"]
-			rev: 4
-		}, {
-			_id: ObjectId()
-			lines: ["111", "222", "333"]
-			rev: 6
-		}]
-		jobs = for doc in @docs
-			do (doc) =>
-				(callback) => 
-					DocstoreClient.createDoc @project_id, doc._id, doc.lines, (err)=>
-						doc.lines[0] = doc.lines[0]+" added"
-						DocstoreClient.updateDoc @project_id, doc._id, doc.lines, callback
-		async.series jobs, done 
+if Settings.filestore?.backend == "s3"
 
-	it "should archive all the docs", (done) ->
-		DocstoreClient.archiveAllDoc @project_id, (error, res) =>
-			res.statusCode.should.equal 204
-			done()
+	describe "Archiving all docs", ->
+		beforeEach (done) ->
+			@project_id = ObjectId()
+			@docs = [{
+				_id: ObjectId()
+				lines: ["one", "two", "three"]
+				rev: 2
+			}, {
+				_id: ObjectId()
+				lines: ["aaa", "bbb", "ccc"]
+				rev: 4
+			}, {
+				_id: ObjectId()
+				lines: ["111", "222", "333"]
+				rev: 6
+			}]
+			jobs = for doc in @docs
+				do (doc) =>
+					(callback) => 
+						DocstoreClient.createDoc @project_id, doc._id, doc.lines, (err)=>
+							doc.lines[0] = doc.lines[0]+" added"
+							DocstoreClient.updateDoc @project_id, doc._id, doc.lines, callback
+			async.series jobs, done 
 
-	it "should unarchive all the docs", (done) ->
-		DocstoreClient.archiveAllDoc @project_id, (error, res) =>
-			DocstoreClient.getAllDocs @project_id, (error, res, docs) =>
-				throw error if error?
-				docs.length.should.equal @docs.length
-				for doc, i in docs
-					doc.lines.should.deep.equal @docs[i].lines
+		it "should archive all the docs", (done) ->
+			DocstoreClient.archiveAllDoc @project_id, (error, res) =>
+				res.statusCode.should.equal 204
 				done()
 
+		it "should unarchive all the docs", (done) ->
+			DocstoreClient.archiveAllDoc @project_id, (error, res) =>
+				DocstoreClient.getAllDocs @project_id, (error, res, docs) =>
+					throw error if error?
+					docs.length.should.equal @docs.length
+					for doc, i in docs
+						doc.lines.should.deep.equal @docs[i].lines
+					done()
+