66155: Fixed test cases and AoT build

This commit is contained in:
Kristof De Langhe
2019-12-09 15:25:43 +01:00
parent 9e5508f9e5
commit c31b1725a8
3 changed files with 35 additions and 35 deletions

View File

@@ -28,6 +28,7 @@ import { MetadataValuesComponent } from './field-components/metadata-values/meta
import { MetadataFieldWrapperComponent } from './field-components/metadata-field-wrapper/metadata-field-wrapper.component'; import { MetadataFieldWrapperComponent } from './field-components/metadata-field-wrapper/metadata-field-wrapper.component';
import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { StatisticsModule } from '../statistics/statistics.module'; import { StatisticsModule } from '../statistics/statistics.module';
import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
@NgModule({ @NgModule({
imports: [ imports: [
@@ -57,7 +58,8 @@ import { StatisticsModule } from '../statistics/statistics.module';
GenericItemPageFieldComponent, GenericItemPageFieldComponent,
MetadataRepresentationListComponent, MetadataRepresentationListComponent,
RelatedEntitiesSearchComponent, RelatedEntitiesSearchComponent,
TabbedRelatedEntitiesSearchComponent TabbedRelatedEntitiesSearchComponent,
AbstractIncrementalListComponent
], ],
exports: [ exports: [
ItemComponent, ItemComponent,

View File

@@ -8,6 +8,7 @@ import { Relationship } from '../../../core/shared/item-relationships/relationsh
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { VarDirective } from '../../../shared/utils/var.directive'; import { VarDirective } from '../../../shared/utils/var.directive';
import { of as observableOf } from 'rxjs';
const itemType = 'Person'; const itemType = 'Person';
const metadataField = 'dc.contributor.author'; const metadataField = 'dc.contributor.author';
@@ -89,37 +90,29 @@ describe('MetadataRepresentationListComponent', () => {
expect(fields.length).toBe(2); expect(fields.length).toBe(2);
}); });
it('should initialize the original limit', () => { it('should contain one page of items', () => {
expect(comp.originalLimit).toEqual(comp.limit); expect(comp.objects.length).toEqual(1);
}); });
describe('when viewMore is called', () => { describe('when increase is called', () => {
let originalLimit;
beforeEach(() => { beforeEach(() => {
// Store the original value of limit comp.increase();
originalLimit = comp.limit;
comp.viewMore();
}); });
it('should increment the limit with incrementBy', () => { it('should add a new page to the list', () => {
expect(comp.limit).toEqual(originalLimit + comp.incrementBy); expect(comp.objects.length).toEqual(2);
}); });
}); });
describe('when viewLess is called', () => { describe('when decrease is called', () => {
let originalLimit;
beforeEach(() => { beforeEach(() => {
// Store the original value of limit // Add a second page
originalLimit = comp.limit; comp.objects.push(observableOf(undefined));
// Increase limit with incrementBy comp.decrease();
comp.limit = originalLimit + comp.incrementBy;
comp.viewLess();
}); });
it('should reset the limit to the original value', () => { it('should decrease the list of pages', () => {
expect(comp.limit).toEqual(originalLimit); expect(comp.objects.length).toEqual(1);
}); });
}); });

View File

@@ -10,6 +10,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils
import { RelationshipService } from '../../../core/data/relationship.service'; import { RelationshipService } from '../../../core/data/relationship.service';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { VarDirective } from '../../../shared/utils/var.directive'; import { VarDirective } from '../../../shared/utils/var.directive';
import { of as observableOf } from 'rxjs';
const parentItem: Item = Object.assign(new Item(), { const parentItem: Item = Object.assign(new Item(), {
bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])), bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
@@ -66,29 +67,33 @@ describe('RelatedItemsComponent', () => {
expect(fields.length).toBe(mockItems.length); expect(fields.length).toBe(mockItems.length);
}); });
describe('when viewMore is called', () => { it('should contain one page of items', () => {
expect(comp.objects.length).toEqual(1);
});
describe('when increase is called', () => {
beforeEach(() => { beforeEach(() => {
comp.viewMore(); comp.increase();
}); });
it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments', () => { it('should add a new page to the list', () => {
expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, { elementsPerPage: comp.limit + comp.incrementBy })); expect(comp.objects.length).toEqual(2);
});
it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments (second page)', () => {
expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, { elementsPerPage: comp.incrementBy, currentPage: 2 }));
}); });
}); });
describe('when viewLess is called', () => { describe('when decrease is called', () => {
let originalLimit;
beforeEach(() => { beforeEach(() => {
// Store the original value of limit // Add a second page
originalLimit = comp.limit; comp.objects.push(observableOf(undefined));
// Increase limit with incrementBy comp.decrease();
comp.limit = originalLimit + comp.incrementBy;
comp.viewLess();
}); });
it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments', () => { it('should decrease the list of pages', () => {
expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, { elementsPerPage: originalLimit })); expect(comp.objects.length).toEqual(1);
}); });
}); });