Skip to content

Commit 085c2b6

Browse files
ericadamskiericadamski
committed
chore(package): update rxjs dev and peer to version 6.x
1 parent c4ab306 commit 085c2b6

18 files changed

+2639
-2099
lines changed

‎package-lock.json

+2,579-2,042
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "rx-sandbox",
33
"version": "0.0.10",
4-
"description": "Marble diagram DSL based test suite for RxJS 5",
4+
"description": "Marble diagram DSL based test suite for RxJS 6",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
77
"engines": {
@@ -66,19 +66,20 @@
6666
"cz-conventional-changelog": "2.1.0",
6767
"husky": "^0.14.3",
6868
"jest": "^22.0.4",
69+
"jest-cli": "^22.4.3",
6970
"lint-staged": "^7.0.0",
7071
"npm-run-all": "^4.1.2",
7172
"nyc": "^11.4.1",
7273
"prettier": "^1.9.2",
73-
"rxjs": "5.x",
74+
"rxjs": "6.x",
7475
"shx": "^0.2.2",
7576
"ts-jest": "^22.0.0",
7677
"tslint": "^5.8.0",
7778
"tslint-no-unused-expression-chai": "0.1.3",
7879
"typescript": "^2.6.2"
7980
},
8081
"peerDependencies": {
81-
"rxjs": "5.x"
82+
"rxjs": "6.x"
8283
},
8384
"dependencies": {
8485
"jest-matcher-utils": "^22.0.3",

‎spec/index-spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import 'rxjs/add/operator/mapTo';
2+
import { mapTo } from 'rxjs/operators';
33
import * as idx from '../src/index';
44

55
describe('rxSandbox', () => {
@@ -23,7 +23,7 @@ describe('rxSandbox', () => {
2323
const source = hot('--a--|');
2424
const expected = [idx.next(2, 'a'), idx.complete(5)];
2525

26-
const v = getMessages(source.mapTo('a'));
26+
const v = getMessages(source.pipe(mapTo('a')));
2727
expect(v).to.deep.equal(expected);
2828
});
2929

‎spec/marbles/parseObservableMarble-spec.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
2+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
33
import { parseObservableMarble } from '../../src/marbles/parseObservableMarble';
44
import { complete, error, next } from '../../src/message/TestMessage';
55
import { TestScheduler } from '../../src/scheduler/TestScheduler';
@@ -30,7 +30,12 @@ describe('parseObservableMarble', () => {
3030
it('should correctly parse falsy timeframe value', () => {
3131
const marble = '--a-b-c-d';
3232

33-
const messages = parseObservableMarble(marble, { a: null, b: false, c: 0, d: undefined });
33+
const messages = parseObservableMarble(marble, {
34+
a: null,
35+
b: false,
36+
c: 0,
37+
d: undefined
38+
});
3439
const expected = [next(2, null), next(4, false), next(6, 0), next(8, 'd')];
3540

3641
expect(messages).to.deep.equal(expected);

‎spec/message/TestMessage-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import { Notification } from 'rxjs/Notification';
2+
import { Notification } from 'rxjs';
33
import { complete, error, next, subscribe, TestMessageValue } from '../../src/message/TestMessage';
44

55
describe('TestMessageValue', () => {

‎spec/scheduler/TestScheduler-spec.ts

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { expect } from 'chai';
2-
import 'rxjs/add/operator/mapTo';
3-
import 'rxjs/add/operator/windowCount';
4-
import { AsyncAction } from 'rxjs/scheduler/AsyncAction';
5-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
6-
import { HotObservable } from 'rxjs/testing/HotObservable';
2+
import { AsyncAction } from 'rxjs/internal/scheduler/AsyncAction';
3+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
4+
import { HotObservable } from 'rxjs/internal/testing/HotObservable';
5+
import { mapTo, windowCount } from 'rxjs/operators';
76
import { parseObservableMarble } from '../../src/marbles/parseObservableMarble';
87
import { complete, error, next, subscribe, TestMessage } from '../../src/message/TestMessage';
98
import { TestScheduler } from '../../src/scheduler/TestScheduler';
@@ -151,7 +150,7 @@ describe('TestScheduler', () => {
151150
const scheduler = new TestScheduler(false, 1, 1000);
152151

153152
const e1 = scheduler.createHotObservable('---1---2---|');
154-
const messages = scheduler.getMessages(e1.mapTo('x'));
153+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
155154

156155
expect(messages).to.be.empty;
157156
scheduler.flush();
@@ -165,7 +164,7 @@ describe('TestScheduler', () => {
165164
const scheduler = new TestScheduler(true, 1, 1000);
166165

167166
const e1 = scheduler.createHotObservable('---1---2---|');
168-
const messages = scheduler.getMessages(e1.mapTo('x'));
167+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
169168

170169
expect(messages).to.deep.equal(expected);
171170
expect(e1.subscriptions).to.deep.equal([subscribe(0, 11)]);
@@ -175,17 +174,17 @@ describe('TestScheduler', () => {
175174
const scheduler = new TestScheduler(true, 1, 1000);
176175

177176
const e1 = scheduler.createHotObservable('---1---2---|');
178-
scheduler.getMessages(e1.mapTo('x'));
177+
scheduler.getMessages(e1.pipe(mapTo('x')));
179178

180-
expect(() => scheduler.getMessages(e1.mapTo('x'))).to.throw();
179+
expect(() => scheduler.getMessages(e1.pipe(mapTo('x')))).to.throw();
181180
});
182181

183182
it('should ignore values over max frames', () => {
184183
const expected: Array<TestMessage<string>> = [next(3, 'x')];
185184
const scheduler = new TestScheduler(true, 1, 5);
186185

187186
const e1 = scheduler.createHotObservable('---1---2---|');
188-
const messages = scheduler.getMessages(e1.mapTo('x'));
187+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
189188

190189
expect(messages).to.deep.equal(expected);
191190
});
@@ -195,7 +194,7 @@ describe('TestScheduler', () => {
195194
const scheduler = new TestScheduler(false, 1, 1000);
196195

197196
const e1 = scheduler.createHotObservable('---1---2---#');
198-
const messages = scheduler.getMessages(e1.mapTo('x'));
197+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
199198

200199
expect(messages).to.be.empty;
201200
scheduler.flush();
@@ -209,7 +208,7 @@ describe('TestScheduler', () => {
209208
const scheduler = new TestScheduler(false, 1, 1000);
210209

211210
const e1 = scheduler.createColdObservable('---1---2---|');
212-
const messages = scheduler.getMessages(e1.mapTo('x'));
211+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
213212

214213
expect(messages).to.be.empty;
215214
scheduler.flush();
@@ -223,7 +222,7 @@ describe('TestScheduler', () => {
223222
const scheduler = new TestScheduler(true, 1, 1000);
224223

225224
const e1 = scheduler.createColdObservable('---1---2---|');
226-
const messages = scheduler.getMessages(e1.mapTo('x'));
225+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
227226

228227
expect(messages).to.deep.equal(expected);
229228
expect(e1.subscriptions).to.deep.equal([subscribe(0, 11)]);
@@ -234,7 +233,7 @@ describe('TestScheduler', () => {
234233
const scheduler = new TestScheduler(false, 1, 1000);
235234

236235
const e1 = scheduler.createColdObservable('---1---2---#');
237-
const messages = scheduler.getMessages(e1.mapTo('x'));
236+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')));
238237

239238
expect(messages).to.be.empty;
240239
scheduler.flush();
@@ -253,7 +252,7 @@ describe('TestScheduler', () => {
253252

254253
const source = scheduler.createColdObservable('---a---b---c---d---|');
255254

256-
const messages = scheduler.getMessages(source.windowCount(3));
255+
const messages = scheduler.getMessages(source.pipe(windowCount(3)));
257256
expect(messages).to.be.empty;
258257

259258
scheduler.flush();
@@ -270,7 +269,7 @@ describe('TestScheduler', () => {
270269

271270
const source = scheduler.createColdObservable('---a---b---c---#');
272271

273-
const messages = scheduler.getMessages(source.windowCount(3));
272+
const messages = scheduler.getMessages(source.pipe(windowCount(3)));
274273
expect(messages).to.be.empty;
275274

276275
scheduler.flush();
@@ -287,7 +286,7 @@ describe('TestScheduler', () => {
287286

288287
const source = scheduler.createHotObservable('---a---b---c---d---|');
289288

290-
const messages = scheduler.getMessages(source.windowCount(3));
289+
const messages = scheduler.getMessages(source.pipe(windowCount(3)));
291290
expect(messages).to.be.empty;
292291

293292
scheduler.flush();
@@ -304,7 +303,7 @@ describe('TestScheduler', () => {
304303

305304
const source = scheduler.createHotObservable('---a---b---c---#');
306305

307-
const messages = scheduler.getMessages(source.windowCount(3));
306+
const messages = scheduler.getMessages(source.pipe(windowCount(3)));
308307
expect(messages).to.be.empty;
309308

310309
scheduler.flush();
@@ -319,7 +318,7 @@ describe('TestScheduler', () => {
319318
const sub = ' ------^---!';
320319
//actual subscription: ---1-
321320

322-
const messages = scheduler.getMessages(e1.mapTo('x'), sub);
321+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')), sub);
323322

324323
expect(messages).to.be.empty;
325324
scheduler.flush();
@@ -334,7 +333,7 @@ describe('TestScheduler', () => {
334333

335334
const e1 = scheduler.createHotObservable('---1---2---|');
336335
const sub = ' ------^---!';
337-
const messages = scheduler.getMessages(e1.mapTo('x'), sub);
336+
const messages = scheduler.getMessages(e1.pipe(mapTo('x')), sub);
338337

339338
expect(messages).to.be.empty;
340339
scheduler.flush();

‎spec/scheduler/calculateSubscriptionFrame-spec.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { expect } from 'chai';
2-
import 'rxjs/add/observable/of';
3-
import { Observable } from 'rxjs/Observable';
2+
import { of } from 'rxjs';
43
import { calculateSubscriptionFrame } from '../../src/scheduler/calculateSubscriptionFrame';
54
import { TestScheduler } from '../../src/scheduler/TestScheduler';
65

76
describe('calculateSubscriptionFrame', () => {
87
it('should return immediate subscription without subscription token', () => {
9-
const { subscribedFrame, unsubscribedFrame } = calculateSubscriptionFrame(Observable.of(''), '---!', 1);
8+
const { subscribedFrame, unsubscribedFrame } = calculateSubscriptionFrame(of(''), '---!', 1);
109

1110
expect(subscribedFrame).to.equal(0);
1211
expect(unsubscribedFrame).to.equal(3);
@@ -73,6 +72,6 @@ describe('calculateSubscriptionFrame', () => {
7372
});
7473

7574
it('should throw when source is neither hot nor cold', () => {
76-
expect(() => calculateSubscriptionFrame(Observable.of(''), '-^-!', 1)).to.throw();
75+
expect(() => calculateSubscriptionFrame(of(''), '-^-!', 1)).to.throw();
7776
});
7877
});

‎src/RxSandbox.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
1+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
22
import { TestMessage } from './message/TestMessage';
33
import { RxSandboxInstance } from './RxSandboxInstance';
44

‎src/RxSandboxInstance.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
1+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
22
import { TestMessage } from './message/TestMessage';
33
import { TestScheduler } from './scheduler/TestScheduler';
44

‎src/assert/constructObservableMarble.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ const constructObservableMarble = <T = string>(
4242
value: Array<TestMessage<T>> | Readonly<Array<TestMessage<T>>>
4343
): string => {
4444
if (value.length === 0) {
45-
return Array.from(Array(30)).map(() => ObservableMarbleToken.TIMEFRAME).join('');
45+
return Array.from(Array(30))
46+
.map(() => ObservableMarbleToken.TIMEFRAME)
47+
.join('');
4648
}
4749

4850
const groupedMarble: Array<Array<TestMessage<T>>> = value.reduce(marbleGroupReducer, []);

‎src/assert/constructSubscriptionMarble.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
1+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
22
import { ObservableMarbleToken } from '../marbles/ObservableMarbleToken';
33
import { SubscriptionMarbleToken } from '../marbles/SubscriptionMarbleToken';
44

‎src/assert/marbleAssert.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
22
import { toEqual } from 'jest-matchers/build/matchers';
3-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
3+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
44
import { TestMessage } from '../message/TestMessage';
55
import { constructObservableMarble } from './constructObservableMarble';
66
import { constructSubscriptionMarble } from './constructSubscriptionMarble';

‎src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Observable } from 'rxjs/Observable';
2-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
3-
import { HotObservable } from 'rxjs/testing/HotObservable';
1+
import { Observable } from 'rxjs';
2+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
3+
import { HotObservable } from 'rxjs/internal/testing/HotObservable';
44
import { marbleAssert } from './assert/marbleAssert';
55
import { parseObservableMarble } from './marbles/parseObservableMarble';
66
import { parseSubscriptionMarble } from './marbles/parseSubscriptionMarble';

‎src/marbles/parseSubscriptionMarble.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
1+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
22
import { ObservableMarbleToken } from './ObservableMarbleToken';
33
import { subscriptionTokenParseReducer } from './tokenParseReducer';
44

‎src/marbles/tokenParseReducer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
1+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
22
import { TestMessage } from '../message/TestMessage';
33
import { complete, error as e, next } from '../message/TestMessage';
44
import { ObservableMarbleToken } from './ObservableMarbleToken';

‎src/message/TestMessage.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Notification } from 'rxjs/Notification';
2-
import { SubscriptionLog } from 'rxjs/testing/SubscriptionLog';
1+
import { Notification } from 'rxjs';
2+
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
33

44
/**
55
* Represents interface for single metadata value emitted by HotObservable<T> or ColdObservable<T>

‎src/scheduler/TestScheduler.ts

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import { Notification } from 'rxjs/Notification';
2-
import { Observable } from 'rxjs/Observable';
3-
import { AsyncAction } from 'rxjs/scheduler/AsyncAction';
4-
import { VirtualAction } from 'rxjs/scheduler/VirtualTimeScheduler';
5-
import { VirtualTimeScheduler } from 'rxjs/scheduler/VirtualTimeScheduler';
6-
import { Subscription } from 'rxjs/Subscription';
7-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
8-
import { HotObservable } from 'rxjs/testing/HotObservable';
1+
import { Notification, Observable, Subscription } from 'rxjs';
2+
import { AsyncAction } from 'rxjs/internal/scheduler/AsyncAction';
3+
import { VirtualAction, VirtualTimeScheduler } from 'rxjs/internal/scheduler/VirtualTimeScheduler';
4+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
5+
import { HotObservable } from 'rxjs/internal/testing/HotObservable';
96
import { parseObservableMarble } from '../marbles/parseObservableMarble';
107
import { SubscriptionMarbleToken } from '../marbles/SubscriptionMarbleToken';
118
import { TestMessage } from '../message/TestMessage';
@@ -89,7 +86,7 @@ class TestScheduler extends VirtualTimeScheduler {
8986

9087
const messages = Array.isArray(marbleValue)
9188
? marbleValue
92-
: parseObservableMarble(marbleValue, value, error, false, this.frameTimeFactor, this._maxFrame) as any;
89+
: (parseObservableMarble(marbleValue, value, error, false, this.frameTimeFactor, this._maxFrame) as any);
9390
const observable = new ColdObservable<T>(messages as Array<TestMessage<T | Array<TestMessage<T>>>>, this);
9491
this.coldObservables.push(observable);
9592
return observable;
@@ -106,7 +103,7 @@ class TestScheduler extends VirtualTimeScheduler {
106103

107104
const messages = Array.isArray(marbleValue)
108105
? marbleValue
109-
: parseObservableMarble(marbleValue, value, error, false, this.frameTimeFactor, this._maxFrame) as any;
106+
: (parseObservableMarble(marbleValue, value, error, false, this.frameTimeFactor, this._maxFrame) as any);
110107
const subject = new HotObservable<T>(messages as Array<TestMessage<T | Array<TestMessage<T>>>>, this);
111108
this.hotObservables.push(subject);
112109
return subject;

‎src/scheduler/calculateSubscriptionFrame.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Observable } from 'rxjs/Observable';
2-
import { ColdObservable } from 'rxjs/testing/ColdObservable';
3-
import { HotObservable } from 'rxjs/testing/HotObservable';
1+
import { Observable } from 'rxjs';
2+
import { ColdObservable } from 'rxjs/internal/testing/ColdObservable';
3+
import { HotObservable } from 'rxjs/internal/testing/HotObservable';
44
import { parseSubscriptionMarble } from '../marbles/parseSubscriptionMarble';
55

66
const calculateSubscriptionFrame = (

0 commit comments

Comments
 (0)