honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(bazel): cleanup the jasmine bootstrap code (#28906)

Browse Source 
PR Close #28906
This commit is contained in:
Greg Magolan 2019-02-21 14:22:06 -08:00 committed by Igor Minar
parent 1145bdb478
commit 9defc00b14
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/testing/init_node_no_angular_spec.ts
View File

@ -6,21 +6,5 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
// This hack is needed to get jasmine, node and zone working inside bazel.
// 1) we load `jasmine-core` which contains the ENV: it, describe etc...
const jasmineCore: any = require('jasmine-core');
// 2) We create an instance of `jasmine` ENV.
const patchedJasmine = jasmineCore.boot(jasmineCore);
// 3) Save the `jasmine` into global so that `zone.js/dist/jasmine-patch.js` can get a hold of it to
// patch it.
(global as any)['jasmine'] = patchedJasmine;
// 4) Change the `jasmine-core` to make sure that all subsequent jasmine's have the same ENV,
// otherwise the patch will not work.
// This is needed since Bazel creates a new instance of jasmine and it's ENV and we want to make
// sure it gets the same one.
jasmineCore.boot = function() {
return patchedJasmine;
};
(global as any).isNode = true; (global as any).isNode = true;
(global as any).isBrowser = false; (global as any).isBrowser = false;

22
tools/testing/init_node_spec.ts
View File

@ -15,22 +15,14 @@ import 'zone.js/dist/fake-async-test.js';
import 'zone.js/dist/task-tracking.js'; import 'zone.js/dist/task-tracking.js';
import 'reflect-metadata/Reflect'; import 'reflect-metadata/Reflect';
// This hack is needed to get jasmine, node and zone working inside bazel. // We must first initialize jasmine-core before calling
// 1) we load `jasmine-core` which contains the ENV: it, describe etc... // requiring `zone.js/dist/jasmine-patch.js` which patches
// jasmine ENV with code which understands ProxyZone.
// jasmine_node_test under Bazel will check if `jasmineCore.boot(jasmineCore)`
// has been called and re-use the env if it has.
// See https://github.com/bazelbuild/rules_nodejs/pull/539
const jasmineCore: any = require('jasmine-core'); const jasmineCore: any = require('jasmine-core');
// 2) We create an instance of `jasmine` ENV. jasmineCore.boot(jasmineCore);
const patchedJasmine = jasmineCore.boot(jasmineCore);
// 3) Save the `jasmine` into global so that `zone.js/dist/jasmine-patch.js` can get a hold of it to
// patch it.
(global as any)['jasmine'] = patchedJasmine;
// 4) Change the `jasmine-core` to make sure that all subsequent jasmine's have the same ENV,
// otherwise the patch will not work.
// This is needed since Bazel creates a new instance of jasmine and it's ENV and we want to make
// sure it gets the same one.
jasmineCore.boot = function() {
return patchedJasmine;
};
// 5) Patch jasmine ENV with code which understands ProxyZone.
import 'zone.js/dist/jasmine-patch.js'; import 'zone.js/dist/jasmine-patch.js';
(global as any).isNode = true; (global as any).isNode = true;