Skip to content

Commit

Permalink
fix(Effects): Do not complete effects if one source errors or complet…
Browse files Browse the repository at this point in the history
…es (#297)

Closes #232
  • Loading branch information
MikeRyanDev authored and brandonroberts committed Aug 18, 2017
1 parent d3a3ae7 commit 54747cf
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
20 changes: 19 additions & 1 deletion modules/effects/spec/effect_sources.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'rxjs/add/operator/concat';
import 'rxjs/add/operator/catch';
import { cold } from 'jasmine-marbles';
import 'rxjs/add/operator/map';
import { cold, getTestScheduler } from 'jasmine-marbles';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs/observable/of';
import { timer } from 'rxjs/observable/timer';
import { _throw } from 'rxjs/observable/throw';
import { never } from 'rxjs/observable/never';
import { empty } from 'rxjs/observable/empty';
Expand Down Expand Up @@ -69,6 +71,11 @@ describe('EffectSources', () => {
@Effect() e$ = _throw(error);
}

class SourceG {
@Effect() empty = of('value');
@Effect() never = timer(50, getTestScheduler()).map(() => 'update');
}

it('should resolve effects from instances', () => {
const sources$ = cold('--a--', { a: new SourceA() });
const expected = cold('--a--', { a });
Expand Down Expand Up @@ -99,6 +106,17 @@ describe('EffectSources', () => {
expect(mockErrorReporter.report).toHaveBeenCalled();
});

it('should not complete the group if just one effect completes', () => {
const sources$ = cold('g', {
g: new SourceG(),
});
const expected = cold('a----b-----', { a: 'value', b: 'update' });

const output = toActions(sources$);

expect(output).toBeObservable(expected);
});

function toActions(source: any): Observable<any> {
source['errorReporter'] = mockErrorReporter;
return effectSources.toActions.call(source);
Expand Down
17 changes: 11 additions & 6 deletions modules/effects/src/effect_sources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import { mergeMap } from 'rxjs/operator/mergeMap';
import { exhaustMap } from 'rxjs/operator/exhaustMap';
import { map } from 'rxjs/operator/map';
import { dematerialize } from 'rxjs/operator/dematerialize';
import { filter } from 'rxjs/operator/filter';
import { concat } from 'rxjs/observable/concat';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Notification } from 'rxjs/Notification';
import { Injectable } from '@angular/core';
import { Action } from '@ngrx/store';
import { EffectNotification, verifyOutput } from './effect_notification';
Expand All @@ -31,13 +33,16 @@ export class EffectSources extends Subject<any> {
groupBy.call(this, getSourceForInstance),
(source$: GroupedObservable<any, any>) =>
dematerialize.call(
map.call(
exhaustMap.call(source$, resolveEffectSource),
(output: EffectNotification) => {
verifyOutput(output, this.errorReporter);
filter.call(
map.call(
exhaustMap.call(source$, resolveEffectSource),
(output: EffectNotification) => {
verifyOutput(output, this.errorReporter);

return output.notification;
}
return output.notification;
}
),
(notification: Notification<any>) => notification.kind === 'N'
)
)
);
Expand Down

0 comments on commit 54747cf

Please sign in to comment.