angular · vicb · Nov 6, 2017 · Oct 19, 2017
diff --git a/aio/content/examples/toh-pt0/e2e/app.e2e-spec.ts b/aio/content/examples/toh-pt0/e2e/app.e2e-spec.ts
@@ -0,0 +1,14 @@
+'use strict'; // necessary for es6 output in node
+
+import { browser, element, by } from 'protractor';
+
+describe('Tour of Heroes', () => {
+  beforeEach(() => {
+    return browser.get('/');
+  });
+
+  it('should display "Tour of Heroes"', () => {
+    let title = element(by.css('app-root h1')).getText();
+    expect(title).toEqual('Tour of Heroes');
+  });
+});
diff --git a/aio/content/examples/toh-pt0/example-config.json b/aio/content/examples/toh-pt0/example-config.json
diff --git a/aio/content/examples/toh-pt0/plnkr.json b/aio/content/examples/toh-pt0/plnkr.json
@@ -0,0 +1,10 @@
+{
+  "description": "Tour of Heroes: Part 0",
+  "basePath": "src/",
+  "files":[
+    "!**/*.d.ts",
+    "!**/*.js",
+    "!**/*.[1].*"
+  ],
+  "tags": ["tutorial", "tour", "heroes"]
+}
diff --git a/aio/content/examples/toh-pt0/src/app/app.component.css b/aio/content/examples/toh-pt0/src/app/app.component.css
diff --git a/aio/content/examples/toh-pt0/src/app/app.component.html b/aio/content/examples/toh-pt0/src/app/app.component.html
@@ -0,0 +1 @@
+<h1>{{title}}</h1>
diff --git a/aio/content/examples/toh-pt0/src/app/app.component.spec.ts b/aio/content/examples/toh-pt0/src/app/app.component.spec.ts
@@ -0,0 +1,32 @@
+import { TestBed, async } from '@angular/core/testing';
+
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('app');
+  }));
+
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+  }));
+});
diff --git a/aio/content/examples/toh-pt0/src/app/app.component.ts b/aio/content/examples/toh-pt0/src/app/app.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+// #docregion set-title
+  title = 'Tour of Heroes';
+// #enddocregion set-title
+}
diff --git a/aio/content/examples/toh-pt0/src/app/app.module.ts b/aio/content/examples/toh-pt0/src/app/app.module.ts
@@ -0,0 +1,16 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/aio/content/examples/toh-pt0/src/index.html b/aio/content/examples/toh-pt0/src/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Tour of Heroes</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/aio/content/examples/toh-pt4/src/main.1.ts → aio/content/examples/toh-pt0/src/main.ts b/aio/content/examples/toh-pt4/src/main.1.ts → aio/content/examples/toh-pt0/src/main.ts
diff --git a/...content/examples/toh-pt5/src/styles.1.css → ...content/examples/toh-pt0/src/styles.1.css b/...content/examples/toh-pt5/src/styles.1.css → ...content/examples/toh-pt0/src/styles.1.css
@@ -1,4 +1,4 @@
-/* Master Styles */
+/* Application-wide Styles */
 h1 {
   color: #369;
   font-family: Arial, Helvetica, sans-serif;

diff --git a/aio/content/examples/toh-pt1/app/app.component.1.ts b/aio/content/examples/toh-pt1/app/app.component.1.ts
diff --git a/aio/content/examples/toh-pt1/e2e-spec.ts → ...tent/examples/toh-pt1/e2e/app.e2e-spec.ts b/aio/content/examples/toh-pt1/e2e-spec.ts → ...tent/examples/toh-pt1/e2e/app.e2e-spec.ts
@@ -4,7 +4,7 @@ import { browser, element, by, ElementFinder } from 'protractor';
 import { promise } from 'selenium-webdriver';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular ${expectedH1}`;
+const expectedTitle = `${expectedH1}`;
 
 class Hero {
   id: number;
@@ -49,7 +49,7 @@ describe('Tutorial part 1', () => {
     let page = getPageElts();
     let hero = await Hero.fromDetail(page.heroDetail);
     expect(hero.id).toEqual(expectedHero.id);
-    expect(hero.name).toEqual(expectedHero.name);
+    expect(hero.name).toEqual(expectedHero.name.toUpperCase());
   });
 
   it(`shows updated hero name`, async () => {
@@ -58,13 +58,13 @@ describe('Tutorial part 1', () => {
     let hero = await Hero.fromDetail(page.heroDetail);
     let newName = expectedHero.name + nameSuffix;
     expect(hero.id).toEqual(expectedHero.id);
-    expect(hero.name).toEqual(newName);
+    expect(hero.name).toEqual(newName.toUpperCase());
   });
 
 });
 
 function getPageElts() {
   return {
-    heroDetail: element(by.css('my-app'))
+    heroDetail: element(by.css('app-root'))
   };
 }
diff --git a/aio/content/examples/toh-pt1/plnkr.json b/aio/content/examples/toh-pt1/plnkr.json
@@ -4,7 +4,8 @@
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
-    "!**/*.[1].*"
+    "!**/*.[1].*",
+    "!**/dummy.module.ts"
   ],
   "tags": ["tutorial", "tour", "heroes"]
 }
diff --git a/aio/content/examples/toh-pt1/src/app/app.component.css b/aio/content/examples/toh-pt1/src/app/app.component.css
diff --git a/aio/content/examples/toh-pt1/src/app/app.component.html b/aio/content/examples/toh-pt1/src/app/app.component.html
@@ -0,0 +1,2 @@
+<h1>{{title}}</h1>
+<app-heroes></app-heroes>
diff --git a/aio/content/examples/toh-pt1/src/app/app.component.ts b/aio/content/examples/toh-pt1/src/app/app.component.ts
@@ -1,33 +1,10 @@
-// #docregion
 import { Component } from '@angular/core';
 
-// #docregion hero-class-1
-export class Hero {
-  id: number;
-  name: string;
-}
-// #enddocregion hero-class-1
-
 @Component({
-  selector: 'my-app',
-  // #docregion editing-Hero
-  template: `
-    <h1>{{title}}</h1>
-    <h2>{{hero.name}} details!</h2>
-    <div><label>id: </label>{{hero.id}}</div>
-    <div>
-      <label>name: </label>
-      <input [(ngModel)]="hero.name" placeholder="name">
-    </div>
-    `
-  // #enddocregion editing-Hero
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
 })
 export class AppComponent {
   title = 'Tour of Heroes';
-  // #docregion hero-property-1
-  hero: Hero = {
-    id: 1,
-    name: 'Windstorm'
-  };
-  // #enddocregion hero-property-1
 }
diff --git a/aio/content/examples/toh-pt1/src/app/app.module.ts b/aio/content/examples/toh-pt1/src/app/app.module.ts
@@ -1,18 +1,30 @@
+// #docplaster
 // #docregion
-import { NgModule }      from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule }   from '@angular/forms'; // <-- NgModel lives here
+import { NgModule } from '@angular/core';
+// #docregion formsmodule-js-import
+import { FormsModule } from '@angular/forms'; // <-- NgModel lives here
+// #enddocregion formsmodule-js-import
 
-import { AppComponent }  from './app.component';
+import { AppComponent } from './app.component';
+// #docregion heroes-import
+import { HeroesComponent } from './heroes/heroes.component';
+// #enddocregion heroes-import
 
 @NgModule({
+  // #docregion declarations
+  declarations: [
+    AppComponent,
+    HeroesComponent
+  ],
+  // #enddocregion declarations
+  // #docregion ng-imports
   imports: [
     BrowserModule,
-    FormsModule // <-- import the FormsModule before binding with [(ngModel)]
-  ],
-  declarations: [
-    AppComponent
+    FormsModule
   ],
-  bootstrap: [ AppComponent ]
+  // #enddocregion ng-imports
+  providers: [],
+  bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/aio/content/examples/toh-pt1/src/app/hero.ts b/aio/content/examples/toh-pt1/src/app/hero.ts
@@ -0,0 +1,4 @@
+export class Hero {
+  id: number;
+  name: string;
+}
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.1.html
@@ -0,0 +1,17 @@
+<!-- #docregion show-hero-1 -->
+{{hero}}
+<!-- #enddocregion show-hero-1 -->
+
+<!-- #docregion show-hero-2 -->
+<h2>{{ hero.name }} Details</h2>
+<div><span>id: </span>{{hero.id}}</div>
+<div><span>name: </span>{{hero.name}}</div>
+<!-- #enddocregion show-hero-2 -->
+
+<!-- #docregion name-input -->
+<div>
+    <label>name:
+      <input [(ngModel)]="hero.name" placeholder="name">
+    </label>
+</div>
+<!-- #enddocregion name-input -->
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.css
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.html
@@ -0,0 +1,10 @@
+<!-- #docregion -->
+<!-- #docregion pipe -->
+<h2>{{ hero.name | uppercase }} Details</h2>
+<!-- #enddocregion pipe -->
+<div><span>id: </span>{{hero.id}}</div>
+<div>
+    <label>name:
+      <input [(ngModel)]="hero.name" placeholder="name">
+    </label>
+</div>
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.spec.ts b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeroesComponent } from './heroes.component';
+
+describe('HeroesComponent', () => {
+  let component: HeroesComponent;
+  let fixture: ComponentFixture<HeroesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HeroesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeroesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.ts b/aio/content/examples/toh-pt1/src/app/heroes/heroes.component.ts
@@ -0,0 +1,35 @@
+// #docplaster
+// #docregion, v1
+import { Component, OnInit } from '@angular/core';
+// #enddocregion v1
+import { Hero } from '../hero';
+// #docregion v1
+
+@Component({
+  selector: 'app-heroes',
+  templateUrl: './heroes.component.html',
+  styleUrls: ['./heroes.component.css']
+})
+export class HeroesComponent implements OnInit {
+  // #enddocregion, v1
+  /*
+  // #docregion add-hero
+  hero = 'Windstorm';
+  // #enddocregion add-hero
+  */
+  // #docregion
+  // #docregion hero-property-1
+  hero: Hero = {
+    id: 1,
+    name: 'Windstorm'
+  };
+  // #enddocregion hero-property-1
+  // #docregion v1
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
+// #enddocregion, v1