From 3983e77b73c8a2fef047ad0c1cffbeb29b8688a2 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 4 Apr 2014 16:21:20 +0100 Subject: [PATCH] move deleteProject from collab manager to editor controller --- .../coffee/Features/Editor/EditorController.coffee | 5 +++++ .../app/coffee/managers/CollaberationManager.coffee | 5 ----- services/web/app/coffee/router.coffee | 2 +- .../coffee/Editor/EditorControllerTests.coffee | 12 ++++++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorController.coffee b/services/web/app/coffee/Features/Editor/EditorController.coffee index 81084dc7e9..b123f22dc5 100644 --- a/services/web/app/coffee/Features/Editor/EditorController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorController.coffee @@ -237,6 +237,11 @@ module.exports = EditorController = EditorRealTimeController.emitToRoom(project_id, 'projectDescriptionUpdated', description) callback() + deleteProject: (project_id, callback)-> + Metrics.inc "editor.delete-project" + logger.log project_id:project_id, "recived message to delete project" + ProjectHandler.deleteProject project_id, callback + p: notifyProjectUsersOfNewFolder: (project_id, folder_id, folder, callback = (error)->)-> logger.log project_id:project_id, folder:folder, parentFolder_id:folder_id, "sending newly created folder out to users" diff --git a/services/web/app/coffee/managers/CollaberationManager.coffee b/services/web/app/coffee/managers/CollaberationManager.coffee index 28fcb00795..f110a00a17 100644 --- a/services/web/app/coffee/managers/CollaberationManager.coffee +++ b/services/web/app/coffee/managers/CollaberationManager.coffee @@ -15,11 +15,6 @@ EditorRealTimeController = require('../Features/Editor/EditorRealTimeController' module.exports = class CollaberationManager constructor: (@io)-> - deleteProject: (project_id, callback)-> - metrics.inc "editor.delete-project" - logger.log project_id:project_id, "recived message to delete project" - projectHandler.deleteProject project_id, callback - renameEntity: (project_id, entity_id, entityType, newName, callback)-> newName = sanitize.escape(newName) metrics.inc "editor.rename-entity" diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 66858f0056..ce925cade0 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -311,7 +311,7 @@ module.exports = class Router client.on 'deleteProject', (callback)-> AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) => - collaberationManager.deleteProject(project_id, callback) + EditorController.deleteProject(project_id, callback) client.on 'setPublicAccessLevel', (newAccessLevel, callback)-> AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) => diff --git a/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee index 933c5bae3b..efb469769d 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee @@ -609,3 +609,15 @@ describe "EditorController", -> done() + describe "deleteProject", -> + + beforeEach -> + @err = "errro" + @ProjectHandler::deleteProject = sinon.stub().callsArgWith(1, @err) + + it "should call the project handler", (done)-> + @EditorController.deleteProject @project_id, (err)=> + err.should.equal @err + @ProjectHandler::deleteProject.calledWith(@project_id).should.equal true + done() +