hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DURACOM-191' into DURACOM-234

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-03-17 17:35:40 +01:00
parent aa4e4e6fce 2e8817712a
commit 0db7fffec6
22 changed files with 250 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
View File

@@ -1,35 +1,40 @@
import { CommonModule } from '@angular/common';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { NotificationsSuggestionTargetsPageComponent } from '../../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page.component';
describe('NotificationsSuggestionTargetsPageComponent', () => {
let component: NotificationsSuggestionTargetsPageComponent;
let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
describe('AdminNotificationsPublicationClaimPageComponent', () => {
let component: AdminNotificationsPublicationClaimPageComponent;
let fixture: ComponentFixture<AdminNotificationsPublicationClaimPageComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
CommonModule,
TranslateModule.forRoot(),
NotificationsSuggestionTargetsPageComponent,
AdminNotificationsPublicationClaimPageComponent,
],
providers: [
NotificationsSuggestionTargetsPageComponent,
AdminNotificationsPublicationClaimPageComponent,
],
schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(AdminNotificationsPublicationClaimPageComponent, {
remove: {
imports: [PublicationClaimComponent],
},
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
fixture = TestBed.createComponent(AdminNotificationsPublicationClaimPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

7
src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
View File

@@ -1,3 +1,4 @@
import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
ComponentFixture,
TestBed,
@@ -11,6 +12,7 @@ import { SearchService } from '../../core/shared/search/search.service';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
import { AdminNotifyMessage } from './models/admin-notify-message.model';
import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
@@ -46,6 +48,11 @@ describe('AdminNotifyDashboardComponent', () => {
{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
{ provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
],
schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(AdminNotifyDashboardComponent, {
remove: {
imports: [AdminNotifyMetricsComponent],
},
})
.compileComponents();

2
src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
View File

@@ -3,7 +3,7 @@
[linkType]="linkType"
[listID]="listID"></ds-collection-search-result-list-element>
<div>
<a class="btn btn-light mt-1" [routerLink]="[editPath]">
<a class="btn btn-light mt-1" data-test="coll-link" [routerLink]="[editPath]">
<i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
</a>
</div>

17
src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
View File

@@ -19,6 +19,7 @@ import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucata
import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
import { CollectionSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
@@ -51,8 +52,13 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
{ provide: ThemeService, useValue: getMockThemeService() },
],
schemas: [NO_ERRORS_SCHEMA],
})
.compileComponents();
}).overrideComponent(CollectionAdminSearchResultListElementComponent, {
remove: {
imports: [
CollectionSearchResultListElementComponent,
],
},
}).compileComponents();
}));
beforeEach(() => {
@@ -62,7 +68,7 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
component.linkTypes = CollectionElementLinkType;
component.index = 0;
component.viewModes = ViewMode;
fixture.detectChanges();
});
it('should create', () => {
@@ -70,10 +76,7 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
});
it('should render an edit button with the correct link', () => {
component.ngOnInit();
fixture.detectChanges();
const a = fixture.debugElement.query(By.css('a'));
const a = fixture.debugElement.query(By.css('a[data-test="coll-link"]'));
const link = a.nativeElement.href;
expect(link).toContain(getCollectionEditRoute(id));
});

7
src/app/app-routes.ts
View File

@@ -157,13 +157,6 @@ export const APP_ROUTES: Route[] = [
.then((m) => m.ROUTES),
canActivate: [EndUserAgreementCurrentUserGuard],
},
{
path: NOTIFICATIONS_MODULE_PATH,
loadChildren: () => import('./admin/admin-notifications/admin-notifications-routes')
.then((m) => m.ROUTES),
providers: [provideSuggestionNotificationsState()],
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
},
{
path: NOTIFICATIONS_MODULE_PATH,
loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages-routes')

19
src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
View File

@@ -8,6 +8,7 @@ import { By } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { BrowseDefinition } from '../../core/shared/browse-definition.model';
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
@@ -24,6 +25,19 @@ import { BrowseByPageComponent } from './browse-by-page.component';
class BrowseByTestComponent {
}
@Component({
// eslint-disable-next-line @angular-eslint/component-selector
selector: 'ds-browse-by-switcher',
template: `<ng-template #DynamicComponentLoader dsDynamicComponentLoader></ng-template>`,
standalone: true,
imports: [DynamicComponentLoaderDirective],
})
class TestBrowseBySwitcherComponent extends BrowseBySwitcherComponent {
getComponent(): GenericConstructor<Component> {
return BrowseByTestComponent;
}
}
class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
getRenderType(): BrowseByDataType {
return 'BrowseByPageComponent' as BrowseByDataType;
@@ -42,7 +56,7 @@ describe('BrowseByPageComponent', () => {
themeService = getMockThemeService();
await TestBed.configureTestingModule({
imports: [BrowseBySwitcherComponent, BrowseByPageComponent, DynamicComponentLoaderDirective],
imports: [TestBrowseBySwitcherComponent, BrowseByPageComponent, DynamicComponentLoaderDirective],
providers: [
BrowseByTestComponent,
{ provide: ActivatedRoute, useValue: activatedRoute },
@@ -53,6 +67,9 @@ describe('BrowseByPageComponent', () => {
remove: {
imports: [BrowseBySwitcherComponent],
},
add: {
imports: [TestBrowseBySwitcherComponent],
},
})
.compileComponents();

133
src/app/core/cache/builders/link.service.spec.ts vendored
View File

@@ -1,15 +1,13 @@
/* eslint-disable max-classes-per-file */
import { Injectable } from '@angular/core';
import { TestBed } from '@angular/core/testing';
import { isEmpty } from 'rxjs/operators';
import {
isEmpty,
take,
} from 'rxjs/operators';
import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
import {
followLink,
FollowLinkConfig,
} from '../../../shared/utils/follow-link-config.model';
import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
import { FindListOptions } from '../../data/find-list-options.model';
import { TestDataService } from '../../../shared/testing/test-data-service.mock';
import { followLink } from '../../../shared/utils/follow-link-config.model';
import { HALLink } from '../../shared/hal-link.model';
import { HALResource } from '../../shared/hal-resource.model';
import { ResourceType } from '../../shared/resource-type';
@@ -39,16 +37,9 @@ class TestModel implements HALResource {
successor?: TestModel;
}
@Injectable()
class TestDataService {
findListByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
return 'findListByHref';
}
findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
return 'findByHref';
}
}
const mockDataServiceMap: any = {
[TEST_MODEL.value]: () => import('../../../shared/testing/test-data-service.mock').then(m => m.TestDataService),
};
let testDataService: TestDataService;
@@ -76,35 +67,39 @@ describe('LinkService', () => {
spyOn(testDataService, 'findListByHref').and.callThrough();
spyOn(testDataService, 'findByHref').and.callThrough();
TestBed.configureTestingModule({
providers: [LinkService, {
provide: TestDataService,
useValue: testDataService,
}, {
provide: DATA_SERVICE_FACTORY,
useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService),
}, {
provide: LINK_DEFINITION_FACTORY,
useValue: jasmine.createSpy('getLinkDefinition').and.returnValue({
resourceType: TEST_MODEL,
linkName: 'predecessor',
propertyName: 'predecessor',
}),
}, {
provide: LINK_DEFINITION_MAP_FACTORY,
useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue([
{
providers: [
LinkService,
{
provide: TestDataService,
useValue: testDataService,
},
{
provide: APP_DATA_SERVICES_MAP,
useValue: mockDataServiceMap,
},
{
provide: LINK_DEFINITION_FACTORY,
useValue: jasmine.createSpy('getLinkDefinition').and.returnValue({
resourceType: TEST_MODEL,
linkName: 'predecessor',
propertyName: 'predecessor',
},
{
resourceType: TEST_MODEL,
linkName: 'successor',
propertyName: 'successor',
},
]),
},
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
}),
},
{
provide: LINK_DEFINITION_MAP_FACTORY,
useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue([
{
resourceType: TEST_MODEL,
linkName: 'predecessor',
propertyName: 'predecessor',
},
{
resourceType: TEST_MODEL,
linkName: 'successor',
propertyName: 'successor',
},
]),
},
],
});
service = TestBed.inject(LinkService);
@@ -113,10 +108,13 @@ describe('LinkService', () => {
describe('resolveLink', () => {
describe(`when the linkdefinition concerns a single object`, () => {
beforeEach(() => {
service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
result = service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
});
it('should call dataservice.findByHref with the correct href and nested links', () => {
expect(testDataService.findByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, true, true, followLink('successor'));
it('should call dataservice.findByHref with the correct href and nested links', (done) => {
result.predecessor.pipe(take(1)).subscribe(() => {
expect(testDataService.findByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, true, true, followLink('successor'));
done();
});
});
});
describe(`when the linkdefinition concerns a list`, () => {
@@ -127,10 +125,13 @@ describe('LinkService', () => {
propertyName: 'predecessor',
isList: true,
});
service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
result = service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
});
it('should call dataservice.findListByHref with the correct href, findListOptions, and nested links', () => {
expect(testDataService.findListByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options ' } as any, true, true, followLink('successor'));
it('should call dataservice.findListByHref with the correct href, findListOptions, and nested links', (done) => {
result.predecessor.pipe(take(1)).subscribe((res) => {
expect(testDataService.findListByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options ' } as any, true, true, followLink('successor'));
done();
});
});
});
describe('either way', () => {
@@ -142,15 +143,14 @@ describe('LinkService', () => {
expect((service as any).getLinkDefinition).toHaveBeenCalledWith(testModel.constructor as any, 'predecessor');
});
it('should call getDataServiceFor with the correct resource type', () => {
expect((service as any).getDataServiceFor).toHaveBeenCalledWith(TEST_MODEL);
});
it('should return the model with the resolved link', () => {
it('should return the model with the resolved link', (done) => {
expect(result.type).toBe(TEST_MODEL);
expect(result.value).toBe('a test value');
expect(result._links.self.href).toBe('http://self.link');
expect(result.predecessor).toBe('findByHref');
result.predecessor.subscribe((res) => {
expect(res).toBe('findByHref');
done();
});
});
});
@@ -167,12 +167,16 @@ describe('LinkService', () => {
describe(`when there is no dataservice for the resourcetype in the link`, () => {
beforeEach(() => {
((service as any).getDataServiceFor as jasmine.Spy).and.returnValue(undefined);
(service as any).map = {};
});
it('should throw an error', () => {
expect(() => {
service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
}).toThrow();
it('should throw an error', (done) => {
result = service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
result.predecessor.subscribe({
error: (error: unknown) => {
expect(error).toBeDefined();
done();
},
});
});
});
});
@@ -237,8 +241,11 @@ describe('LinkService', () => {
result = service.resolveLinks(testModel, followLink('predecessor'));
});
it('should return the model with the resolved link', () => {
expect(result.predecessor).toBe('findByHref');
it('should return the model with the resolved link', (done) => {
result.predecessor.subscribe((res) => {
expect(res).toBe('findByHref');
done();
});
});
});

3
src/app/core/cache/builders/link.service.ts vendored
View File

@@ -7,7 +7,6 @@ import {
import {
EMPTY,
Observable,
of,
} from 'rxjs';
import {
catchError,
@@ -93,7 +92,7 @@ export class LinkService {
}
}
return of(null);
return EMPTY;
}),
catchError((err: unknown) => {
throw new Error(`The @link() for ${String(linkToFollow.name)} on ${model.constructor.name} models uses the resource type ${matchingLinkDef.resourceType.value.toUpperCase()}, but there is no service with an @dataService(${matchingLinkDef.resourceType.value.toUpperCase()}) annotation in order to retrieve it`);

2
src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
View File

@@ -36,7 +36,7 @@
[authorityValue]="mdValue.newValue.confidence"
[iconMode]="true"
></i>
<input class="form-control form-outline" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
<input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
[attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
(change)="onChangeAuthorityKey()" />
<button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"

24
src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
View File

@@ -37,6 +37,8 @@ import {
VIRTUAL_METADATA_PREFIX,
} from '../../../core/shared/metadata.models';
import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { VarDirective } from '../../../shared/utils/var.directive';
@@ -202,7 +204,7 @@ describe('DsoEditMetadataValueComponent', () => {
})
.overrideComponent(DsoEditMetadataValueComponent, {
remove: {
imports: [ThemedTypeBadgeComponent],
imports: [DsDynamicOneboxComponent, DsDynamicScrollableDropdownComponent, ThemedTypeBadgeComponent],
},
})
.compileComponents();
@@ -464,22 +466,30 @@ describe('DsoEditMetadataValueComponent', () => {
expect(component.onChangeEditingAuthorityStatus).toHaveBeenCalledWith(true);
});
it('should disable the input when editingAuthority is false', () => {
it('should disable the input when editingAuthority is false', (done) => {
component.editingAuthority = false;
fixture.detectChanges();
const inputElement = fixture.nativeElement.querySelector('input');
expect(inputElement.disabled).toBe(true);
fixture.detectChanges();
fixture.whenStable().then(() => {
const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
expect(inputElement.disabled).toBeTruthy();
done();
});
});
it('should enable the input when editingAuthority is true', () => {
it('should enable the input when editingAuthority is true', (done) => {
component.editingAuthority = true;
fixture.detectChanges();
fixture.whenStable().then(() => {
const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
expect(inputElement.disabled).toBeFalsy();
done();
});
const inputElement = fixture.nativeElement.querySelector('input');
expect(inputElement.disabled).toBe(false);
});
it('should update mdValue.newValue properties when authority is present', () => {

26
src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
View File

@@ -18,7 +18,10 @@ import {
} from '@ngx-translate/core';
import { Observable } from 'rxjs';
import { APP_CONFIG } from '../../../../../config/app-config.interface';
import {
APP_CONFIG,
APP_DATA_SERVICES_MAP,
} from '../../../../../config/app-config.interface';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
@@ -42,15 +45,23 @@ import { UUIDService } from '../../../../core/shared/uuid.service';
import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
import { MetadataValuesComponent } from '../../../../item-page/field-components/metadata-values/metadata-values.component';
import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
import { ThemedMetadataRepresentationListComponent } from '../../../../item-page/simple/metadata-representation-list/themed-metadata-representation-list.component';
import { TabbedRelatedEntitiesSearchComponent } from '../../../../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { RelatedItemsComponent } from '../../../../item-page/simple/related-items/related-items-component';
import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
import { isNotEmpty } from '../../../../shared/empty.util';
import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service';
import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { ThemedResultsBackButtonComponent } from '../../../../shared/results-back-button/themed-results-back-button.component';
import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
import { JournalComponent } from './journal.component';
let comp: JournalComponent;
@@ -121,9 +132,22 @@ describe('JournalComponent', () => {
{ provide: RouteService, useValue: mockRouteService },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
{ provide: APP_CONFIG, useValue: {} },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
],
schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(JournalComponent, {
remove: {
imports: [
ThemedResultsBackButtonComponent,
ThemedItemPageTitleFieldComponent,
DsoEditMenuComponent,
MetadataFieldWrapperComponent,
ThemedThumbnailComponent,
RelatedItemsComponent,
TabbedRelatedEntitiesSearchComponent,
ThemedMetadataRepresentationListComponent,
],
},
add: { changeDetection: ChangeDetectionStrategy.Default },
})
.overrideComponent(GenericItemPageFieldComponent, {

10
src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts
View File

@@ -3,6 +3,7 @@ import {
fakeAsync,
TestBed,
tick,
waitForAsync,
} from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { NotifyRequestsStatusDataService } from 'src/app/core/data/notify-services-status-data.service';
@@ -10,6 +11,7 @@ import { NotifyRequestsStatusDataService } from 'src/app/core/data/notify-servic
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { NotifyRequestsStatus } from '../notify-requests-status.model';
import { RequestStatusEnum } from '../notify-status.enum';
import { RequestStatusAlertBoxComponent } from '../request-status-alert-box/request-status-alert-box.component';
import { NotifyRequestsStatusComponent } from './notify-requests-status.component';
describe('NotifyRequestsStatusComponent', () => {
@@ -22,7 +24,7 @@ describe('NotifyRequestsStatusComponent', () => {
itemuuid: 'testUuid',
});
beforeEach(() => {
beforeEach(waitForAsync(() => {
notifyInfoServiceSpy = {
getNotifyRequestsStatus:() => createSuccessfulRemoteDataObject$(mock),
};
@@ -31,8 +33,12 @@ describe('NotifyRequestsStatusComponent', () => {
providers: [
{ provide: NotifyRequestsStatusDataService, useValue: notifyInfoServiceSpy },
],
}).overrideComponent(NotifyRequestsStatusComponent, {
remove: {
imports: [RequestStatusAlertBoxComponent],
},
});
});
}));
beforeEach(() => {
fixture = TestBed.createComponent(NotifyRequestsStatusComponent);

24
src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
View File

@@ -1,10 +1,6 @@
<ng-container *ngIf="data?.length > 0 && displayOptions">
<div
[ngClass]="{'align-items-center': data.length === 1}"
class="alert d-flex flex-row sections-gap {{
displayOptions.alertType
}}"
>
<div [ngClass]="{'align-items-center': data.length === 1}"
class="alert d-flex flex-row sections-gap {{displayOptions.alertType}}">
<img
class="source-logo"
src="assets/images/qa-coar-notify-logo.png"
@@ -14,17 +10,11 @@
<ds-truncatable-part [id]="status" [minLines]="1">
<div class="w-100 d-flex flex-column">
<ng-container *ngFor="let request of data">
<div
[innerHTML]="
displayOptions.text
| translate
: {
serviceName: request.serviceName,
serviceUrl: request.serviceUrl,
offerType: request.offerType
}
"
></div>
<div [innerHTML]="displayOptions.text | translate: {
serviceName: request.serviceName,
serviceUrl: request.serviceUrl,
offerType: request.offerType
}"></div>
</ng-container>
</div>
</ds-truncatable-part>

13
src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts
View File

@@ -2,9 +2,12 @@ import {
ComponentFixture,
fakeAsync,
TestBed,
waitForAsync,
} from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
import { TruncatablePartComponent } from '../../../../shared/truncatable/truncatable-part/truncatable-part.component';
import { RequestStatusEnum } from '../notify-status.enum';
import { RequestStatusAlertBoxComponent } from './request-status-alert-box.component';
@@ -28,11 +31,15 @@ describe('RequestStatusAlertBoxComponent', () => {
},
];
beforeEach(async () => {
await TestBed.configureTestingModule({
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), RequestStatusAlertBoxComponent],
}).overrideComponent(RequestStatusAlertBoxComponent, {
remove: {
imports: [TruncatablePartComponent, TruncatableComponent],
},
}).compileComponents();
});
}));
beforeEach(() => {
fixture = TestBed.createComponent(RequestStatusAlertBoxComponent);

2
src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
View File

@@ -1,6 +1,7 @@
import {
NgClass,
NgForOf,
NgIf,
} from '@angular/common';
import {
ChangeDetectionStrategy,
@@ -22,6 +23,7 @@ import { RequestStatusEnum } from '../notify-status.enum';
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [
NgIf,
TruncatablePartComponent,
TruncatableComponent,
NgForOf,

8
src/app/process-page/overview/table/process-overview-table.component.spec.ts
View File

@@ -1,3 +1,4 @@
import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
ComponentFixture,
TestBed,
@@ -19,7 +20,9 @@ import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
import { EPerson } from '../../../core/eperson/models/eperson.model';
import { PaginationService } from '../../../core/pagination/pagination.service';
import { RouteService } from '../../../core/services/route.service';
import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock';
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
import { routeServiceStub } from '../../../shared/testing/route-service.stub';
@@ -143,6 +146,11 @@ describe('ProcessOverviewTableComponent', () => {
{ provide: AuthService, useValue: authService },
{ provide: RouteService, useValue: routeService },
],
schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(ProcessOverviewTableComponent, {
remove: {
imports: [ PaginationComponent, ThemedLoadingComponent ],
},
}).compileComponents();
}));

6
src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts
View File

@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
@@ -17,7 +17,7 @@ describe('NotificationsSuggestionTargetsPageComponent', () => {
let component: NotificationsSuggestionTargetsPageComponent;
let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
CommonModule,
@@ -32,7 +32,7 @@ describe('NotificationsSuggestionTargetsPageComponent', () => {
})
.overrideComponent(NotificationsSuggestionTargetsPageComponent, {
remove: {
providers: [PublicationClaimComponent],
imports: [PublicationClaimComponent],
},
})
.compileComponents();

2
src/app/search-page/configuration-search-page.component.spec.ts
View File

@@ -14,6 +14,7 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
import { configureSearchComponentTestingModule } from '../shared/search/search.component.spec';
import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
import createSpy = jasmine.createSpy;
import { of } from 'rxjs';
const CONFIGURATION = 'test-configuration';
const QUERY = 'test query';
@@ -52,6 +53,7 @@ describe('ConfigurationSearchPageComponent', () => {
routeService = TestBed.inject(RouteService);
routeService.setParameter = createSpy('setParameter');
routeService.getRouteParameterValue = createSpy('getRouteParameterValue').and.returnValue(of(CONFIGURATION));
fixture.detectChanges();

24
src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
View File

@@ -1,5 +1,8 @@
// eslint-disable-next-line max-classes-per-file
import { Component } from '@angular/core';
import {
Component,
NO_ERRORS_SCHEMA,
} from '@angular/core';
import {
ComponentFixture,
TestBed,
@@ -10,6 +13,7 @@ import { ActivatedRoute } from '@angular/router';
import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component';
import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
import { GenericConstructor } from '../../../../core/shared/generic-constructor';
import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
import { getMockThemeService } from '../../../mocks/theme-service.mock';
import { ActivatedRouteStub } from '../../../testing/active-router.stub';
@@ -24,6 +28,18 @@ import { ComcolBrowseByComponent } from './comcol-browse-by.component';
class BrowseByTestComponent {
}
@Component({
// eslint-disable-next-line @angular-eslint/component-selector
selector: 'ds-browse-by-switcher',
template: `<ng-template #DynamicComponentLoader dsDynamicComponentLoader></ng-template>`,
standalone: true,
imports: [DynamicComponentLoaderDirective],
})
class TestBrowseBySwitcherComponent extends BrowseBySwitcherComponent {
getComponent(): GenericConstructor<Component> {
return BrowseByTestComponent;
}
}
class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
getRenderType(): BrowseByDataType {
return 'ComcolBrowseByComponent' as BrowseByDataType;
@@ -42,17 +58,21 @@ describe('ComcolBrowseByComponent', () => {
themeService = getMockThemeService();
await TestBed.configureTestingModule({
imports: [BrowseBySwitcherComponent, ComcolBrowseByComponent, DynamicComponentLoaderDirective],
imports: [TestBrowseBySwitcherComponent, ComcolBrowseByComponent, DynamicComponentLoaderDirective],
providers: [
BrowseByTestComponent,
{ provide: ActivatedRoute, useValue: activatedRoute },
{ provide: ThemeService, useValue: themeService },
],
schemas: [NO_ERRORS_SCHEMA],
})
.overrideComponent(ComcolBrowseByComponent, {
remove: {
imports: [BrowseBySwitcherComponent],
},
add: {
imports: [TestBrowseBySwitcherComponent],
},
})
.compileComponents();

16
src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts
View File

@@ -1,21 +1,13 @@
import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component';
import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model';
import { Context } from '../../../../core/shared/context.model';
import { ViewMode } from '../../../../core/shared/view-mode.model';
import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator';
const type = 'TestType';
class TestTable {
}
describe('TabulatableObject decorator function', () => {
it('should have a decorator for table', () => {
const tableDecorator = getTabulatableObjectsComponent(['Item'], ViewMode.Table);
expect(tableDecorator.length).not.toBeNull();
});
it('should return the matching class', () => {
const component = getTabulatableObjectsComponent([type], ViewMode.Table, Context.Search);
expect(component).toEqual(TestTable);
const component = getTabulatableObjectsComponent([AdminNotifySearchResult], ViewMode.Table, Context.CoarNotify);
expect(component).toEqual(AdminNotifySearchResultComponent);
});
});

4
src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
View File

@@ -18,6 +18,7 @@ import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
import { TruncatableService } from '../../../../truncatable/truncatable.service';
import { TruncatePipe } from '../../../../utils/truncate.pipe';
import { ItemSearchResultGridElementComponent } from '../../../search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
import { ItemGridElementComponent } from './item-grid-element.component';
@@ -69,6 +70,9 @@ describe('ItemGridElementComponent', () => {
],
schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(ItemGridElementComponent, {
remove: {
imports: [ItemSearchResultGridElementComponent],
},
add: { changeDetection: ChangeDetectionStrategy.Default },
}).compileComponents();
}));

16
src/app/shared/testing/test-data-service.mock.ts Normal file
View File

@@ -0,0 +1,16 @@
import { Injectable } from '@angular/core';
import { of } from 'rxjs';
import { FindListOptions } from '../../core/data/find-list-options.model';
import { FollowLinkConfig } from '../utils/follow-link-config.model';
@Injectable()
export class TestDataService {
findListByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
return of('findListByHref');
}
findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
return of('findByHref');
}
}