From 59cf0aa3cbe4e0d511d6dddcab76cfad2b6730d3 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 12 Oct 2018 12:10:35 +0100 Subject: [PATCH] fix bug in call to findAllUsersProjects --- .../Features/Project/ProjectDetailsHandler.coffee | 2 +- .../coffee/Project/ProjectDetailsHandlerTests.coffee | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee b/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee index 4f3f9b6b1e..20e8d2e6da 100644 --- a/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee @@ -82,7 +82,7 @@ module.exports = ProjectDetailsHandler = return callback(error) if error? # allUsersProjectNames is returned as a hash {owned: [name1, name2, ...], readOnly: [....]} # collect all of the names and flatten them into a single array - projectNameList = _.flatten(_.values(allUsersProjectNames)) + projectNameList = _.pluck(_.flatten(_.values(allUsersProjectNames)),'name') # create a set of all project names allProjectNames = new Set() for projectName in projectNameList diff --git a/services/web/test/unit/coffee/Project/ProjectDetailsHandlerTests.coffee b/services/web/test/unit/coffee/Project/ProjectDetailsHandlerTests.coffee index 0dd7d11ac8..2ccad8ae94 100644 --- a/services/web/test/unit/coffee/Project/ProjectDetailsHandlerTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectDetailsHandlerTests.coffee @@ -158,11 +158,11 @@ describe 'ProjectDetailsHandler', -> describe "ensureProjectNameIsUnique", -> beforeEach -> @result = { - owned: ["name", "name1", "name11"] - readAndWrite: ["name2", "name22"] - readOnly: ["name3", "name33"] - tokenReadAndWrite: ["name4", "name44"] - tokenReadOnly: ["name5", "name55", "x".repeat(15)] + owned: [{_id: 1, name:"name"}, {_id: 2, name: "name1"}, {_id: 3, name: "name11"}] + readAndWrite: [{_id: 4, name:"name2"}, {_id: 5, name:"name22"}] + readOnly: [{_id:6, name:"name3"}, {_id:7, name: "name33"}] + tokenReadAndWrite: [{_id:8, name:"name4"}, {_id:9, name:"name44"}] + tokenReadOnly: [{_id:10, name:"name5"}, {_id:11, name:"name55"}, {_id:12, name:"x".repeat(15)}] } @ProjectGetter.findAllUsersProjects = sinon.stub().callsArgWith(2, null, @result)