From 4ab922902b274920eeaa58474c47285bb14a4025 Mon Sep 17 00:00:00 2001
From: HarshithDS <harshith.ds@matriotsolutions.com>
Date: Wed, 10 Aug 2022 13:27:02 +0530
Subject: [PATCH] TMSS-1694:Fixed tests
---
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js | 6 +++---
.../frontend/tmss_webapp/src/routes/Project/list.test.js | 7 +++----
.../tmss_webapp/src/routes/Scheduling/create.test.js | 1 +
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
index 66035a9b2a3..5edad2e81c9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
@@ -194,9 +194,9 @@ export class ProjectList extends Component {
list = projects;
this.updatedProjList = [];
projects.forEach((project, index) => {
- Promise.all([ProjectService.getFriendsOfProject(project.name)]).then(async (response) => {
- project.friend = response[0].join(", ");
- project.myRoles = this.myRoles.project_roles[project.name].join(", ")
+ ProjectService.getFriendsOfProject(project.name).then(async (response) => {
+ project.friend = response.join(", ");
+ project.myRoles = this.myRoles.project_roles[project.name] && this.myRoles.project_roles[project.name].join(", ");
project.quota.map(quota => {
let projectArchive = _.find(projectArchiveLocation.results, ['project_quota', quota]);
if(projectArchive) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js
index 1687d4e5c39..66d9fe673c4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.test.js
@@ -8,6 +8,7 @@ import ProjectServiceMock from '../../__mocks__/project.service.data';
import ProjectService from '../../services/project.service';
import 'regenerator-runtime/runtime'
import AuthUtil from '../../utils/auth.util';
+import SUServiceMock from '../../__mocks__/scheduleunit.service.data';
let container = null;
let authSpy, projectListSpy, clusterSpy, fileSystemSpy, projectArchiveLocationSpy, projectStateSpy, rolesSpy, friendsSpy, resourceTypeSpy;
@@ -45,10 +46,6 @@ const setMockSpy = (() => {
projectStateSpy.mockImplementation(()=> {
return Promise.resolve(ProjectServiceMock.projectState)
})
- rolesSpy = jest.spyOn(ProjectService, 'getRolesForProject');
- rolesSpy.mockImplementation((name)=> {
- return Promise.resolve([])
- })
friendsSpy= jest.spyOn(ProjectService, 'getFriendsOfProject');
friendsSpy.mockImplementation((name) => {
return Promise.resolve([])
@@ -60,6 +57,8 @@ const setMockSpy = (() => {
}
return Promise.resolve(ProjectServiceMock.resourceType)
})
+ rolesSpy = jest.spyOn(ProjectService, 'getMyRoles');
+ rolesSpy.mockImplementation((model) => { return Promise.resolve(SUServiceMock.getMyRoles)});
});
const clearMockSpy = (() => {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
index 304e42f2ab6..5db0872b198 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
@@ -132,6 +132,7 @@ const clearMockSpy = () => {
templatePurposesSpy.mockRestore();
templateStatesSpy.mockRestore();
validatorSpy.mockRestore();
+ rolesSpy.mockRestore();
//authPermissionSpy.mockRestore();
//userPermissionSpy.mockRestore();
}
--
GitLab