Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
fix(rxjs): fix #863, fix asap scheduler issue, add testcases (#848)
Browse files Browse the repository at this point in the history
* fix(rxjs): fix asap scheduler issue, add testcases

* patch defer, add cases for concat/defer

* add testcases: from/forkJoin

* add cases: fromEvent/fromPromise/interval

* add merge/never/of/range/throw/timer/zip

* add audit~delay

* staging changes

* fix test cases

* add notification test

* add merge/map/collections

* add remained cases

* patch multicast

* use _subscriber setter instead of patching Observable constructor

* refactor

* update gulpfiles

* check proto null

* add null check if operators are not loaded

* remove not necessary karma settings
  • Loading branch information
JiaLiPassion authored and mhevery committed Aug 8, 2017
1 parent 02cd40e commit cbc58c1
Show file tree
Hide file tree
Showing 49 changed files with 4,057 additions and 198 deletions.
9 changes: 8 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ function generateScript(inFile, outFile, minify, callback) {
+ '*\n'
+ '* Use of this source code is governed by an MIT-style license that can be\n'
+ '* found in the LICENSE file at https://angular.io/license\n'
+ '*/'
+ '*/',
globals: {
'rxjs/Observable': 'Rx',
'rxjs/Subscriber': 'Rx',
'rxjs/Subscription': 'Rx',
'rxjs/scheduler/asap': 'Rx.Scheduler',
'rxjs/symbol/rxSubscriber': 'Rx.Symbol'
}
}))
.pipe(rename(outFile)),
];
Expand Down
5 changes: 4 additions & 1 deletion karma-base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ module.exports = function (config) {
'node_modules/systemjs/dist/system-polyfills.js',
'node_modules/systemjs/dist/system.src.js',
'node_modules/whatwg-fetch/fetch.js',
{pattern: 'node_modules/rxjs/bundles/Rx.js', watched: true, served: true, included: false},
{pattern: 'node_modules/rxjs/**/**/*.js', included: false, watched: false },
{pattern: 'node_modules/rxjs/**/**/*.js.map', included: false, watched: false },
{pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
{pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
{pattern: 'test/assets/**/*.*', watched: true, served: true, included: false},
{pattern: 'build/**/*.js.map', watched: true, served: true, included: false},
{pattern: 'build/**/*.js', watched: true, served: true, included: false}
Expand Down
2 changes: 0 additions & 2 deletions karma-dist.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ module.exports = function (config) {
config.files.push('dist/sync-test.js');
config.files.push('dist/task-tracking.js');
config.files.push('dist/wtf.js');
config.files.push('node_modules/rxjs/bundles/Rx.js');
config.files.push('dist/zone-patch-rxjs.js');
config.files.push('build/test/main.js');
};
Loading

0 comments on commit cbc58c1

Please sign in to comment.