chore(build): fix flakiness of the element probe global test

marclaval · jelbourn · commit fb16c394965e · 2015-12-02T14:19:07.000-08:00
diff --git a/modules/angular2/src/facade/lang.ts b/modules/angular2/src/facade/lang.ts
@@ -354,7 +354,7 @@ export function setValueOnPath(global: any, path: string, value: any) {
   var obj: any = global;
   while (parts.length > 1) {
     var name = parts.shift();
-    if (obj.hasOwnProperty(name)) {
+    if (obj.hasOwnProperty(name) && isPresent(obj[name])) {
       obj = obj[name];
     } else {
       obj = obj[name] = {};
diff --git a/modules/angular2/src/platform/browser/tools/tools.ts b/modules/angular2/src/platform/browser/tools/tools.ts
@@ -23,5 +23,5 @@ export function enableDebugTools(ref: ComponentRef): void {
  * Disables Angular 2 tools.
  */
 export function disableDebugTools(): void {
-  context.ng = undefined;
+  delete context.ng;
 }
diff --git a/modules/angular2/src/platform/dom/debug/debug_element_view_listener.ts b/modules/angular2/src/platform/dom/debug/debug_element_view_listener.ts
@@ -72,4 +72,4 @@ export const ELEMENT_PROBE_PROVIDERS: any[] = CONST_EXPR([
   CONST_EXPR(new Provider(AppViewListener, {useExisting: DebugElementViewListener})),
 ]);
 
-export const ELEMENT_PROBE_BINDINGS = ELEMENT_PROBE_PROVIDERS;
+export const ELEMENT_PROBE_BINDINGS = ELEMENT_PROBE_PROVIDERS;
diff --git a/modules/angular2/test/platform/browser/debug/debug_element_view_listener_spec.ts b/modules/angular2/test/platform/browser/debug/debug_element_view_listener_spec.ts
@@ -68,7 +68,7 @@ export function main() {
 
                  async.done();
                });
-         }), 10000);
+         }), 1000);
     }
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ export function enableDebugTools(ref: ComponentRef): void {`
`23`	`23`	`* Disables Angular 2 tools.`
`24`	`24`	`*/`
`25`	`25`	`export function disableDebugTools(): void {`
`26`		`- context.ng = undefined;`
	`26`	`+ delete context.ng;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export function main() {`
`68`	`68`
`69`	`69`	`async.done();`
`70`	`70`	`});`
`71`		`- }), 10000);`
	`71`	`+ }), 1000);`
`72`	`72`	`}`
`73`	`73`	`});`
`74`	`74`	`}`