From 4d2522a69aa4758c50cd0d0e397b4eab0f32370d Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Thu, 12 Jan 2023 19:00:44 +0530 Subject: [PATCH] [CST-7755] Build Failded Fixed --- ...search-result-list-element.component.spec.ts | 17 ++++++++++++++--- ...search-result-list-element.component.spec.ts | 17 ++++++++++++++--- ...search-result-list-element.component.spec.ts | 16 +++++++++++++--- ...search-result-list-element.component.spec.ts | 16 +++++++++++++--- ...search-result-list-element.component.spec.ts | 16 +++++++++++++--- ...search-result-list-element.component.spec.ts | 17 ++++++++++++++--- 6 files changed, 81 insertions(+), 18 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 9f8963b60b..3a0e73e46c 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -24,6 +24,8 @@ import { EPersonDataService } from '../../../../../core/eperson/eperson-data.ser import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent; let fixture: ComponentFixture; @@ -37,6 +39,15 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { } }); +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); + const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), { @@ -150,7 +161,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { { provide: TranslateService, useValue: {}}, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -248,7 +259,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { {provide: TranslateService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 03c0151693..67665403d1 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -24,6 +24,8 @@ import { EPersonDataService } from '../../../../../core/eperson/eperson-data.ser import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent; let fixture: ComponentFixture; @@ -36,6 +38,15 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { return of(EPersonMock); } }); + +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), { @@ -148,7 +159,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { { provide: TranslateService, useValue: {}}, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -245,7 +256,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { {provide: TranslateService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index bc1a560613..63e8abda28 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -24,6 +24,8 @@ import { AuthorizationDataService } from '../../../../../core/data/feature-autho import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalListElementComponent: JournalSearchResultListElementComponent; let fixture: ComponentFixture; @@ -36,6 +38,14 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { return of(EPersonMock); } }); +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -145,7 +155,7 @@ describe('JournalSearchResultListElementComponent', () => { { provide: TranslateService, useValue: {}}, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -218,7 +228,7 @@ describe('JournalSearchResultListElementComponent', () => { {provide: TranslateService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index 8be5f7496b..102393ed8f 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -14,7 +14,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -25,6 +25,8 @@ import { EPersonDataService } from '../../../../../core/eperson/eperson-data.ser import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent; let fixture: ComponentFixture; @@ -37,6 +39,14 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { return of(EPersonMock); } }); +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -150,7 +160,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { { provide: NotificationsService, useValue: {}}, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -229,7 +239,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { {provide: NotificationsService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index e8cb217cdf..25b3a37c83 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -14,7 +14,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { hot } from 'jasmine-marbles'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -25,6 +25,8 @@ import { ResourcePolicyDataService } from '../../../../../core/resource-policy/r import { AuthService } from '../../../../../core/auth/auth.service'; import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let personListElementComponent: PersonSearchResultListElementComponent; let fixture: ComponentFixture; @@ -40,6 +42,14 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { return of(EPersonMock); } }); +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -149,7 +159,7 @@ describe('PersonSearchResultListElementComponent', () => { { provide: NotificationsService, useValue: {} }, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -228,7 +238,7 @@ describe('PersonSearchResultListElementComponent', () => { {provide: NotificationsService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 6af4f9c43b..60487af8c8 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; import { GroupMock } from '../../../../../shared/testing/group-mock'; @@ -24,6 +24,8 @@ import { EPersonDataService } from '../../../../../core/eperson/eperson-data.ser import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; +import { EPerson } from '../../../../../core/eperson/models/eperson.model'; +import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let projectListElementComponent: ProjectSearchResultListElementComponent; let fixture: ComponentFixture; @@ -37,6 +39,15 @@ const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { } }); +const user = Object.assign(new EPerson(), { + id: 'userId', + groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), + _links: { self: { href: 'test.com/uuid/1234567654321' } } +}); +const epersonService = jasmine.createSpyObj('epersonService', { + findById: createSuccessfulRemoteDataObject$(user), +}); + const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), { @@ -144,7 +155,7 @@ describe('ProjectSearchResultListElementComponent', () => { { provide: TranslateService, useValue: {}}, { provide: ResourcePolicyDataService, useValue: {}}, { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: {}}, + { provide: EPersonDataService, useValue: epersonService}, { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } @@ -217,7 +228,7 @@ describe('ProjectSearchResultListElementComponent', () => { {provide: TranslateService, useValue: {}}, {provide: ResourcePolicyDataService, useValue: {}}, {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: {}}, + {provide: EPersonDataService, useValue: epersonService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs }