From 08d1eeba78df1aae330629235c53f31c4f7c3527 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 4 Apr 2014 16:49:44 +0100 Subject: [PATCH] moved renameProject from collab manager to editor controller --- .../Features/Editor/EditorController.coffee | 8 +++++++ .../managers/CollaberationManager.coffee | 7 ------- services/web/app/coffee/router.coffee | 2 +- .../Editor/EditorControllerTests.coffee | 21 ++++++++++++++++++- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorController.coffee b/services/web/app/coffee/Features/Editor/EditorController.coffee index c867942388..34474e7a74 100644 --- a/services/web/app/coffee/Features/Editor/EditorController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorController.coffee @@ -257,6 +257,14 @@ module.exports = EditorController = EditorRealTimeController.emitToRoom project_id, 'reciveEntityMove', entity_id, folder_id callback?() + + renameProject: (project_id, window_id, newName, callback)-> + newName = sanitize.escape(newName) + ProjectHandler.renameProject project_id, window_id, newName, => + newName = sanitize.escape(newName) + EditorRealTimeController.emitToRoom project_id, 'projectNameUpdated', window_id, newName + 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 fdf72f5f4b..2cde97f17b 100644 --- a/services/web/app/coffee/managers/CollaberationManager.coffee +++ b/services/web/app/coffee/managers/CollaberationManager.coffee @@ -15,13 +15,6 @@ EditorRealTimeController = require('../Features/Editor/EditorRealTimeController' module.exports = class CollaberationManager constructor: (@io)-> - renameProject: (project_id, window_id, newName, callback)-> - newName = sanitize.escape(newName) - projectHandler.renameProject project_id, window_id, newName, => - newName = sanitize.escape(newName) - EditorRealTimeController.emitToRoom project_id, 'projectNameUpdated', window_id, newName - callback?() - setPublicAccessLevel : (project_id, newAccessLevel, callback)-> projectHandler.setPublicAccessLevel project_id, newAccessLevel, => EditorRealTimeController.emitToRoom project_id, 'publicAccessLevelUpdated', newAccessLevel diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index ffba1033a5..12b9506268 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -299,7 +299,7 @@ module.exports = class Router client.on 'setProjectName', (window_id, newName, callback)-> AuthorizationManager.ensureClientCanEditProject client, (error, project_id) => - collaberationManager.renameProject(project_id, window_id, newName, callback) + EditorController.renameProject(project_id, window_id, newName, callback) client.on 'getProject',(callback)-> AuthorizationManager.ensureClientCanViewProject 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 23346f6379..6a474ce429 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee @@ -643,7 +643,6 @@ describe "EditorController", -> @EditorRealTimeController.emitToRoom.calledWith(@project_id, 'reciveEntityRename', @entity_id, @newName).should.equal true done() - describe "moveEntity", -> beforeEach -> @@ -664,3 +663,23 @@ describe "EditorController", -> @EditorController.moveEntity @project_id, @entity_id, @folder_id, @entityType, => @EditorRealTimeController.emitToRoom.calledWith(@project_id, 'reciveEntityMove', @entity_id, @folder_id).should.equal true done() + + describe "renameProject", -> + + beforeEach -> + @err = "errro" + @window_id = "kdsjklj290jlk" + @newName = "new name here" + @ProjectHandler::renameProject = sinon.stub().callsArgWith(3, @err) + @EditorRealTimeController.emitToRoom = sinon.stub() + + it "should call the ProjectHandler", (done)-> + @EditorController.renameProject @project_id, @window_id, @newName, => + @ProjectHandler::renameProject.calledWith(@project_id, @window_id, @newName).should.equal true + done() + + + it "should emit the update to the room", (done)-> + @EditorController.renameProject @project_id, @window_id, @newName, => + @EditorRealTimeController.emitToRoom.calledWith(@project_id, 'projectNameUpdated', @window_id, @newName).should.equal true + done()