Skip to content

Commit ec318c7

Browse files
committed
fix(getmarbletokenvalue): allow undefined as token value
1 parent fc71b3b commit ec318c7

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

spec/marbles/parseObservableMarble-spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ describe('parseObservableMarble', () => {
2727
expect(messages).to.deep.equal(expected);
2828
});
2929

30-
it('should correctly parse falsy timeframe value', () => {
30+
it('should correctly parse falsy timeframe values', () => {
3131
const marble = '--a-b-c-d';
3232

3333
const messages = parseObservableMarble(marble, { a: null, b: false, c: 0, d: undefined });
34-
const expected = [next(2, null), next(4, false), next(6, 0), next(8, 'd')];
34+
const expected = [next(2, null), next(4, false), next(6, 0), next(8, undefined)];
3535

3636
expect(messages).to.deep.equal(expected);
3737
});

src/marbles/tokenParseReducer.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
2-
import { TestMessage } from '../message/TestMessage';
3-
import { complete, error as e, next } from '../message/TestMessage';
2+
import { complete, error as e, next, TestMessage } from '../message/TestMessage';
43
import { ObservableMarbleToken } from './ObservableMarbleToken';
54
import { SubscriptionMarbleToken } from './SubscriptionMarbleToken';
65

@@ -58,7 +57,7 @@ const getMarbleTokenValue = <T>(
5857
value: { [key: string]: T } | null,
5958
materializeInnerObservables: boolean
6059
) => {
61-
const customValue = value && typeof value[token] !== 'undefined' ? value[token] : token;
60+
const customValue = value && token in value ? value[token] : token;
6261

6362
return materializeInnerObservables && customValue instanceof ColdObservable ? customValue.messages : customValue;
6463
};

0 commit comments

Comments
 (0)