update to the latest angular

karma.conf.js

@@ -39,7 +39,6 @@ module.exports = function (config) {
         //load angular dependencies and browser polyfills
         files: [
           'node_modules/zone.js/dist/zone.js',
-          'node_modules/zone.js/dist/fake-async-test.js',
           'node_modules/zone.js/dist/async-test.js',
           'node_modules/zone.js/dist/jasmine-patch.js',
           'node_modules/zone.js/dist/long-stack-trace-zone.js',

lib/components/ApiInfo/api-info.spec.ts

@@ -1,47 +1,32 @@
 'use strict';
 
 import { getChildDebugElement } from '../../../tests/helpers';
-import { Component, provide } from '@angular/core';
+import { Component } from '@angular/core';
 
 import {
   inject,
   async,
-  expect,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
 import { ApiInfo } from './api-info';
 import { SpecManager } from '../../utils/SpecManager';
-import { OptionsService } from '../../services/index';
 
 describe('Redoc components', () => {
   describe('ApiInfo Component', () => {
     let builder;
     let component;
     let fixture;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()}),
-        provide(OptionsService, {useClass: OptionsService})
-    ]);
 
     beforeEach(async(inject([TestComponentBuilder, SpecManager], (tcb, specMgr) => {
       builder = tcb;
       return specMgr.load('/tests/schemas/api-info-test.json');
     })));
 
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        component = getChildDebugElement(fixture.debugElement, 'api-info').componentInstance;
-        fixture.detectChanges();
-        done();
-      }, err => {
-        done.fail(err);
-      });
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      component = getChildDebugElement(fixture.debugElement, 'api-info').componentInstance;
+      fixture.detectChanges();
     });
 
 
@@ -54,7 +39,7 @@ describe('Redoc components', () => {
     it('should render api name and version', () => {
       let nativeElement = getChildDebugElement(fixture.debugElement, 'api-info').nativeElement;
       let headerElement = nativeElement.querySelector('h1');
-      expect(headerElement).toHaveText('Swagger Petstore (1.0.0)');
+      expect(headerElement.innerText).toContain('Swagger Petstore (1.0.0)');
     });
   });
 });

lib/components/ApiLogo/api-logo.spec.ts

@@ -1,18 +1,14 @@
 'use strict';
 
 import { getChildDebugElement } from '../../../tests/helpers';
-import {Component, provide} from '@angular/core';
+import { Component } from '@angular/core';
 
 import {
   inject,
   async,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
 import { ApiLogo } from './api-logo';
 import { SpecManager } from '../../utils/SpecManager';
 
@@ -25,21 +21,15 @@ describe('Redoc components', () => {
     let specMgr;
 
     let schemaUrl = '/tests/schemas/api-info-test.json';
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()})
-    ]);
     beforeEach(async(inject([TestComponentBuilder, SpecManager], (tcb, _specMgr) => {
       builder = tcb;
       specMgr = _specMgr;
       return specMgr.load(schemaUrl);
     })));
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        component = getChildDebugElement(fixture.debugElement, 'api-logo').componentInstance;
-        fixture.detectChanges();
-        done();
-      }, err => done.fail(err));
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      component = getChildDebugElement(fixture.debugElement, 'api-logo').componentInstance;
+      fixture.detectChanges();
     });
 
 

lib/components/JsonSchema/json-schema-lazy.spec.ts

@@ -1,41 +1,33 @@
 'use strict';
 
 import { getChildDebugElement } from '../../../tests/helpers';
-import { Component, provide } from '@angular/core';
+import { Component } from '@angular/core';
 
 import {
   inject,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
-
 import { JsonSchemaLazy } from './json-schema-lazy';
-import { SpecManager } from '../../utils/SpecManager';
 
 describe('Redoc components', () => {
   describe('JsonSchemaLazy Component', () => {
     let builder;
     let component;
-    let specMgr = new SpecManager();
     let fixture;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: specMgr})
-    ]);
-    beforeEach(inject([TestComponentBuilder], (tcb, dcl) => {
+
+    beforeEach(inject([TestComponentBuilder], (tcb) => {
       builder = tcb;
     }));
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        let debugEl = getChildDebugElement(fixture.debugElement, 'json-schema-lazy');
-        component = <JsonSchemaLazy>debugEl.componentInstance;
-        spyOn(component, '_loadAfterSelf').and.callThrough();
-        done();
-      }, err => done.fail(err));
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      let debugEl = getChildDebugElement(fixture.debugElement, 'json-schema-lazy');
+      component = <JsonSchemaLazy>debugEl.componentInstance;
+      spyOn(component, '_loadAfterSelf').and.stub();
+    });
+
+    afterEach(() => {
+      component._loadAfterSelf.and.callThrough();
     });
 
     it('should init component', () => {

lib/components/JsonSchema/json-schema.spec.ts

@@ -1,13 +1,10 @@
 'use strict';
 
-import { Component, provide } from '@angular/core';
+import { Component } from '@angular/core';
 import {
   inject,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
-import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import { getChildDebugElement } from '../../../tests/helpers';
 
@@ -19,21 +16,17 @@ describe('Redoc components', () => {
   describe('JsonSchema Component', () => {
     let builder;
     let component;
-    let specMgr = new SpecManager();
     let fixture;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: specMgr})
-    ]);
-    beforeEach(inject([TestComponentBuilder], (tcb) => {
+    let specMgr;
+
+    beforeEach(inject([TestComponentBuilder, SpecManager], (tcb, _spec) => {
       builder = tcb;
+      specMgr = _spec;
     }));
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        let debugEl = getChildDebugElement(fixture.debugElement, 'json-schema');
-        component = debugEl.componentInstance;
-        done();
-      }, err => done.fail(err));
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      let debugEl = getChildDebugElement(fixture.debugElement, 'json-schema');
+      component = debugEl.componentInstance;
     });
 
     it('should init component', () => {

lib/components/Method/method.spec.ts

@@ -1,14 +1,11 @@
 'use strict';
 
-import { Component, provide } from '@angular/core';
+import { Component } from '@angular/core';
 import {
   inject,
   async,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
-import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import { getChildDebugElement } from '../../../tests/helpers';
 
@@ -19,19 +16,16 @@ describe('Redoc components', () => {
   describe('Method Component', () => {
     let builder;
     let component;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()})
-    ]);
+
     beforeEach(async(inject([TestComponentBuilder, SpecManager], (tcb, specMgr) => {
       builder = tcb;
       return specMgr.load('/tests/schemas/extended-petstore.yml');
     })));
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(fixture => {
-        component = getChildDebugElement(fixture.debugElement, 'method').componentInstance;
-        fixture.detectChanges();
-        done();
-      }, err => done.fail(err));
+
+    beforeEach(() => {
+      let fixture = builder.createSync(TestAppComponent);
+      component = getChildDebugElement(fixture.debugElement, 'method').componentInstance;
+      fixture.detectChanges();
     });
 
 

lib/components/MethodsList/methods-list.spec.ts

@@ -4,11 +4,8 @@ import { Component, provide } from '@angular/core';
 import {
   inject,
   async,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
-import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import { getChildDebugElement } from '../../../tests/helpers';
 
@@ -21,20 +18,15 @@ describe('Redoc components', () => {
     let builder;
     let component;
     let fixture;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()})
-    ]);
+
     beforeEach(async(inject([TestComponentBuilder, SpecManager], (tcb, specMgr) => {
       builder = tcb;
       return specMgr.load('/tests/schemas/methods-list-component.json');
     })));
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        component = getChildDebugElement(fixture.debugElement, 'methods-list').componentInstance;
-        fixture.detectChanges();
-        done();
-      }, err => done.fail(err) );
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      component = getChildDebugElement(fixture.debugElement, 'methods-list').componentInstance;
+      fixture.detectChanges();
     });
 
 

lib/components/Redoc/redoc.spec.ts

@@ -1,15 +1,12 @@
 'use strict';
 
 import { getChildDebugElement } from '../../../tests/helpers';
-import { Component, provide, ComponentRef } from '@angular/core';
+import { Component, ComponentRef } from '@angular/core';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   inject,
-  async,
-  beforeEach,
-  beforeEachProviders,
-  it
+  async
 } from '@angular/core/testing';
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
@@ -24,40 +21,27 @@ describe('Redoc components', () => {
   describe('Redoc Component', () => {
     let builder;
     let specMgr;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()}),
-    ]);
+
     beforeEach(async(inject([TestComponentBuilder, SpecManager, OptionsService],
       (tcb, _specMgr, _optsMgr) => {
       optsMgr = _optsMgr;
       builder = tcb;
       specMgr = _specMgr;
+      return specMgr.load('/tests/schemas/extended-petstore.yml');
     })));
 
-    beforeEach((done) => {
-      return specMgr.load('/tests/schemas/extended-petstore.yml')
-        .then(() => done())
-        .catch(err => done.fail(err));
+
+    it('should init component', () => {
+      let fixture = builder.createSync(TestAppComponent);
+      let component = getChildDebugElement(fixture.debugElement, 'redoc').componentInstance;
+      expect(component).not.toBeNull();
+      fixture.destroy();
     });
 
-
-    it('should init component', (done) => {
-      builder.createAsync(TestAppComponent).then(fixture => {
-        let component = getChildDebugElement(fixture.debugElement, 'redoc').componentInstance;
-        expect(component).not.toBeNull();
-        fixture.destroy();
-        done();
-      }, err => done.fail(err));
-    });
-
-    it('should init components tree without errors', (done) => {
-      builder.createAsync(TestAppComponent).then(fixture => {
-        (() => fixture.detectChanges()).should.not.throw();
-        fixture.destroy();
-        done();
-      }, err => {
-        return done.fail(err);
-      });
+    it('should init components tree without errors', () => {
+      let fixture = builder.createSync(TestAppComponent);
+      (() => fixture.detectChanges()).should.not.throw();
+      fixture.destroy();
     });
   });
 
@@ -103,29 +87,25 @@ describe('Redoc components', () => {
     let builder;
     let fixture;
     let element;
+    let dom;
     let destroySpy;
-    let dom = new BrowserDomAdapter();
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()}),
-        provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
-        provide(OptionsService, {useValue: optsMgr})
-    ]);
-    beforeEach(async(inject([TestComponentBuilder, SpecManager], (tcb, specMgr) => {
+
+    beforeEach(async(inject([TestComponentBuilder, SpecManager, OptionsService, BrowserDomAdapter],
+      (tcb, specMgr, opts, _dom) => {
       builder = tcb;
+      optsMgr = opts;
+      dom = _dom;
       return specMgr.load('/tests/schemas/methods-list-component.json');
     })));
 
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        element = getChildDebugElement(fixture.debugElement, 'methods-list').nativeElement;
-        destroySpy = jasmine.createSpy('spy');
-        Redoc.appRef = <ComponentRef<any>>{
-          destroy: destroySpy
-        };
-        fixture.detectChanges();
-        done();
-      }, err => { throw err; });
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      element = getChildDebugElement(fixture.debugElement, 'methods-list').nativeElement;
+      destroySpy = jasmine.createSpy('spy');
+      Redoc.appRef = <ComponentRef<any>>{
+        destroy: destroySpy
+      };
+      fixture.detectChanges();
     });
 
     afterEach(()=> {

lib/components/SideMenu/side-menu.spec.ts

@@ -6,10 +6,7 @@ import { OptionsService } from '../../services/index';
 
 import {
   inject,
-  async,
-  beforeEach,
-  beforeEachProviders,
-  it
+  async
 } from '@angular/core/testing';
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
@@ -25,9 +22,7 @@ describe('Redoc components', () => {
     let builder;
     let component;
     let fixture;
-    beforeEachProviders(() => [
-        provide(SpecManager, {useValue: new SpecManager()})
-    ]);
+
     beforeEach(async(inject([TestComponentBuilder, SpecManager, OptionsService],
       (tcb, specMgr, opts) => {
       builder = tcb;
@@ -39,15 +34,10 @@ describe('Redoc components', () => {
       return specMgr.load('/tests/schemas/extended-petstore.yml');
     })));
 
-    beforeEach((done) => {
-      builder.createAsync(TestAppComponent).then(_fixture => {
-        fixture = _fixture;
-        component = getChildDebugElement(fixture.debugElement, 'side-menu').componentInstance;
-        fixture.detectChanges();
-        done();
-      }, err => {
-        throw err;
-      });
+    beforeEach(() => {
+      fixture = builder.createSync(TestAppComponent);
+      component = getChildDebugElement(fixture.debugElement, 'side-menu').componentInstance;
+      fixture.detectChanges();
     });
 
     afterEach(() => {

lib/components/base.ts

@@ -60,9 +60,7 @@ export function RedocComponent(options) {
       inputs: inputs,
       outputs: options.outputs,
       providers: options.providers,
-      changeDetection: options.detect ?
-        (options.onPushOnly ? ChangeDetectionStrategy.OnPush : ChangeDetectionStrategy.Default) :
-        ChangeDetectionStrategy.Detached,
+      changeDetection: options.onPushOnly ? ChangeDetectionStrategy.OnPush : ChangeDetectionStrategy.Default,
       animations: options.animations,
       templateUrl: options.templateUrl,
       template: options.template,

lib/services/menu.service.spec.ts

@@ -1,17 +1,11 @@
 'use strict';
-import { provide, Component } from '@angular/core';
-import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { Component } from '@angular/core';
 import {
   inject,
-  beforeEach,
-  describe,
-  beforeEachProviders,
-  it,
-  async
+  async,
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
 import { MenuService } from './menu.service';
 import { Hash } from './hash.service';
 import { ScrollService } from './scroll.service';
@@ -21,37 +15,21 @@ import { SpecManager } from '../utils/SpecManager';;
 describe('Menu service', () => {
   let menu, hashService, scroll;
   let builder;
-  let specMgr = new SpecManager();
+  let specMgr;
 
-  beforeEachProviders(() => [
-    provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
-    provide(Hash, {useClass: Hash}),
-    provide(ScrollService, {useClass: ScrollService}),
-    provide(SpecManager, {useValue: new SpecManager()})
-  ]);
-
-  beforeEach(async(inject([Hash, ScrollService, TestComponentBuilder, SpecManager],
-  (_hash, _scroll, tcb, _specMgr) => {
+  beforeEach(async(inject([TestComponentBuilder, SpecManager, Hash, ScrollService],
+  (tcb, _specMgr, _hash, _scroll, _menu) => {
     hashService = _hash;
     scroll = _scroll;
     builder = tcb;
     specMgr = _specMgr;
+    return specMgr.load('/tests/schemas/extended-petstore.yml');
   })));
 
-  beforeEach(done => {
-    specMgr.load('/tests/schemas/extended-petstore.yml').then(r => {
-      done();
-    }).catch(e => {
-      done.fail(e);
-    });
-  });
-
-  beforeEach(done => {
+  beforeEach(() => {
     menu = new MenuService(hashService, scroll, specMgr);
-    builder.createAsync(TestAppComponent).then(fixture => {
-      fixture.detectChanges();
-      done();
-    }).catch(err => done.fail(err) );
+    let fixture = builder.createSync(TestAppComponent);
+    fixture.detectChanges();
   });
 
   it('should run hashScroll when hash changed', (done) => {

lib/services/options.service.spec.ts

@@ -1,10 +1,6 @@
 'use strict';
 
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
-import {
-  it
-} from '@angular/core/testing';
-
 import { OptionsService } from './options.service';
 
 describe('Options Service', () => {

lib/services/schema-normalizer.service.spec.ts

@@ -1,10 +1,5 @@
 'use strict';
 import { SchemaNormalizer } from './schema-normalizer.service';
-import {
-  describe,
-  it
-} from '@angular/core/testing';
-
 import { SpecManager } from '../utils/SpecManager';;
 
 describe('Spec Helper', () => {

lib/shared/components/StickySidebar/sticky-sidebar.spec.ts

@@ -1,18 +1,12 @@
 'use strict';
 
 import { getChildDebugElementByType } from '../../../../tests/helpers';
-import { Component, provide } from '@angular/core';
-import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
-
+import { Component } from '@angular/core';
 import {
   inject,
-  beforeEach,
-  beforeEachProviders,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
 import { StickySidebar } from '../index';
 
 describe('Common components', () => {
@@ -21,20 +15,12 @@ describe('Common components', () => {
     let component;
     let fixture;
 
-    beforeEachProviders(() => [
-      provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()})
-    ]);
     beforeEach(inject([TestComponentBuilder], (tcb) => {
       builder = tcb;
+      fixture = builder.createSync(TestApp);
+      let debugEl = getChildDebugElementByType(fixture.debugElement, StickySidebar);
+      component = debugEl.injector.get(StickySidebar);
     }));
-    beforeEach((done) => {
-      builder.createAsync(TestApp).then(_fixture => {
-        fixture = _fixture;
-        let debugEl = getChildDebugElementByType(fixture.debugElement, StickySidebar);
-        component = debugEl.injector.get(StickySidebar);
-        done();
-      }, err => done.fail(err));
-    });
 
 
     it('should init component', () => {

lib/shared/components/StickySidebar/sticky-sidebar.ts

@@ -1,7 +1,7 @@
 'use strict';
 
 import { Directive, ElementRef, Input, OnInit, OnDestroy } from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 @Directive({
   selector: '[sticky-sidebar]'

lib/shared/components/Tabs/tabs.spec.ts

@@ -5,12 +5,9 @@ import { Component } from '@angular/core';
 
 import {
   inject,
-  beforeEach,
-  it
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
-
 import {Tabs, Tab} from '../index';
 
 describe('Common components', () => {
@@ -24,18 +21,12 @@ describe('Common components', () => {
 
     beforeEach(inject([TestComponentBuilder], (tcb) => {
       builder = tcb;
+      fixture = builder.createSync(TestApp);
+      hostComponent = fixture.debugElement.componentInstance;
+      debugEl = getChildDebugElement(fixture.debugElement, 'tabs');
+      childDebugEls = getChildDebugElementAll(debugEl, 'tab');
+      component = debugEl.componentInstance;
     }));
-    beforeEach((done) => {
-      builder.createAsync(TestApp).then(_fixture => {
-        fixture = _fixture;
-        hostComponent = fixture.debugElement.componentInstance;
-        debugEl = getChildDebugElement(fixture.debugElement, 'tabs');
-        childDebugEls = getChildDebugElementAll(debugEl, 'tab');
-        component = debugEl.componentInstance;
-        done();
-      }, err => done.fail(err));
-    });
-
 
     it('should init component', () => {
       expect(component).not.toBeNull();

lib/shared/components/Zippy/zippy.spec.ts

@@ -5,12 +5,10 @@ import { getChildDebugElement, mouseclick } from '../../../../tests/helpers';
 import { Component } from '@angular/core';
 import {
   inject,
-  beforeEach,
-  it,
-  expect
+  expect,
+  TestComponentBuilder
 } from '@angular/core/testing';
 
-import { TestComponentBuilder } from '@angular/compiler/testing';
 import { Zippy } from '../index';
 
 describe('Common components', () => {
@@ -22,17 +20,11 @@ describe('Common components', () => {
 
     beforeEach(inject([TestComponentBuilder], (tcb) => {
       builder = tcb;
+      fixture = builder.createSync(TestApp);
+      let debugEl = getChildDebugElement(fixture.debugElement, 'zippy');
+      component = debugEl.componentInstance;
+      nativeElement = debugEl.nativeElement;
     }));
-    beforeEach((done) => {
-      builder.createAsync(TestApp).then(_fixture => {
-        fixture = _fixture;
-        let debugEl = getChildDebugElement(fixture.debugElement, 'zippy');
-        component = debugEl.componentInstance;
-        nativeElement = debugEl.nativeElement;
-        done();
-      }, err => done.fail(err));
-    });
-
 
     it('should init component', () => {
       expect(component).not.toBeNull();

package.json

@@ -32,17 +32,11 @@
   "jspm": {
     "configFile": "system.config.js",
     "dependencies": {
-      "@angular/common": "npm:@angular/common@^2.0.0-rc.2",
-      "@angular/common@2.0.0-rc.3": "npm:@angular/common@2.0.0-rc.3",
-      "@angular/compiler": "npm:@angular/compiler@^2.0.0-rc.2",
-      "@angular/compiler@2.0.0-rc.3": "npm:@angular/compiler@2.0.0-rc.3",
-      "@angular/core": "npm:@angular/core@^2.0.0-rc.2",
-      "@angular/core@2.0.0-rc.3": "npm:@angular/core@2.0.0-rc.3",
-      "@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.2",
-      "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.2",
-      "@angular/platform-browser-dynamic@2.0.0-rc.3": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3",
-      "@angular/platform-browser@2.0.0-rc.3": "npm:@angular/platform-browser@2.0.0-rc.3",
-      "@angular/platform-server@2.0.0-rc.3": "npm:@angular/platform-server@2.0.0-rc.3",
+      "@angular/common@2.0.0-rc.4": "npm:@angular/common@2.0.0-rc.4",
+      "@angular/compiler@2.0.0-rc.4": "npm:@angular/compiler@2.0.0-rc.4",
+      "@angular/core@2.0.0-rc.4": "npm:@angular/core@2.0.0-rc.4",
+      "@angular/platform-browser-dynamic@2.0.0-rc.4": "npm:@angular/platform-browser-dynamic@2.0.0-rc.4",
+      "@angular/platform-browser@2.0.0-rc.4": "npm:@angular/platform-browser@2.0.0-rc.4",
       "dropkickjs": "npm:dropkickjs@^2.1.8",
       "es6-shim": "github:es-shims/es6-shim@^0.33.6",
       "hint.css": "npm:hint.css@^2.2.1",
@@ -82,12 +76,12 @@
     }
   },
   "devDependencies": {
-    "@angular/common": "^2.0.0-rc.3",
-    "@angular/compiler": "^2.0.0-rc.3",
-    "@angular/core": "^2.0.0-rc.2",
-    "@angular/platform-browser": "^2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.3",
-    "@angular/platform-server": "^2.0.0-rc.3",
+    "@angular/common": "^2.0.0-rc.4",
+    "@angular/compiler": "^2.0.0-rc.4",
+    "@angular/core": "^2.0.0-rc.4",
+    "@angular/platform-browser": "^2.0.0-rc.4",
+    "@angular/platform-browser-dynamic": "^2.0.0-rc.4",
+    "@angular/platform-server": "^2.0.0-rc.4",
     "babel-polyfill": "^6.3.14",
     "branch-release": "^1.0.3",
     "browser-sync": "^2.10.1",
@@ -139,7 +133,7 @@
     "should": "^9.0.2",
     "sinon": "^1.17.2",
     "systemjs-builder": "^0.15.16",
-    "tslint": "^3.11.0",
+    "tslint": "^3.13.0",
     "tslint-stylish": "^2.1.0-beta",
     "typescript": "^1.8.10",
     "vinyl-paths": "^2.0.0",

system.config.js

@@ -16,17 +16,11 @@ System.config({
   },
 
   map: {
-    "@angular/common": "npm:@angular/common@2.0.0-rc.3",
-    "@angular/common@2.0.0-rc.3": "npm:@angular/common@2.0.0-rc.3",
-    "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3",
-    "@angular/compiler@2.0.0-rc.3": "npm:@angular/compiler@2.0.0-rc.3",
-    "@angular/core": "npm:@angular/core@2.0.0-rc.3",
-    "@angular/core@2.0.0-rc.3": "npm:@angular/core@2.0.0-rc.3",
-    "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3",
-    "@angular/platform-browser-dynamic@2.0.0-rc.3": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3",
-    "@angular/platform-browser@2.0.0-rc.3": "npm:@angular/platform-browser@2.0.0-rc.3",
-    "@angular/platform-server@2.0.0-rc.3": "npm:@angular/platform-server@2.0.0-rc.3",
+    "@angular/common": "npm:@angular/common@2.0.0-rc.4",
+    "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.4",
+    "@angular/core": "npm:@angular/core@2.0.0-rc.4",
+    "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.4",
+    "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.4",
     "babel": "npm:babel-core@5.8.34",
     "babel-runtime": "npm:babel-runtime@5.8.34",
     "clean-css": "npm:clean-css@3.4.17",
@@ -122,39 +116,32 @@ System.config({
     "github:jspm/nodelibs-zlib@0.1.0": {
       "browserify-zlib": "npm:browserify-zlib@0.1.4"
     },
-    "npm:@angular/common@2.0.0-rc.3": {
-      "@angular/core": "npm:@angular/core@2.0.0-rc.3",
+    "npm:@angular/common@2.0.0-rc.4": {
+      "@angular/core": "npm:@angular/core@2.0.0-rc.4",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:@angular/compiler@2.0.0-rc.3": {
-      "@angular/core": "npm:@angular/core@2.0.0-rc.3",
+    "npm:@angular/compiler@2.0.0-rc.4": {
+      "@angular/core": "npm:@angular/core@2.0.0-rc.4",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:@angular/core@2.0.0-rc.3": {
+    "npm:@angular/core@2.0.0-rc.4": {
       "process": "github:jspm/nodelibs-process@0.1.2",
       "rxjs": "npm:rxjs@5.0.0-beta.6",
       "zone.js": "npm:zone.js@0.6.12"
     },
-    "npm:@angular/platform-browser-dynamic@2.0.0-rc.3": {
-      "@angular/common": "npm:@angular/common@2.0.0-rc.3",
-      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3",
-      "@angular/core": "npm:@angular/core@2.0.0-rc.3",
-      "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3",
+    "npm:@angular/platform-browser-dynamic@2.0.0-rc.4": {
+      "@angular/common": "npm:@angular/common@2.0.0-rc.4",
+      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.4",
+      "@angular/core": "npm:@angular/core@2.0.0-rc.4",
+      "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.4",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:@angular/platform-browser@2.0.0-rc.3": {
-      "@angular/common": "npm:@angular/common@2.0.0-rc.3",
-      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3",
-      "@angular/core": "npm:@angular/core@2.0.0-rc.3",
+    "npm:@angular/platform-browser@2.0.0-rc.4": {
+      "@angular/common": "npm:@angular/common@2.0.0-rc.4",
+      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.4",
+      "@angular/core": "npm:@angular/core@2.0.0-rc.4",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:@angular/platform-server@2.0.0-rc.3": {
-      "@angular/common": "npm:@angular/common@2.0.0-rc.3",
-      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3",
-      "@angular/core": "npm:@angular/core@2.0.0-rc.3",
-      "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3",
-      "parse5": "npm:parse5@1.3.2"
-    },
     "npm:amdefine@1.0.0": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "module": "github:jspm/nodelibs-module@0.1.0",
@@ -686,9 +673,6 @@ System.config({
       "pbkdf2": "npm:pbkdf2@3.0.4",
       "systemjs-json": "github:systemjs/plugin-json@0.1.2"
     },
-    "npm:parse5@1.3.2": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
     "npm:path-browserify@0.0.0": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },

tests/setup.ts

@@ -2,7 +2,8 @@
 
 import {setBaseTestProviders} from '@angular/core/testing';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
-import { OptionsService, RedocEventsService} from '../lib/services/index';
+import { OptionsService, RedocEventsService, Hash, ScrollService, MenuService } from '../lib/services/index';
+import { SpecManager } from '../lib/utils/SpecManager';
 import { provide } from '@angular/core';
 
 import {
@@ -15,6 +16,10 @@ setBaseTestProviders(
     TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
     provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
     provide(OptionsService, {useClass: OptionsService}),
-    provide(RedocEventsService, {useClass: RedocEventsService})
+    provide(RedocEventsService, {useClass: RedocEventsService}),
+    provide(SpecManager, {useClass: SpecManager}),
+    provide(Hash, {useClass: Hash}),
+    provide(ScrollService, {useClass: ScrollService}),
+    provide(MenuService, {useClass: MenuService})
   ],
   [TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS]);