mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 10:34:15 +00:00
46063: truncation finished, still have to fix some existing tests
This commit is contained in:
@@ -2,7 +2,7 @@ import { animate, state, transition, trigger, style } from '@angular/animations'
|
|||||||
|
|
||||||
export const focusShadow = trigger('focusShadow', [
|
export const focusShadow = trigger('focusShadow', [
|
||||||
|
|
||||||
state('focus', style({ 'box-shadow': '0 0 6px #777777' })),
|
state('focus', style({ 'box-shadow': 'rgba(119, 119, 119, 0.6) 0px 0px 6px' })),
|
||||||
|
|
||||||
state('blur', style({ 'box-shadow': 'none' })),
|
state('blur', style({ 'box-shadow': 'none' })),
|
||||||
|
|
||||||
|
@@ -8,6 +8,7 @@ import { By } from '@angular/platform-browser';
|
|||||||
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
import { Community } from '../../../../core/shared/community.model';
|
import { Community } from '../../../../core/shared/community.model';
|
||||||
import { Collection } from '../../../../core/shared/collection.model';
|
import { Collection } from '../../../../core/shared/collection.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
let fixture: ComponentFixture<CollectionSearchResultGridElementComponent>;
|
let fixture: ComponentFixture<CollectionSearchResultGridElementComponent>;
|
||||||
const queryParam = 'test query';
|
const queryParam = 'test query';
|
||||||
@@ -18,6 +19,10 @@ const activatedRouteStub = {
|
|||||||
scope: scopeParam
|
scope: scopeParam
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
const mockCollection: Collection = Object.assign(new Collection(), {
|
const mockCollection: Collection = Object.assign(new Collection(), {
|
||||||
metadata: [
|
metadata: [
|
||||||
{
|
{
|
||||||
@@ -27,14 +32,14 @@ const mockCollection: Collection = Object.assign(new Collection(), {
|
|||||||
}]
|
}]
|
||||||
|
|
||||||
});
|
});
|
||||||
|
const createdGridElementComponent: CollectionSearchResultGridElementComponent = new CollectionSearchResultGridElementComponent(mockCollection, truncatableServiceStub as TruncatableService);
|
||||||
const createdGridElementComponent: CollectionSearchResultGridElementComponent = new CollectionSearchResultGridElementComponent(mockCollection);
|
|
||||||
|
|
||||||
describe('CollectionSearchResultGridElementComponent', () => {
|
describe('CollectionSearchResultGridElementComponent', () => {
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [CollectionSearchResultGridElementComponent, TruncatePipe],
|
declarations: [CollectionSearchResultGridElementComponent, TruncatePipe],
|
||||||
providers: [
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
{ provide: Router, useClass: RouterStub },
|
{ provide: Router, useClass: RouterStub },
|
||||||
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
||||||
|
@@ -7,6 +7,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
import { Community } from '../../../../core/shared/community.model';
|
import { Community } from '../../../../core/shared/community.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
|
|
||||||
let fixture: ComponentFixture<CommunitySearchResultGridElementComponent>;
|
let fixture: ComponentFixture<CommunitySearchResultGridElementComponent>;
|
||||||
const queryParam = 'test query';
|
const queryParam = 'test query';
|
||||||
@@ -17,6 +19,10 @@ const activatedRouteStub = {
|
|||||||
scope: scopeParam
|
scope: scopeParam
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
const mockCommunity: Community = Object.assign(new Community(), {
|
const mockCommunity: Community = Object.assign(new Community(), {
|
||||||
metadata: [
|
metadata: [
|
||||||
{
|
{
|
||||||
@@ -27,13 +33,14 @@ const mockCommunity: Community = Object.assign(new Community(), {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const createdGridElementComponent: CommunitySearchResultGridElementComponent = new CommunitySearchResultGridElementComponent(mockCommunity);
|
const createdGridElementComponent: CommunitySearchResultGridElementComponent = new CommunitySearchResultGridElementComponent(mockCommunity, truncatableServiceStub as TruncatableService);
|
||||||
|
|
||||||
describe('CommunitySearchResultGridElementComponent', () => {
|
describe('CommunitySearchResultGridElementComponent', () => {
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ CommunitySearchResultGridElementComponent, TruncatePipe ],
|
declarations: [ CommunitySearchResultGridElementComponent, TruncatePipe ],
|
||||||
providers: [
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
{ provide: Router, useClass: RouterStub },
|
{ provide: Router, useClass: RouterStub },
|
||||||
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
||||||
|
@@ -7,21 +7,23 @@
|
|||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
<ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="3" type="h4">
|
||||||
<h4 class="card-title" [innerHTML]="dso.findMetadata('dc.title')"></h4>
|
<h4 class="card-title" [innerHTML]="dso.findMetadata('dc.title')"></h4>
|
||||||
|
</ds-truncatable-part>
|
||||||
<p *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
|
<p *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
|
||||||
class="item-authors card-text text-muted">
|
class="item-authors card-text text-muted">
|
||||||
<ds-truncatable-part [id]="dso.id" [minLines]="1">
|
<ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="1">
|
||||||
<span *ngIf="dso.findMetadata('dc.date.issued')" class="item-list-date">{{dso.findMetadata("dc.date.issued")}}</span>
|
<span *ngIf="dso.findMetadata('dc.date.issued')" class="item-list-date">{{dso.findMetadata("dc.date.issued")}}</span>
|
||||||
<span *ngFor="let authorMd of dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
|
<span *ngFor="let authorMd of dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
|
||||||
<span [innerHTML]="authorMd.value"></span>
|
<span [innerHTML]="authorMd.value"></span>
|
||||||
</span>
|
</span>
|
||||||
</ds-truncatable-part>
|
</ds-truncatable-part>
|
||||||
</p>
|
</p>
|
||||||
<ds-truncatable-part [id]="dso.id" [minLines]="3">
|
<p class="item-abstract card-text">
|
||||||
<p class="item-abstract card-text"
|
<ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="3">
|
||||||
[innerHTML]="getFirstValue('dc.description.abstract')">
|
<span [innerHTML]="getFirstValue('dc.description.abstract')"></span>
|
||||||
</p>
|
|
||||||
</ds-truncatable-part>
|
</ds-truncatable-part>
|
||||||
|
</p>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<a [routerLink]="['/items/' + dso.id]"
|
<a [routerLink]="['/items/' + dso.id]"
|
||||||
class="lead btn btn-primary viewButton">View</a>
|
class="lead btn btn-primary viewButton">View</a>
|
||||||
|
@@ -7,6 +7,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
import { Item } from '../../../../core/shared/item.model';
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
let itemSearchResultGridElementComponent: ItemSearchResultGridElementComponent;
|
let itemSearchResultGridElementComponent: ItemSearchResultGridElementComponent;
|
||||||
let fixture: ComponentFixture<ItemSearchResultGridElementComponent>;
|
let fixture: ComponentFixture<ItemSearchResultGridElementComponent>;
|
||||||
@@ -18,6 +19,11 @@ const activatedRouteStub = {
|
|||||||
scope: scopeParam
|
scope: scopeParam
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
const mockItem: Item = Object.assign(new Item(), {
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
metadata: [
|
metadata: [
|
||||||
{
|
{
|
||||||
@@ -31,13 +37,14 @@ const mockItem: Item = Object.assign(new Item(), {
|
|||||||
value: '1650-06-26'
|
value: '1650-06-26'
|
||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
const createdGridElementComponent:ItemSearchResultGridElementComponent= new ItemSearchResultGridElementComponent(mockItem);
|
const createdGridElementComponent: ItemSearchResultGridElementComponent = new ItemSearchResultGridElementComponent(mockItem, truncatableServiceStub as TruncatableService);
|
||||||
|
|
||||||
describe('ItemSearchResultGridElementComponent', () => {
|
describe('ItemSearchResultGridElementComponent', () => {
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ItemSearchResultGridElementComponent, TruncatePipe],
|
declarations: [ItemSearchResultGridElementComponent, TruncatePipe],
|
||||||
providers: [
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
{ provide: Router, useClass: RouterStub },
|
{ provide: Router, useClass: RouterStub },
|
||||||
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
{ provide: 'objectElementProvider', useValue: (createdGridElementComponent) }
|
||||||
@@ -50,7 +57,6 @@ describe('ItemSearchResultGridElementComponent', () => {
|
|||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
fixture = TestBed.createComponent(ItemSearchResultGridElementComponent);
|
fixture = TestBed.createComponent(ItemSearchResultGridElementComponent);
|
||||||
itemSearchResultGridElementComponent = fixture.componentInstance;
|
itemSearchResultGridElementComponent = fixture.componentInstance;
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should show the item result cards in the grid element', () => {
|
it('should show the item result cards in the grid element', () => {
|
||||||
|
@@ -0,0 +1,59 @@
|
|||||||
|
import { CollectionListElementComponent } from './collection-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../testing/router-stub';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { Collection } from '../../../core/shared/collection.model';
|
||||||
|
let fixture: ComponentFixture<CollectionListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
const mockCollection: Collection = Object.assign(new Collection(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.description.abstract',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Short description'
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
const createdListElementComponent:CollectionListElementComponent= new CollectionListElementComponent(mockCollection);
|
||||||
|
|
||||||
|
describe('CollectionListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ CollectionListElementComponent ],
|
||||||
|
providers: [
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: (createdListElementComponent)}
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [ NO_ERRORS_SCHEMA ]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(CollectionListElementComponent);
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the collection cards in the list element',() => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-collection-list-element'))).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the description if "short description" metadata is present',() => {
|
||||||
|
const descriptionText = expect(fixture.debugElement.query(By.css('p.card-text')));
|
||||||
|
|
||||||
|
if (mockCollection.shortDescription.length > 0) {
|
||||||
|
expect(descriptionText).toBeDefined();
|
||||||
|
}else {
|
||||||
|
expect(descriptionText).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
@@ -0,0 +1,65 @@
|
|||||||
|
import { CommunityListElementComponent } from './community-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../testing/router-stub';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { Community } from '../../../core/shared/community.model';
|
||||||
|
|
||||||
|
let communityListElementComponent: CommunityListElementComponent;
|
||||||
|
let fixture: ComponentFixture<CommunityListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockCommunity: Community = Object.assign(new Community(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.description.abstract',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Short description'
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
|
||||||
|
const createdListElementComponent:CommunityListElementComponent= new CommunityListElementComponent(mockCommunity);
|
||||||
|
|
||||||
|
describe('CommunityListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ CommunityListElementComponent ],
|
||||||
|
providers: [
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: (createdListElementComponent)}
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [ NO_ERRORS_SCHEMA ]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(CommunityListElementComponent);
|
||||||
|
communityListElementComponent = fixture.componentInstance;
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the community cards in the list element',() => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-community-list-element'))).toBeDefined();
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should only show the description if "short description" metadata is present',() => {
|
||||||
|
const descriptionText = expect(fixture.debugElement.query(By.css('p.card-text')));
|
||||||
|
|
||||||
|
if (mockCommunity.shortDescription.length > 0) {
|
||||||
|
expect(descriptionText).toBeDefined();
|
||||||
|
}else {
|
||||||
|
expect(descriptionText).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
@@ -0,0 +1,67 @@
|
|||||||
|
import { ItemListElementComponent } from './item-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../testing/router-stub';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TruncatePipe } from '../../utils/truncate.pipe';
|
||||||
|
import { Item } from '../../../core/shared/item.model';
|
||||||
|
|
||||||
|
let itemListElementComponent: ItemListElementComponent;
|
||||||
|
let fixture: ComponentFixture<ItemListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
/* tslint:disable:no-shadowed-variable */
|
||||||
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.contributor.author',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Smith, Donald'
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
|
||||||
|
const createdListElementComponent:ItemListElementComponent= new ItemListElementComponent(mockItem);
|
||||||
|
|
||||||
|
describe('ItemListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ItemListElementComponent , TruncatePipe],
|
||||||
|
providers: [
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: {createdListElementComponent}}
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [ NO_ERRORS_SCHEMA ]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(ItemListElementComponent);
|
||||||
|
itemListElementComponent = fixture.componentInstance;
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the item cards in the list element',() => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-item-list-element'))).toBeDefined()
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the author span if the author metadata is present',() => {
|
||||||
|
const itemAuthorField = expect(fixture.debugElement.query(By.css('p.item-authors')));
|
||||||
|
|
||||||
|
if (mockItem.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
|
||||||
|
expect(itemAuthorField).toBeDefined();
|
||||||
|
}else {
|
||||||
|
expect(itemAuthorField).toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
})
|
@@ -11,7 +11,7 @@
|
|||||||
(sortFieldChange)="onSortFieldChange($event)"
|
(sortFieldChange)="onSortFieldChange($event)"
|
||||||
(paginationChange)="onPaginationChange($event)">
|
(paginationChange)="onPaginationChange($event)">
|
||||||
<ul *ngIf="objects?.hasSucceeded" class="list-unstyled">
|
<ul *ngIf="objects?.hasSucceeded" class="list-unstyled">
|
||||||
<li *ngFor="let object of objects?.payload?.page" class="mt-2 mb-2">
|
<li *ngFor="let object of objects?.payload?.page" class="mt-4 mb-4">
|
||||||
<ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
|
<ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@@ -0,0 +1,68 @@
|
|||||||
|
import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../../testing/router-stub';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
|
import { Collection } from '../../../../core/shared/collection.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
|
let fixture: ComponentFixture<CollectionSearchResultListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockCollection: Collection = Object.assign(new Collection(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.description.abstract',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Short description'
|
||||||
|
}]
|
||||||
|
|
||||||
|
});
|
||||||
|
const createdListElementComponent: CollectionSearchResultListElementComponent = new CollectionSearchResultListElementComponent(mockCollection, truncatableServiceStub as TruncatableService);
|
||||||
|
|
||||||
|
describe('CollectionSearchResultListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [CollectionSearchResultListElementComponent, TruncatePipe],
|
||||||
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: (createdListElementComponent) }
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(CollectionSearchResultListElementComponent);
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the item result cards in the list element', () => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-collection-search-result-list-element'))).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the description if "short description" metadata is present', () => {
|
||||||
|
const descriptionText = expect(fixture.debugElement.query(By.css('p.card-text')));
|
||||||
|
|
||||||
|
if (mockCollection.shortDescription.length > 0) {
|
||||||
|
expect(descriptionText).toBeDefined();
|
||||||
|
} else {
|
||||||
|
expect(descriptionText).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
@@ -0,0 +1,69 @@
|
|||||||
|
import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../../testing/router-stub';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
|
import { Community } from '../../../../core/shared/community.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
|
let fixture: ComponentFixture<CommunitySearchResultListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockCommunity: Community = Object.assign(new Community(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.description.abstract',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Short description'
|
||||||
|
} ]
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
const createdListElementComponent: CommunitySearchResultListElementComponent = new CommunitySearchResultListElementComponent(mockCommunity, truncatableServiceStub as TruncatableService);
|
||||||
|
|
||||||
|
describe('CommunitySearchResultListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ CommunitySearchResultListElementComponent, TruncatePipe ],
|
||||||
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: (createdListElementComponent) }
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [ NO_ERRORS_SCHEMA ]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(CommunitySearchResultListElementComponent);
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the item result cards in the list element', () => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-community-search-result-list-element'))).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the description if "short description" metadata is present',() => {
|
||||||
|
const descriptionText = expect(fixture.debugElement.query(By.css('p.card-text')));
|
||||||
|
|
||||||
|
if (mockCommunity.shortDescription.length > 0) {
|
||||||
|
expect(descriptionText).toBeDefined();
|
||||||
|
}else {
|
||||||
|
expect(descriptionText).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
@@ -1,9 +1,7 @@
|
|||||||
<ds-truncatable [id]="dso.id">
|
<ds-truncatable [id]="dso.id">
|
||||||
<div [@focusBackground]="(isCollapsed() | async)?'blur':'focus'">
|
|
||||||
<a
|
<a
|
||||||
[routerLink]="['/items/' + dso.id]" class="lead"
|
[routerLink]="['/items/' + dso.id]" class="lead"
|
||||||
[innerHTML]="getFirstValue('dc.title')"></a>
|
[innerHTML]="getFirstValue('dc.title')"></a>
|
||||||
<div>
|
|
||||||
<span class="text-muted">
|
<span class="text-muted">
|
||||||
<ds-truncatable-part [id]="dso.id" [minLines]="1">
|
<ds-truncatable-part [id]="dso.id" [minLines]="1">
|
||||||
(<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher"
|
(<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher"
|
||||||
@@ -23,6 +21,4 @@
|
|||||||
[innerHTML]="getFirstValue('dc.description.abstract')"></span>
|
[innerHTML]="getFirstValue('dc.description.abstract')"></span>
|
||||||
</ds-truncatable-part>
|
</ds-truncatable-part>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ds-truncatable>
|
</ds-truncatable>
|
@@ -0,0 +1,86 @@
|
|||||||
|
import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { RouterStub } from '../../../testing/router-stub';
|
||||||
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TruncatePipe } from '../../../utils/truncate.pipe';
|
||||||
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
|
import { TruncatableService } from '../../../truncatable/truncatable.service';
|
||||||
|
|
||||||
|
let itemSearchResultListElementComponent: ItemSearchResultListElementComponent;
|
||||||
|
let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
|
||||||
|
const queryParam = 'test query';
|
||||||
|
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
|
||||||
|
const activatedRouteStub = {
|
||||||
|
queryParams: Observable.of({
|
||||||
|
query: queryParam,
|
||||||
|
scope: scopeParam
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: number) => Observable.of(true),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
|
metadata: [
|
||||||
|
{
|
||||||
|
key: 'dc.contributor.author',
|
||||||
|
language: 'en_US',
|
||||||
|
value: 'Smith, Donald'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'dc.date.issued',
|
||||||
|
language: null,
|
||||||
|
value: '1650-06-26'
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
const createdListElementComponent: ItemSearchResultListElementComponent = new ItemSearchResultListElementComponent(mockItem, truncatableServiceStub as TruncatableService);
|
||||||
|
|
||||||
|
describe('ItemSearchResultListElementComponent', () => {
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ItemSearchResultListElementComponent, TruncatePipe],
|
||||||
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
|
{ provide: ActivatedRoute, useValue: activatedRouteStub },
|
||||||
|
{ provide: Router, useClass: RouterStub },
|
||||||
|
{ provide: 'objectElementProvider', useValue: (createdListElementComponent) }
|
||||||
|
],
|
||||||
|
|
||||||
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
|
}).compileComponents(); // compile template and css
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
|
||||||
|
itemSearchResultListElementComponent = fixture.componentInstance;
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should show the item result cards in the list element', () => {
|
||||||
|
expect(fixture.debugElement.query(By.css('ds-item-search-result-list-element'))).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the author span if the author metadata is present', () => {
|
||||||
|
const itemAuthorField = expect(fixture.debugElement.query(By.css('p.item-authors')));
|
||||||
|
|
||||||
|
if (mockItem.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
|
||||||
|
expect(itemAuthorField).toBeDefined();
|
||||||
|
} else {
|
||||||
|
expect(itemAuthorField).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only show the date span if the issuedate is present', () => {
|
||||||
|
const dateField = expect(fixture.debugElement.query(By.css('span.item-list-date')));
|
||||||
|
|
||||||
|
if (mockItem.findMetadata('dc.date.issued').length > 0) {
|
||||||
|
expect(dateField).toBeDefined();
|
||||||
|
} else {
|
||||||
|
expect(dateField).not.toBeDefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
@@ -1,3 +1,5 @@
|
|||||||
<div class="clamp-{{lines}} {{type}}">
|
<div class="clamp-{{lines}} {{type}} {{fixedHeight ? 'fixedHeight' : ''}}">
|
||||||
|
<div class="content">
|
||||||
<ng-content></ng-content>
|
<ng-content></ng-content>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
@@ -3,6 +3,10 @@
|
|||||||
|
|
||||||
@mixin clamp($lines, $size-factor: 1, $line-height: $line-height-base) {
|
@mixin clamp($lines, $size-factor: 1, $line-height: $line-height-base) {
|
||||||
$height: $line-height * $font-size-base * $size-factor;
|
$height: $line-height * $font-size-base * $size-factor;
|
||||||
|
&.fixedHeight {
|
||||||
|
height: $lines * $height;
|
||||||
|
}
|
||||||
|
.content {
|
||||||
max-height: $lines * $height;
|
max-height: $lines * $height;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -18,7 +22,8 @@
|
|||||||
min-width: 75px;
|
min-width: 75px;
|
||||||
max-width: 150px;
|
max-width: 150px;
|
||||||
height: $height;
|
height: $height;
|
||||||
background: linear-gradient(to right, rgba(255, 255, 255, 0), $body-bg 50%);
|
background: linear-gradient(to right, rgba(255, 255, 255, 0), $body-bg 70%);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -26,15 +31,18 @@
|
|||||||
$h4-factor: strip-unit($h4-font-size);
|
$h4-factor: strip-unit($h4-font-size);
|
||||||
@for $i from 1 through 15 {
|
@for $i from 1 through 15 {
|
||||||
.clamp-#{$i} {
|
.clamp-#{$i} {
|
||||||
|
transition: height 1s;
|
||||||
@include clamp($i);
|
@include clamp($i);
|
||||||
&.title {
|
&.title {
|
||||||
@include clamp($i, 1.25);
|
@include clamp($i, 1.25);
|
||||||
}
|
}
|
||||||
&.h4 {
|
&.h4 {
|
||||||
@include clamp($i, $h4-factor, $headings-line-height);
|
@include clamp($i, $h4-factor, $headings-line-height);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.clamp-none {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
@@ -0,0 +1,76 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { TruncatablePartComponent } from './truncatable-part.component';
|
||||||
|
import { TruncatableService } from '../truncatable.service';
|
||||||
|
import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
|
||||||
|
describe('TruncatablePartComponent', () => {
|
||||||
|
let comp: TruncatablePartComponent;
|
||||||
|
let fixture: ComponentFixture<TruncatablePartComponent>;
|
||||||
|
const id1 = '123';
|
||||||
|
const id2 = '456';
|
||||||
|
|
||||||
|
let truncatableService;
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: string) => {
|
||||||
|
if (id === id1) {
|
||||||
|
return Observable.of(true)
|
||||||
|
} else {
|
||||||
|
return Observable.of(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
imports: [NoopAnimationsModule],
|
||||||
|
declarations: [TruncatablePartComponent],
|
||||||
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
|
],
|
||||||
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
|
}).overrideComponent(TruncatablePartComponent, {
|
||||||
|
set: { changeDetection: ChangeDetectionStrategy.Default }
|
||||||
|
}).compileComponents();
|
||||||
|
}));
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(TruncatablePartComponent);
|
||||||
|
comp = fixture.componentInstance; // TruncatablePartComponent test instance
|
||||||
|
fixture.detectChanges();
|
||||||
|
truncatableService = (comp as any).filterService;
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('When the item is collapsed', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
comp.id = id1;
|
||||||
|
comp.minLines = 5;
|
||||||
|
(comp as any).setLines();
|
||||||
|
fixture.detectChanges();
|
||||||
|
})
|
||||||
|
;
|
||||||
|
|
||||||
|
it('lines should equal minlines', () => {
|
||||||
|
expect((comp as any).lines).toEqual(comp.minLines.toString());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('When the item is expanded', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
comp.id = id2;
|
||||||
|
})
|
||||||
|
;
|
||||||
|
|
||||||
|
it('lines should equal maxlines when maxlines has a value', () => {
|
||||||
|
comp.maxLines = 5;
|
||||||
|
(comp as any).setLines();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect((comp as any).lines).toEqual(comp.maxLines.toString());
|
||||||
|
});
|
||||||
|
|
||||||
|
it('lines should equal \'none\' when maxlines has no value', () => {
|
||||||
|
(comp as any).setLines();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect((comp as any).lines).toEqual('none');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
@@ -1,21 +1,21 @@
|
|||||||
import {
|
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
|
||||||
Component, Input, OnDestroy, OnInit, ElementRef, ViewChild
|
|
||||||
} from '@angular/core';
|
|
||||||
import { TruncatableService } from '../truncatable.service';
|
import { TruncatableService } from '../truncatable.service';
|
||||||
|
import { cardExpand } from '../../animations/card-expand';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-truncatable-part',
|
selector: 'ds-truncatable-part',
|
||||||
templateUrl: './truncatable-part.component.html',
|
templateUrl: './truncatable-part.component.html',
|
||||||
styleUrls: ['./truncatable-part.component.scss']
|
styleUrls: ['./truncatable-part.component.scss'],
|
||||||
|
animations: [cardExpand]
|
||||||
})
|
})
|
||||||
|
|
||||||
export class TruncatablePartComponent implements OnInit, OnDestroy {
|
export class TruncatablePartComponent implements OnInit, OnDestroy {
|
||||||
@Input() minLines: number;
|
@Input() minLines: number;
|
||||||
@Input() maxLines = -1;
|
@Input() maxLines = -1;
|
||||||
@Input() initialExpand = false;
|
|
||||||
@Input() id: string;
|
@Input() id: string;
|
||||||
@Input() type: string;
|
@Input() type: string;
|
||||||
private lines: string;
|
@Input() fixedHeight = false;
|
||||||
|
lines: string;
|
||||||
private sub;
|
private sub;
|
||||||
|
|
||||||
public constructor(private service: TruncatableService) {
|
public constructor(private service: TruncatableService) {
|
||||||
@@ -38,5 +38,4 @@ export class TruncatablePartComponent implements OnInit, OnDestroy {
|
|||||||
ngOnDestroy(): void {
|
ngOnDestroy(): void {
|
||||||
this.sub.unsubscribe();
|
this.sub.unsubscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
99
src/app/shared/truncatable/truncatable.component.spec.ts
Normal file
99
src/app/shared/truncatable/truncatable.component.spec.ts
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { TruncatableComponent } from './truncatable.component';
|
||||||
|
import { TruncatableService } from './truncatable.service';
|
||||||
|
import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
|
||||||
|
describe('TruncatableComponent', () => {
|
||||||
|
let comp: TruncatableComponent;
|
||||||
|
let fixture: ComponentFixture<TruncatableComponent>;
|
||||||
|
const identifier = '1234567890';
|
||||||
|
let truncatableService;
|
||||||
|
const truncatableServiceStub: any = {
|
||||||
|
isCollapsed: (id: string) => {
|
||||||
|
if (id === '1') {
|
||||||
|
return Observable.of(true)
|
||||||
|
} else {
|
||||||
|
return Observable.of(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
expand: (id: string) => {
|
||||||
|
},
|
||||||
|
collapse: (id: string) => {
|
||||||
|
},
|
||||||
|
toggle: (id: string) => {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
imports: [NoopAnimationsModule],
|
||||||
|
declarations: [TruncatableComponent],
|
||||||
|
providers: [
|
||||||
|
{ provide: TruncatableService, useValue: truncatableServiceStub },
|
||||||
|
],
|
||||||
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
|
}).overrideComponent(TruncatableComponent, {
|
||||||
|
set: { changeDetection: ChangeDetectionStrategy.Default }
|
||||||
|
}).compileComponents();
|
||||||
|
}));
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(TruncatableComponent);
|
||||||
|
comp = fixture.componentInstance; // TruncatableComponent test instance
|
||||||
|
comp.id = identifier;
|
||||||
|
fixture.detectChanges();
|
||||||
|
truncatableService = (comp as any).service;
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('When the item is hoverable', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
comp.onHover = true;
|
||||||
|
fixture.detectChanges();
|
||||||
|
})
|
||||||
|
;
|
||||||
|
|
||||||
|
it('should call collapse on the TruncatableService', () => {
|
||||||
|
spyOn(truncatableService, 'collapse');
|
||||||
|
comp.hoverCollapse();
|
||||||
|
expect(truncatableService.collapse).toHaveBeenCalledWith(identifier);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should call expand on the TruncatableService', () => {
|
||||||
|
spyOn(truncatableService, 'expand');
|
||||||
|
comp.hoverExpand();
|
||||||
|
expect(truncatableService.expand).toHaveBeenCalledWith(identifier);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('When the item is not hoverable', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
comp.onHover = false;
|
||||||
|
fixture.detectChanges();
|
||||||
|
})
|
||||||
|
;
|
||||||
|
|
||||||
|
it('should not call collapse on the TruncatableService', () => {
|
||||||
|
spyOn(truncatableService, 'collapse');
|
||||||
|
comp.hoverCollapse();
|
||||||
|
expect(truncatableService.collapse).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not call expand on the TruncatableService', () => {
|
||||||
|
spyOn(truncatableService, 'expand');
|
||||||
|
comp.hoverExpand();
|
||||||
|
expect(truncatableService.expand).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('When toggle is called', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
spyOn(truncatableService, 'toggle');
|
||||||
|
comp.toggle();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should call toggle on the TruncatableService', () => {
|
||||||
|
expect(truncatableService.toggle).toHaveBeenCalledWith(identifier);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
@@ -2,11 +2,14 @@ import {
|
|||||||
Component, Input
|
Component, Input
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { TruncatableService } from './truncatable.service';
|
import { TruncatableService } from './truncatable.service';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { cardExpand } from '../animations/card-expand';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-truncatable',
|
selector: 'ds-truncatable',
|
||||||
templateUrl: './truncatable.component.html',
|
templateUrl: './truncatable.component.html',
|
||||||
styleUrls: ['./truncatable.component.scss']
|
styleUrls: ['./truncatable.component.scss'],
|
||||||
|
|
||||||
})
|
})
|
||||||
export class TruncatableComponent {
|
export class TruncatableComponent {
|
||||||
@Input() initialExpand = false;
|
@Input() initialExpand = false;
|
||||||
@@ -39,4 +42,5 @@ export class TruncatableComponent {
|
|||||||
public toggle() {
|
public toggle() {
|
||||||
this.service.toggle(this.id);
|
this.service.toggle(this.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
96
src/app/shared/truncatable/truncatable.reducer.spec.ts
Normal file
96
src/app/shared/truncatable/truncatable.reducer.spec.ts
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
import * as deepFreeze from 'deep-freeze';
|
||||||
|
|
||||||
|
import { truncatableReducer } from './truncatable.reducer';
|
||||||
|
import {
|
||||||
|
TruncatableCollapseAction, TruncatableExpandAction,
|
||||||
|
TruncatableToggleAction
|
||||||
|
} from './truncatable.actions';
|
||||||
|
|
||||||
|
const id1 = '123';
|
||||||
|
const id2 = '456';
|
||||||
|
class NullAction extends TruncatableCollapseAction {
|
||||||
|
type = null;
|
||||||
|
constructor() {
|
||||||
|
super(undefined);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('truncatableReducer', () => {
|
||||||
|
|
||||||
|
it('should return the current state when no valid actions have been made', () => {
|
||||||
|
const state = { 123: { collapsed: true, page: 1 } };
|
||||||
|
const action = new NullAction();
|
||||||
|
const newState = truncatableReducer(state, action);
|
||||||
|
|
||||||
|
expect(newState).toEqual(state);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should start with an empty object', () => {
|
||||||
|
const state = Object.create({});
|
||||||
|
const action = new NullAction();
|
||||||
|
const initialState = truncatableReducer(undefined, action);
|
||||||
|
|
||||||
|
// The search filter starts collapsed
|
||||||
|
expect(initialState).toEqual(state);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set collapsed to true in response to the COLLAPSE action', () => {
|
||||||
|
const state = {};
|
||||||
|
state[id1] = { collapsed: false};
|
||||||
|
const action = new TruncatableCollapseAction(id1);
|
||||||
|
const newState = truncatableReducer(state, action);
|
||||||
|
|
||||||
|
expect(newState[id1].collapsed).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should perform the COLLAPSE action without affecting the previous state', () => {
|
||||||
|
const state = {};
|
||||||
|
state[id1] = { collapsed: false};
|
||||||
|
deepFreeze([state]);
|
||||||
|
|
||||||
|
const action = new TruncatableCollapseAction(id1);
|
||||||
|
truncatableReducer(state, action);
|
||||||
|
|
||||||
|
// no expect required, deepFreeze will ensure an exception is thrown if the state
|
||||||
|
// is mutated, and any uncaught exception will cause the test to fail
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set filterCollapsed to false in response to the EXPAND action', () => {
|
||||||
|
const state = {};
|
||||||
|
state[id1] = { collapsed: true };
|
||||||
|
const action = new TruncatableExpandAction(id1);
|
||||||
|
const newState = truncatableReducer(state, action);
|
||||||
|
|
||||||
|
expect(newState[id1].collapsed).toEqual(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should perform the EXPAND action without affecting the previous state', () => {
|
||||||
|
const state = {};
|
||||||
|
state[id1] = { collapsed: true };
|
||||||
|
deepFreeze([state]);
|
||||||
|
|
||||||
|
const action = new TruncatableExpandAction(id1);
|
||||||
|
truncatableReducer(state, action);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should flip the value of filterCollapsed in response to the TOGGLE action', () => {
|
||||||
|
const state1 = {};
|
||||||
|
state1[id1] = { collapsed: true };
|
||||||
|
const action = new TruncatableToggleAction(id1);
|
||||||
|
|
||||||
|
const state2 = truncatableReducer(state1, action);
|
||||||
|
const state3 = truncatableReducer(state2, action);
|
||||||
|
|
||||||
|
expect(state2[id1].collapsed).toEqual(false);
|
||||||
|
expect(state3[id1].collapsed).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should perform the TOGGLE action without affecting the previous state', () => {
|
||||||
|
const state = {};
|
||||||
|
state[id2] = { collapsed: true };
|
||||||
|
deepFreeze([state]);
|
||||||
|
|
||||||
|
const action = new TruncatableToggleAction(id2);
|
||||||
|
truncatableReducer(state, action);
|
||||||
|
});
|
||||||
|
});
|
54
src/app/shared/truncatable/truncatable.service.spec.ts
Normal file
54
src/app/shared/truncatable/truncatable.service.spec.ts
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import { Store } from '@ngrx/store';
|
||||||
|
import { async, TestBed } from '@angular/core/testing';
|
||||||
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import { TruncatableService } from './truncatable.service';
|
||||||
|
import { TruncatableCollapseAction, TruncatableExpandAction } from './truncatable.actions';
|
||||||
|
import { TruncatablesState } from './truncatable.reducer';
|
||||||
|
|
||||||
|
describe('TruncatableService', () => {
|
||||||
|
const id1 = '123';
|
||||||
|
const id2 = '456';
|
||||||
|
let service: TruncatableService;
|
||||||
|
const store: Store<TruncatablesState> = jasmine.createSpyObj('store', {
|
||||||
|
/* tslint:disable:no-empty */
|
||||||
|
dispatch: {},
|
||||||
|
/* tslint:enable:no-empty */
|
||||||
|
select: Observable.of(true)
|
||||||
|
});
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: Store, useValue: store
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
service = new TruncatableService(store);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('when the collapse method is triggered', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
service.collapse(id1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('TruncatableCollapseAction should be dispatched to the store', () => {
|
||||||
|
expect(store.dispatch).toHaveBeenCalledWith(new TruncatableCollapseAction(id1));
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('when the expand method is triggered', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
service.expand(id2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('TruncatableExpandAction should be dispatched to the store', () => {
|
||||||
|
expect(store.dispatch).toHaveBeenCalledWith(new TruncatableExpandAction(id2));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
Reference in New Issue
Block a user