* docs(toh-6/dart): refactoring of 'add, edit, delete heroes' Refactoring of "add, edit, delete heroes" section of toh-6 from one big bottom-up step into small independent feature slices, where the user achieves a "milesone" (i.e., can run the full app) after each feature section. The section rewrite is shorter and offers a better UX. Other simplifications: - Error handling is consistent: in the hero service we log to the console, everwhere else we just let errors bubble up. - Hero service methods renamed based on function (create, update) rather then lower-level implementation (post, put). - @Output properties have been eliminated (since they weren't explained). E2E tests now pass on both the TS and Dart sides. * docs(toh-6/ts): refactoring of 'add, edit, delete heroes' Refactoring of "add, edit, delete heroes" section of toh-6 from one big bottom-up step into small independent feature slices, where the user achieves a "milesone" (i.e., can run the full app) after each feature section. The section rewrite is shorter and offers a better UX. Other simplifications: - Error handling is consistent: in the hero service we log to the console, everwhere else we just let errors bubble up. - Hero service methods renamed based on function (create, update) rather then lower-level implementation (post, put). - @Output properties have been eliminated (since they weren't explained). E2E tests now pass on both the TS and Dart sides. Post-Dart-review updates included. * docs(toh-6): ward tweaks
		
			
				
	
	
		
			284 lines
		
	
	
		
			9.5 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
			
		
		
	
	
			284 lines
		
	
	
		
			9.5 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
| /// <reference path='../_protractor/e2e.d.ts' />
 | |
| 'use strict';
 | |
| 
 | |
| const expectedH1 = 'Tour of Heroes';
 | |
| const expectedTitle = `Angular 2 ${expectedH1}`;
 | |
| const targetHero = { id: 15, name: 'Magneta' };
 | |
| const targetHeroDashboardIndex = 3;
 | |
| const nameSuffix = 'X';
 | |
| const newHeroName = targetHero.name + nameSuffix;
 | |
| 
 | |
| type WPromise<T> = webdriver.promise.Promise<T>;
 | |
| 
 | |
| class Hero {
 | |
|   id: number;
 | |
|   name: string;
 | |
| 
 | |
|   // Factory methods
 | |
| 
 | |
|   // Hero from string formatted as '<id> <name>'.
 | |
|   static fromString(s: string): Hero {
 | |
|     return {
 | |
|       id: +s.substr(0, s.indexOf(' ')),
 | |
|       name: s.substr(s.indexOf(' ') + 1),
 | |
|     };
 | |
|   }
 | |
| 
 | |
|   // Hero from hero list <li> element.
 | |
|   static async fromLi(li: protractor.ElementFinder): Promise<Hero> {
 | |
|       let strings = await li.all(by.xpath('span')).getText();
 | |
|       return { id: +strings[0], name: strings[1] };
 | |
|   }
 | |
| 
 | |
|   // Hero id and name from the given detail element.
 | |
|   static async fromDetail(detail: protractor.ElementFinder): Promise<Hero> {
 | |
|     // Get hero id from the first <div>
 | |
|     let _id = await detail.all(by.css('div')).first().getText();
 | |
|     // Get name from the h2
 | |
|     let _name = await detail.element(by.css('h2')).getText();
 | |
|     return {
 | |
|         id: +_id.substr(_id.indexOf(' ') + 1),
 | |
|         name: _name.substr(0, _name.lastIndexOf(' '))
 | |
|     };
 | |
|   }
 | |
| }
 | |
| 
 | |
| describe('Tutorial part 6', () => {
 | |
| 
 | |
|   beforeAll(() => browser.get(''));
 | |
| 
 | |
|   function getPageElts() {
 | |
|     let hrefElts = element.all(by.css('my-app a'));
 | |
| 
 | |
|     return {
 | |
|       hrefs: hrefElts,
 | |
| 
 | |
|       myDashboardHref: hrefElts.get(0),
 | |
|       myDashboard: element(by.css('my-app my-dashboard')),
 | |
|       topHeroes: element.all(by.css('my-app my-dashboard > div h4')),
 | |
| 
 | |
|       myHeroesHref: hrefElts.get(1),
 | |
|       myHeroes: element(by.css('my-app my-heroes')),
 | |
|       allHeroes: element.all(by.css('my-app my-heroes li')),
 | |
|       selectedHero: element(by.css('my-app li.selected')),
 | |
|       selectedHeroSubview: element(by.css('my-app my-heroes > div:last-child')),
 | |
| 
 | |
|       heroDetail: element(by.css('my-app my-hero-detail > div')),
 | |
| 
 | |
|       searchBox: element(by.css('#search-box')),
 | |
|       searchResults: element.all(by.css('.search-result'))
 | |
|     };
 | |
|   }
 | |
| 
 | |
|   describe('Initial page', () => {
 | |
| 
 | |
|     it(`has title '${expectedTitle}'`, () => {
 | |
|         expect(browser.getTitle()).toEqual(expectedTitle);
 | |
|     });
 | |
| 
 | |
|     it(`has h1 '${expectedH1}'`, () => {
 | |
|         expectHeading(1, expectedH1);
 | |
|     });
 | |
| 
 | |
|     const expectedViewNames = ['Dashboard', 'Heroes'];
 | |
|     it(`has views ${expectedViewNames}`, () => {
 | |
|       let viewNames = getPageElts().hrefs.map(el => el.getText());
 | |
|       expect(viewNames).toEqual(expectedViewNames);
 | |
|     });
 | |
| 
 | |
|     it('has dashboard as the active view', () => {
 | |
|       let page = getPageElts();
 | |
|       expect(page.myDashboard.isPresent()).toBeTruthy();
 | |
|     });
 | |
| 
 | |
|   });
 | |
| 
 | |
|   describe('Dashboard tests', () => {
 | |
| 
 | |
|     beforeAll(() => browser.get(''));
 | |
| 
 | |
|     it('has top heroes', () => {
 | |
|       let page = getPageElts();
 | |
|       expect(page.topHeroes.count()).toEqual(4);
 | |
|     });
 | |
| 
 | |
|     it(`selects and routes to ${targetHero.name} details`, dashboardSelectTargetHero);
 | |
| 
 | |
|     it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
 | |
| 
 | |
|     it(`cancels and shows ${targetHero.name} in Dashboard`, () => {
 | |
|       element(by.buttonText('Back')).click();
 | |
|       browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
 | |
| 
 | |
|       let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
 | |
|       expect(targetHeroElt.getText()).toEqual(targetHero.name);
 | |
|     });
 | |
| 
 | |
|     it(`selects and routes to ${targetHero.name} details`, dashboardSelectTargetHero);
 | |
| 
 | |
|     it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
 | |
| 
 | |
|     it(`saves and shows ${newHeroName} in Dashboard`, () => {
 | |
|       element(by.buttonText('Save')).click();
 | |
|       browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
 | |
| 
 | |
|       let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
 | |
|       expect(targetHeroElt.getText()).toEqual(newHeroName);
 | |
|     });
 | |
| 
 | |
|   });
 | |
| 
 | |
|   describe('Heroes tests', () => {
 | |
| 
 | |
|     beforeAll(() => browser.get(''));
 | |
| 
 | |
|     it('can switch to Heroes view', () => {
 | |
|       getPageElts().myHeroesHref.click();
 | |
|       let page = getPageElts();
 | |
|       expect(page.myHeroes.isPresent()).toBeTruthy();
 | |
|       expect(page.allHeroes.count()).toEqual(10, 'number of heroes');
 | |
|     });
 | |
| 
 | |
|     it(`selects and shows ${targetHero.name} as selected in list`, () => {
 | |
|       getHeroLiEltById(targetHero.id).click();
 | |
|       expect(Hero.fromLi(getPageElts().selectedHero)).toEqual(targetHero);
 | |
|     });
 | |
| 
 | |
|     it('shows selected hero subview', () => {
 | |
|       let page = getPageElts();
 | |
|       let title = page.selectedHeroSubview.element(by.css('h2')).getText();
 | |
|       let expectedTitle = `${targetHero.name.toUpperCase()} is my hero`;
 | |
|       expect(title).toEqual(expectedTitle);
 | |
|     });
 | |
| 
 | |
|     it('can route to hero details', () => {
 | |
|       element(by.buttonText('View Details')).click();
 | |
| 
 | |
|       let page = getPageElts();
 | |
|       expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
 | |
|       let hero = Hero.fromDetail(page.heroDetail);
 | |
|       expect(hero).toEqual(targetHero);
 | |
|     });
 | |
| 
 | |
|     it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
 | |
| 
 | |
|     it(`shows ${newHeroName} in Heroes list`, () => {
 | |
|       element(by.buttonText('Save')).click();
 | |
|       browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
 | |
|       let expectedHero = {id: targetHero.id, name: newHeroName};
 | |
|       expect(Hero.fromLi(getHeroLiEltById(targetHero.id))).toEqual(expectedHero);
 | |
|     });
 | |
| 
 | |
|     it(`deletes ${newHeroName} from Heroes list`, async () => {
 | |
|       const heroesBefore = await toHeroArray(getPageElts().allHeroes);
 | |
|       const li = getHeroLiEltById(targetHero.id);
 | |
|       li.element(by.buttonText('x')).click();
 | |
| 
 | |
|       const page = getPageElts();
 | |
|       expect(page.myHeroes.isPresent()).toBeTruthy();
 | |
|       expect(page.allHeroes.count()).toEqual(9, 'number of heroes');
 | |
|       const heroesAfter = await toHeroArray(page.allHeroes);
 | |
|       const expectedHeroes =  heroesBefore.filter(h => h.name !== newHeroName);
 | |
|       expect(heroesAfter).toEqual(expectedHeroes);
 | |
|       expect(page.selectedHeroSubview.isPresent()).toBeFalsy();
 | |
|     });
 | |
| 
 | |
|     it(`adds back ${targetHero.name}`, async () => {
 | |
|       const newHeroName = 'Alice';
 | |
|       const heroesBefore = await toHeroArray(getPageElts().allHeroes);
 | |
|       const numHeroes = heroesBefore.length;
 | |
| 
 | |
|       sendKeys(element(by.css('input')), newHeroName);
 | |
|       element(by.buttonText('Add')).click();
 | |
| 
 | |
|       let page = getPageElts();
 | |
|       let heroesAfter = await toHeroArray(page.allHeroes);
 | |
|       expect(heroesAfter.length).toEqual(numHeroes + 1, 'number of heroes');
 | |
| 
 | |
|       expect(heroesAfter.slice(0, numHeroes)).toEqual(heroesBefore, 'Old heroes are still there');
 | |
| 
 | |
|       const maxId = heroesBefore[heroesBefore.length - 1].id;
 | |
|       expect(heroesAfter[numHeroes]).toEqual({id: maxId + 1, name: newHeroName});
 | |
|     });
 | |
|   });
 | |
| 
 | |
|   describe('Progressive hero search', () => {
 | |
| 
 | |
|     beforeAll(() => browser.get(''));
 | |
| 
 | |
|     it(`searches for 'Ma'`, async () => {
 | |
|       sendKeys(getPageElts().searchBox, 'Ma');
 | |
|       browser.sleep(1000);
 | |
|       expect(getPageElts().searchResults.count()).toBe(4);
 | |
|     });
 | |
| 
 | |
|     it(`continues search with 'g'`, async () => {
 | |
|       sendKeys(getPageElts().searchBox, 'g');
 | |
|       browser.sleep(1000);
 | |
|       expect(getPageElts().searchResults.count()).toBe(2);
 | |
|     });
 | |
| 
 | |
|     it(`continues search with 'n' and gets ${targetHero.name}`, async () => {
 | |
|       sendKeys(getPageElts().searchBox, 'n');
 | |
|       browser.sleep(1000);
 | |
|       let page = getPageElts();
 | |
|       expect(page.searchResults.count()).toBe(1);
 | |
|       let hero = page.searchResults.get(0);
 | |
|       expect(hero.getText()).toEqual(targetHero.name);
 | |
|     });
 | |
| 
 | |
|     it(`navigates to ${targetHero.name} details view`, async () => {
 | |
|       let hero = getPageElts().searchResults.get(0);
 | |
|       expect(hero.getText()).toEqual(targetHero.name);
 | |
|       hero.click();
 | |
| 
 | |
|       let page = getPageElts();
 | |
|       expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
 | |
|       expect(Hero.fromDetail(page.heroDetail)).toEqual(targetHero);
 | |
|     });
 | |
|   });
 | |
| 
 | |
|   function dashboardSelectTargetHero() {
 | |
|     let targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
 | |
|     expect(targetHeroElt.getText()).toEqual(targetHero.name);
 | |
|     targetHeroElt.click();
 | |
|     browser.waitForAngular(); // seems necessary to gets tests to past for toh-6
 | |
| 
 | |
|     let page = getPageElts();
 | |
|     expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
 | |
|     let hero = Hero.fromDetail(page.heroDetail);
 | |
|     expect(hero).toEqual(targetHero);
 | |
|   }
 | |
| 
 | |
|   async function updateHeroNameInDetailView() {
 | |
|     // Assumes that the current view is the hero details view.
 | |
|     addToHeroName(nameSuffix);
 | |
| 
 | |
|     let hero = await Hero.fromDetail(getPageElts().heroDetail);
 | |
|     expect(hero).toEqual({id: targetHero.id, name: newHeroName});
 | |
|   }
 | |
| 
 | |
| });
 | |
| 
 | |
| function addToHeroName(text: string): WPromise<void> {
 | |
|   let input = element(by.css('input'));
 | |
|   return sendKeys(input, text);
 | |
| }
 | |
| 
 | |
| function expectHeading(hLevel: number, expectedText: string): void {
 | |
|     let hTag = `h${hLevel}`;
 | |
|     let hText = element(by.css(hTag)).getText();
 | |
|     expect(hText).toEqual(expectedText, hTag);
 | |
| };
 | |
| 
 | |
| function getHeroLiEltById(id: number): protractor.ElementFinder {
 | |
|   let spanForId = element(by.cssContainingText('li span.badge', id.toString()));
 | |
|   return spanForId.element(by.xpath('..'));
 | |
| }
 | |
| 
 | |
| async function toHeroArray(allHeroes: protractor.ElementArrayFinder): Promise<Hero[]> {
 | |
|   let promisedHeroes: Array<Promise<Hero>> = await allHeroes.map(Hero.fromLi);
 | |
|   // The cast is necessary to get around issuing with the signature of Promise.all()
 | |
|   return <Promise<any>> Promise.all(promisedHeroes);
 | |
| }
 |