fix(fakeAsync): have fakeAsync use Proxy zone. (#10797)
Closes #10503 It is possible for code in `beforeEach` to capture and fork a zone (for example creating `NgZone` in `beforeEach`). Subsequently the code in `it` may chose to do `fakeAsync`. The issue is that because the code in `it` can use `NgZone` from the `beforeEach`. it effectively can escape the `fakeAsync` zone. A solution is to run all of the test in `ProxyZone` which allows a test to dynamically replace the rules at any time. This allows the `beforeEach` to fork a zone, and then `it` to retroactively became `fakeAsync` zone.
This commit is contained in:
@ -1,15 +1,19 @@
|
||||
'use strict';
|
||||
|
||||
var glob = require('glob');
|
||||
require('zone.js/dist/zone-node.js');
|
||||
var JasmineRunner = require('jasmine');
|
||||
var path = require('path');
|
||||
// require('es6-shim/es6-shim.js');
|
||||
require('zone.js/dist/zone-node.js');
|
||||
require('zone.js/dist/long-stack-trace-zone.js');
|
||||
require('zone.js/dist/proxy-zone.js');
|
||||
require('zone.js/dist/sync-test.js');
|
||||
require('zone.js/dist/async-test.js');
|
||||
require('zone.js/dist/fake-async-test.js');
|
||||
|
||||
var jrunner = new JasmineRunner();
|
||||
(global as any)['jasmine'] = jrunner.jasmine;
|
||||
require('zone.js/dist/jasmine-patch.js');
|
||||
var toolsDir = process.cwd() + '/dist/tools';
|
||||
function toolsDirRequire(moduleId: string) {
|
||||
return require(path.join(toolsDir, moduleId));
|
||||
@ -39,6 +43,5 @@ jrunner.configureDefaultReporter({showColors: process.argv.indexOf('--no-color')
|
||||
jrunner.onComplete(function(passed: boolean) { process.exit(passed ? 0 : 1); });
|
||||
jrunner.projectBaseDir = path.resolve(__dirname, '../../');
|
||||
jrunner.specDir = '';
|
||||
require('zone.js/dist/jasmine-patch.js');
|
||||
specFiles.forEach((file: string) => { toolsDirRequire(file); });
|
||||
jrunner.execute();
|
||||
|
@ -1,17 +1,21 @@
|
||||
'use strict';
|
||||
|
||||
var glob = require('glob');
|
||||
require('zone.js/dist/zone-node.js');
|
||||
var JasmineRunner = require('jasmine');
|
||||
var path = require('path');
|
||||
require('source-map-support').install();
|
||||
// require('es6-shim/es6-shim.js');
|
||||
require('zone.js/dist/zone-node.js');
|
||||
require('zone.js/dist/long-stack-trace-zone.js');
|
||||
require('zone.js/dist/proxy-zone.js');
|
||||
require('zone.js/dist/sync-test.js');
|
||||
require('zone.js/dist/async-test.js');
|
||||
require('zone.js/dist/fake-async-test.js');
|
||||
require('reflect-metadata/Reflect');
|
||||
|
||||
var jrunner = new JasmineRunner();
|
||||
(global as any)['jasmine'] = jrunner.jasmine;
|
||||
require('zone.js/dist/jasmine-patch.js');
|
||||
|
||||
var distAll: string = process.cwd() + '/dist/all';
|
||||
function distAllRequire(moduleId: string) {
|
||||
return require(path.join(distAll, moduleId));
|
||||
@ -66,7 +70,6 @@ jrunner.onComplete(function(passed: boolean) { process.exit(passed ? 0 : 1); });
|
||||
jrunner.projectBaseDir = path.resolve(__dirname, '../../');
|
||||
jrunner.specDir = '';
|
||||
require('./test-cjs-main.js');
|
||||
require('zone.js/dist/jasmine-patch.js');
|
||||
distAllRequire('@angular/platform-server/src/parse5_adapter.js').Parse5DomAdapter.makeCurrent();
|
||||
specFiles.forEach((file: string) => {
|
||||
var r = distAllRequire(file);
|
||||
|
1
tools/types.d.ts
vendored
1
tools/types.d.ts
vendored
@ -2,3 +2,4 @@
|
||||
|
||||
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
|
||||
/// <reference path="../node_modules/@types/node/index.d.ts" />
|
||||
/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
|
||||
|
Reference in New Issue
Block a user