From 0ad23480a842d64a1e5b4efb71103a1ffe8fa054 Mon Sep 17 00:00:00 2001 From: emathew Date: Wed, 3 Sep 2025 08:28:01 -0400 Subject: [PATCH 1/2] fixed 5 tests; pagination left --- test/unit-tests/org/orgCreateTest.js | 2 +- test/unit-tests/user/userGetAllTest.js | 98 ++++++++++++++++++-------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/test/unit-tests/org/orgCreateTest.js b/test/unit-tests/org/orgCreateTest.js index bbdb8be98..ece79eeb3 100644 --- a/test/unit-tests/org/orgCreateTest.js +++ b/test/unit-tests/org/orgCreateTest.js @@ -51,7 +51,7 @@ const orgFixtures = { } } -describe.only('Testing the ORG_CREATE_SINGLE controller', () => { +describe('Testing the ORG_CREATE_SINGLE controller', () => { let status, json, res, next, getOrgRepository, orgRepo, getUserRepository, getBaseOrgRepository, getBaseUserRepository, userRepo, mockSession, baseOrgRepo, baseUserRepo, fakeBaseSavedObject, saveStub, fakeLegacySavedObject, fakeMongooseDocument, fakeBaseSavedObjectCisco, fakeLegacySavedObjectCisco diff --git a/test/unit-tests/user/userGetAllTest.js b/test/unit-tests/user/userGetAllTest.js index 1c0be0c1e..898ccbb6e 100644 --- a/test/unit-tests/user/userGetAllTest.js +++ b/test/unit-tests/user/userGetAllTest.js @@ -17,7 +17,7 @@ const orgFixtures = require('./mockObjects.user') const orgController = require('../../../src/controller/org.controller/org.controller') const orgParams = require('../../../src/controller/org.controller/org.middleware') -describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller', () => { +describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller', () => { context('Negative Tests', () => { it('should return 404 not found because org does not exist', (done) => { class NoOrg { @@ -25,7 +25,7 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return null } - async isSecretariat () { + async isSecretariatByShortName () { return false } } @@ -39,8 +39,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/org-does-not-exist/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new NoOrg() }, - getUserRepository: () => { return new Blank() } + getBaseOrgRepository: () => { return new NoOrg() }, + getBaseUserRepository: () => { return new Blank() } } req.ctx.repositories = factory next() @@ -69,7 +69,7 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return 'not-an-org' } - async isSecretariat () { + async isSecretariatByShortName () { return false } } @@ -83,8 +83,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/requester-does-not-belong/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new NotSameOrg() }, - getUserRepository: () => { return new Blank() } + getBaseOrgRepository: () => { return new NotSameOrg() }, + getBaseUserRepository: () => { return new Blank() } } req.ctx.repositories = factory next() @@ -115,12 +115,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return false } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: [orgFixtures.existentUserDummy] + } + } + async aggregatePaginate () { const res = { itemsList: [orgFixtures.existentUserDummy], @@ -141,8 +147,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-returned-same-org/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory next() @@ -170,12 +176,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return true } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: [orgFixtures.existentUserDummy] + } + } + async aggregatePaginate () { const res = { itemsList: [orgFixtures.existentUserDummy], @@ -196,8 +208,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-returned-secretariat/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory next() @@ -225,12 +237,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return false } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: orgFixtures.allOwningOrgUsers + } + } + async aggregatePaginate () { const res = { itemsList: orgFixtures.allOwningOrgUsers, @@ -251,8 +269,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-returned-not-secretariat-limit-default/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory next() @@ -282,12 +300,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return false } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]] + } + } + async aggregatePaginate () { const res = { itemsList: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]], @@ -308,8 +332,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-returned-not-secretariat-limit-3-1/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory // temporary fix for #920: force pagnation @@ -339,12 +363,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return false } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]] + } + } + async aggregatePaginate () { const res = { itemsList: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]], @@ -365,8 +395,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-returned-not-secretariat-limit-3-2/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory // temporary fix for #920: force pagnation @@ -396,12 +426,18 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' return orgFixtures.owningOrg.UUID } - async isSecretariat () { + async isSecretariatByShortName () { return false } } - class GetAllOrgUsers { + class GetAllUsersByOrgShortname { + async getAllUsersByOrgShortname () { + return { + users: [orgFixtures.existentUserDummy] + } + } + async aggregatePaginate () { const res = { itemsList: [], @@ -422,8 +458,8 @@ describe.skip('Testing the GET /org/:shortname/users endpoint in Org Controller' app.route('/user-list-no-users/:shortname/users') .get((req, res, next) => { const factory = { - getOrgRepository: () => { return new GetOrgUUID() }, - getUserRepository: () => { return new GetAllOrgUsers() } + getBaseOrgRepository: () => { return new GetOrgUUID() }, + getBaseUserRepository: () => { return new GetAllUsersByOrgShortname() } } req.ctx.repositories = factory next() From 96dad3244e6d7a0ff43994a2502f547fc856fa6b Mon Sep 17 00:00:00 2001 From: emathew Date: Wed, 3 Sep 2025 15:45:17 -0400 Subject: [PATCH 2/2] finish usertest --- test/unit-tests/user/userGetAllTest.js | 139 ++++++------------------- 1 file changed, 29 insertions(+), 110 deletions(-) diff --git a/test/unit-tests/user/userGetAllTest.js b/test/unit-tests/user/userGetAllTest.js index 898ccbb6e..7d3441212 100644 --- a/test/unit-tests/user/userGetAllTest.js +++ b/test/unit-tests/user/userGetAllTest.js @@ -17,7 +17,7 @@ const orgFixtures = require('./mockObjects.user') const orgController = require('../../../src/controller/org.controller/org.controller') const orgParams = require('../../../src/controller/org.controller/org.middleware') -describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller', () => { +describe('Testing the GET /org/:shortname/users endpoint in Org Controller', () => { context('Negative Tests', () => { it('should return 404 not found because org does not exist', (done) => { class NoOrg { @@ -126,24 +126,7 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' users: [orgFixtures.existentUserDummy] } } - - async aggregatePaginate () { - const res = { - itemsList: [orgFixtures.existentUserDummy], - itemCount: 1, - itemsPerPage: 1000, - currentPage: 1, - pageCount: 1, - pagingCounter: 1, - hasPrevPage: false, - hasNextPage: false, - prevPage: null, - nextPage: null - } - return res - } } - app.route('/user-list-returned-same-org/:shortname/users') .get((req, res, next) => { const factory = { @@ -187,22 +170,6 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' users: [orgFixtures.existentUserDummy] } } - - async aggregatePaginate () { - const res = { - itemsList: [orgFixtures.existentUserDummy], - itemCount: 1, - itemsPerPage: 1000, - currentPage: 1, - pageCount: 1, - pagingCounter: 1, - hasPrevPage: false, - hasNextPage: false, - prevPage: null, - nextPage: null - } - return res - } } app.route('/user-list-returned-secretariat/:shortname/users') @@ -244,25 +211,8 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' class GetAllUsersByOrgShortname { async getAllUsersByOrgShortname () { - return { - users: orgFixtures.allOwningOrgUsers - } - } - - async aggregatePaginate () { - const res = { - itemsList: orgFixtures.allOwningOrgUsers, - itemCount: orgFixtures.allOwningOrgUsers.length, - itemsPerPage: 500, - currentPage: 1, - pageCount: 1, - pagingCounter: 1, - hasPrevPage: false, - hasNextPage: false, - prevPage: null, - nextPage: null - } - return res + const payload = { users: orgFixtures.allOwningOrgUsers } + return payload } } @@ -307,25 +257,18 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' class GetAllUsersByOrgShortname { async getAllUsersByOrgShortname () { - return { - users: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]] - } - } - - async aggregatePaginate () { - const res = { - itemsList: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]], - itemCount: orgFixtures.allOwningOrgUsers.length, - itemsPerPage: itemsPerPage, - currentPage: 1, - pageCount: 2, - pagingCounter: 1, - hasPrevPage: false, - hasNextPage: true, - prevPage: null, - nextPage: 2 - } - return res + const payload = { users: [orgFixtures.allOwningOrgUsers[0], orgFixtures.allOwningOrgUsers[1], orgFixtures.allOwningOrgUsers[2]] } + payload.totalCount = orgFixtures.allOwningOrgUsers.length + payload.itemsPerPage = 3 + payload.pageCount = 2 + payload.currentPage = 1 + payload.pagingCounter = 1 + payload.hasPrevPage = false + payload.hasNextPage = true + payload.prevPage = null + payload.nextPage = 2 + + return payload } } @@ -370,25 +313,18 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' class GetAllUsersByOrgShortname { async getAllUsersByOrgShortname () { - return { - users: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]] - } - } - - async aggregatePaginate () { - const res = { - itemsList: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]], - itemCount: orgFixtures.allOwningOrgUsers.length, - itemsPerPage: 3, - currentPage: 2, - pageCount: 2, - pagingCounter: 1, - hasPrevPage: true, - hasNextPage: false, - prevPage: 1, - nextPage: null - } - return res + const payload = { users: [orgFixtures.allOwningOrgUsers[3], orgFixtures.allOwningOrgUsers[4]] } + payload.totalCount = orgFixtures.allOwningOrgUsers.length + payload.itemsPerPage = 3 + payload.pageCount = 2 + payload.currentPage = 2 + payload.pagingCounter = 1 + payload.hasPrevPage = true + payload.hasNextPage = false + payload.prevPage = 1 + payload.nextPage = null + + return payload } } @@ -433,25 +369,8 @@ describe.only('Testing the GET /org/:shortname/users endpoint in Org Controller' class GetAllUsersByOrgShortname { async getAllUsersByOrgShortname () { - return { - users: [orgFixtures.existentUserDummy] - } - } - - async aggregatePaginate () { - const res = { - itemsList: [], - itemCount: 0, - itemsPerPage: 500, - currentPage: 1, - pageCount: 1, - pagingCounter: 1, - hasPrevPage: false, - hasNextPage: false, - prevPage: null, - nextPage: null - } - return res + const payload = { users: [] } + return payload } }