From 77adb60a8a817a36b67f9ac4957908cd529b6227 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 23 Jan 2018 11:46:09 +0000 Subject: [PATCH] fix typo in project getter exclusions --- .../Features/Project/ProjectGetter.coffee | 6 +- .../coffee/Project/ProjectGetterTests.coffee | 70 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectGetter.coffee b/services/web/app/coffee/Features/Project/ProjectGetter.coffee index fb4e30fd2c..4506292fbb 100644 --- a/services/web/app/coffee/Features/Project/ProjectGetter.coffee +++ b/services/web/app/coffee/Features/Project/ProjectGetter.coffee @@ -13,15 +13,15 @@ module.exports = ProjectGetter = getProjectWithoutDocLines: (project_id, callback=(error, project) ->) -> excludes = {} for i in [1..ProjectGetter.EXCLUDE_DEPTH] - excludes["rootFolder#{Array(i).join(".folder")}.docs.lines"] = 0 + excludes["rootFolder#{Array(i).join(".folders")}.docs.lines"] = 0 db.projects.find _id: ObjectId(project_id.toString()), excludes, (error, projects = []) -> callback error, projects[0] getProjectWithOnlyFolders: (project_id, callback=(error, project) ->) -> excludes = {} for i in [1..ProjectGetter.EXCLUDE_DEPTH] - excludes["rootFolder#{Array(i).join(".folder")}.docs"] = 0 - excludes["rootFolder#{Array(i).join(".folder")}.fileRefs"] = 0 + excludes["rootFolder#{Array(i).join(".folders")}.docs"] = 0 + excludes["rootFolder#{Array(i).join(".folders")}.fileRefs"] = 0 db.projects.find _id: ObjectId(project_id.toString()), excludes, (error, projects = []) -> callback error, projects[0] diff --git a/services/web/test/unit/coffee/Project/ProjectGetterTests.coffee b/services/web/test/unit/coffee/Project/ProjectGetterTests.coffee index abc0842f76..3a9138cd64 100644 --- a/services/web/test/unit/coffee/Project/ProjectGetterTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectGetterTests.coffee @@ -41,13 +41,13 @@ describe "ProjectGetter", -> it "should exclude the doc lines", -> excludes = "rootFolder.docs.lines": 0 - "rootFolder.folder.docs.lines": 0 - "rootFolder.folder.folder.docs.lines": 0 - "rootFolder.folder.folder.folder.docs.lines": 0 - "rootFolder.folder.folder.folder.folder.docs.lines": 0 - "rootFolder.folder.folder.folder.folder.folder.docs.lines": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.docs.lines": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.folder.docs.lines": 0 + "rootFolder.folders.docs.lines": 0 + "rootFolder.folders.folders.docs.lines": 0 + "rootFolder.folders.folders.folders.docs.lines": 0 + "rootFolder.folders.folders.folders.folders.docs.lines": 0 + "rootFolder.folders.folders.folders.folders.folders.docs.lines": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.docs.lines": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.folders.docs.lines": 0 @db.projects.find.calledWith(sinon.match.any, excludes) .should.equal true @@ -75,20 +75,20 @@ describe "ProjectGetter", -> excludes = "rootFolder.docs": 0 "rootFolder.fileRefs": 0 - "rootFolder.folder.docs": 0 - "rootFolder.folder.fileRefs": 0 - "rootFolder.folder.folder.docs": 0 - "rootFolder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.folder.fileRefs": 0 + "rootFolder.folders.docs": 0 + "rootFolder.folders.fileRefs": 0 + "rootFolder.folders.folders.docs": 0 + "rootFolder.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.folders.fileRefs": 0 @db.projects.find.calledWith(sinon.match.any, excludes).should.equal true it "should call the callback with the project", -> @@ -115,20 +115,20 @@ describe "ProjectGetter", -> excludes = "rootFolder.docs": 0 "rootFolder.fileRefs": 0 - "rootFolder.folder.docs": 0 - "rootFolder.folder.fileRefs": 0 - "rootFolder.folder.folder.docs": 0 - "rootFolder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.fileRefs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.folder.docs": 0 - "rootFolder.folder.folder.folder.folder.folder.folder.folder.fileRefs": 0 + "rootFolder.folders.docs": 0 + "rootFolder.folders.fileRefs": 0 + "rootFolder.folders.folders.docs": 0 + "rootFolder.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.fileRefs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.folders.docs": 0 + "rootFolder.folders.folders.folders.folders.folders.folders.folders.fileRefs": 0 @db.projects.find.calledWith(sinon.match.any, excludes).should.equal true it "should call the callback with the project", ->