Merge branch 'w2p-46063_truncation-implementation' into w2p-46063_truncation-implementation-test-fixes

Conflicts:
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
This commit is contained in:
Lotte Hofstede
2018-02-13 15:06:41 +01:00

View File

@@ -11,6 +11,7 @@ describe('TruncatableComponent', () => {
const identifier = '1234567890';
let truncatableService;
const truncatableServiceStub: any = {
/* tslint:disable:no-empty */
isCollapsed: (id: string) => {
if (id === '1') {
return Observable.of(true)
@@ -24,6 +25,7 @@ describe('TruncatableComponent', () => {
},
toggle: (id: string) => {
}
/* tslint:enable:no-empty */
};
beforeEach(async(() => {
TestBed.configureTestingModule({