From a78dcfa5f38cd66645f7dc2aa1babfaafe55aea5 Mon Sep 17 00:00:00 2001
From: Julie Ralph <ju.ralph@gmail.com>
Date: Fri, 29 Jan 2016 13:30:36 -0800
Subject: [PATCH] chore(tests): fix broken linker integration test and fix
 DebugNode export

Fixes two small issues introduced with pr #6555
---
 modules/angular2/core.dart                     |  3 +--
 modules/angular2/core.ts                       |  2 +-
 .../test/core/linker/query_integration_spec.ts |  2 +-
 modules/angular2/test/public_api_spec.ts       | 18 ++++++++++++++++++
 tools/public_api_guard/public_api_spec.ts      | 12 ++++++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart
index 92ce45e5d6..6546bfafd9 100644
--- a/modules/angular2/core.dart
+++ b/modules/angular2/core.dart
@@ -16,8 +16,7 @@ export './src/core/zone.dart';
 export './src/core/render.dart';
 export './src/core/linker.dart';
 export './src/core/debug/debug_node.dart' show DebugElement,
-  Scope,
-  inspectElement,
+  DebugNode,
   asNativeElements;
 export './src/core/testability/testability.dart';
 export './src/core/change_detection.dart';
diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts
index 48c9387d0b..f7d786ae62 100644
--- a/modules/angular2/core.ts
+++ b/modules/angular2/core.ts
@@ -20,7 +20,7 @@ export {
 export * from './src/core/zone';
 export * from './src/core/render';
 export * from './src/core/linker';
-export {DebugElement, asNativeElements} from './src/core/debug/debug_node';
+export {DebugElement, DebugNode, asNativeElements} from './src/core/debug/debug_node';
 export * from './src/core/testability/testability';
 export * from './src/core/change_detection';
 export * from './src/core/platform_directives_and_pipes';
diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/angular2/test/core/linker/query_integration_spec.ts
index 512b4b583c..55944cbb9d 100644
--- a/modules/angular2/test/core/linker/query_integration_spec.ts
+++ b/modules/angular2/test/core/linker/query_integration_spec.ts
@@ -149,7 +149,7 @@ export function main() {
                .createAsync(MyComp)
                .then((view) => {
                  view.detectChanges();
-                 var q = view.debugElement.componentViewChildren[0].getLocal('q');
+                 var q = view.debugElement.children[0].getLocal('q');
 
                  expect(q.log).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
 
diff --git a/modules/angular2/test/public_api_spec.ts b/modules/angular2/test/public_api_spec.ts
index 3564577138..cfb8ce9594 100644
--- a/modules/angular2/test/public_api_spec.ts
+++ b/modules/angular2/test/public_api_spec.ts
@@ -888,6 +888,24 @@ var NG_CORE = [
   'CyclicDependencyError.message=',
   'CyclicDependencyError.stackTrace',
   'PLATFORM_PIPES:js',
+  'DebugNode',
+  'DebugNode.getLocal()',
+  'DebugNode.inject()',
+  'DebugNode.setDebugInfo()',
+  'DebugNode.componentInstance',
+  'DebugNode.componentInstance=',
+  'DebugNode.injector',
+  'DebugNode.injector=',
+  'DebugNode.listeners',
+  'DebugNode.listeners=',
+  'DebugNode.locals',
+  'DebugNode.locals=',
+  'DebugNode.nativeNode',
+  'DebugNode.nativeNode=',
+  'DebugNode.parent',
+  'DebugNode.parent=',
+  'DebugNode.providerTokens',
+  'DebugNode.providerTokens=',
   'DebugElement',
   'DebugElement.children',
   'DebugElement.attributes',
diff --git a/tools/public_api_guard/public_api_spec.ts b/tools/public_api_guard/public_api_spec.ts
index 4d955cd420..61175d0770 100644
--- a/tools/public_api_guard/public_api_spec.ts
+++ b/tools/public_api_guard/public_api_spec.ts
@@ -117,6 +117,18 @@ const CORE = [
   'ContentChildrenMetadata.constructor(_selector:Type|string, {descendants=false}:{descendants?:boolean})',
   'CyclicDependencyError',
   'CyclicDependencyError.constructor(injector:Injector, key:Key)',
+  'DebugNode',
+  'DebugNode.componentInstance:any',
+  'DebugNode.constructor(nativeNode:any, parent:DebugNode)',
+  'DebugNode.getLocal(name:string):any',
+  'DebugNode.inject(token:any):any',
+  'DebugNode.injector:Injector',
+  'DebugNode.listeners:EventListener[]',
+  'DebugNode.locals:Map<string, any>',
+  'DebugNode.nativeNode:any',
+  'DebugNode.parent:DebugElement',
+  'DebugNode.providerTokens:any[]',
+  'DebugNode.setDebugInfo(info:RenderDebugInfo):any',
   'DebugElement',
   'DebugElement.children:DebugElement[]',
   'DebugElement.nativeElement:any',