Merge pull request #2636 from sudip-mukherjee/release-2.4.0-SC-1288

Issue #SB-14546 fix: Unit test coverage

src/app/client/src/app/modules/recover-account/components/select-account-identifier/select-account-identifier.component.spec.ts

@@ -63,7 +63,18 @@ describe('SelectAccountIdentifierComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  it('should call initializeForm', () => {
+    spyOn(component, 'verifyState').and.returnValue(true);
+    spyOn(component, 'initializeForm').and.callThrough();
+    component.ngOnInit();
+    expect(component.initializeForm).toHaveBeenCalled();
+  });
+
+  it('should call handleGenerateOtp()', () => {
+    const recoverAccountService = TestBed.get(RecoverAccountService);
+    spyOn(recoverAccountService, 'generateOTP').and.returnValue(of({}));
+    spyOn(component, 'navigateToNextStep').and.callThrough();
+    component.handleGenerateOtp();
+    expect(component.navigateToNextStep).toHaveBeenCalled();
   });
 });

src/app/client/src/app/modules/recover-account/services/recover-account/recover-account.service.spec.ts

-import { TestBed } from '@angular/core/testing';
+import { LearnerService } from './../../../core/services/learner/learner.service';
+import { TestBed, inject } from '@angular/core/testing';
 import { CoreModule } from '@sunbird/core';
 import { SharedModule } from '@sunbird/shared';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RecoverAccountService } from './recover-account.service';
+import { of as observableOf, Observable } from 'rxjs';
 
 describe('RecoverAccountService', () => {
   beforeEach(() => {
@@ -15,4 +17,61 @@ describe('RecoverAccountService', () => {
     const service: RecoverAccountService = TestBed.get(RecoverAccountService);
     expect(service).toBeTruthy();
   });
+
+  it('should call resetPassword API', inject([],
+    () => {
+      const certificateService = TestBed.get(RecoverAccountService);
+      const learnerService = TestBed.get(LearnerService);
+      const params = { 'request': { 'type': 'user', 'key': 'testKey', 'userId': 'testUserId' } };
+      spyOn(learnerService, 'post').and.returnValue(observableOf({}));
+      certificateService.resetPassword(params);
+      const options = { url: 'user/v1/password/reset', data: params };
+      expect(learnerService.post).toHaveBeenCalledWith(options);
+    }));
+
+  it('should call generateOTP API', inject([],
+    () => {
+      const certificateService = TestBed.get(RecoverAccountService);
+      const learnerService = TestBed.get(LearnerService);
+      const params = { 'request': { 'type': 'user', 'key': 'testKey', 'userId': 'testUserId' } };
+      spyOn(learnerService, 'post').and.returnValue(observableOf({}));
+      certificateService.generateOTP(params);
+      const options = { url: 'otp/v1/generate', data: params };
+      expect(learnerService.post).toHaveBeenCalledWith(options);
+    }));
+
+  it('should call verifyOTP API', inject([],
+    () => {
+      const certificateService = TestBed.get(RecoverAccountService);
+      const learnerService = TestBed.get(LearnerService);
+      const params = { 'request': { 'type': 'user', 'key': 'testKey', 'userId': 'testUserId' } };
+      spyOn(learnerService, 'post').and.returnValue(observableOf({}));
+      certificateService.verifyOTP(params);
+      const options = { url: 'otp/v1/verify', data: params };
+      expect(learnerService.post).toHaveBeenCalledWith(options);
+    }));
+
+  it('should call fuzzyUserSearch API', inject([],
+    () => {
+      const certificateService = TestBed.get(RecoverAccountService);
+      const learnerService = TestBed.get(LearnerService);
+      const params = {
+        'request': {
+          'filters': {
+            'isDeleted' : 'false',
+            'fuzzy': {
+              'firstName': undefined
+            },
+            $or: {
+              'email': undefined,
+              'prevUsedEmail': undefined
+            }
+          }
+        }
+      };
+      spyOn(learnerService, 'post').and.returnValue(observableOf({}));
+      certificateService.fuzzyUserSearch(params);
+      const options = { url: 'user/v1/fuzzy/search', data: params };
+      expect(learnerService.post).toHaveBeenCalledWith(options);
+    }));
 });

src/app/client/src/app/modules/workspace/classes/workspace.ts

@@ -54,8 +54,8 @@ export class WorkSpace {
             if (_.get(lockList, 'result.count')) {
                 const lockDataKeyByContentId = _.keyBy(lockList.result.data, 'resourceId');
                 _.each(contents, (eachContent, index) => {
-                    const lockInfo = lockDataKeyByContentId[eachContent.identifier];
-                    if (lockInfo) {
+                    const lockInfo = { ...lockDataKeyByContentId[eachContent.identifier]};
+                    if (!_.isEmpty(lockInfo) && eachContent.status !== 'Live') {
                         lockInfo.creatorInfo = JSON.parse(lockInfo.creatorInfo);
                         contents[index].lockInfo = lockInfo;
                     }