WIP e2e tests

Author: Nathan Jones

src/test-e2e/app.po.ts

@@ -2,7 +2,7 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.driver.get('/');
   }
 
   getParagraphText() {

src/test-e2e/e2e.ts

@@ -195,28 +195,34 @@ export class E2ESetup {
     return userType === ConsoleUserType.admin ? this.adminReq : this.userReq;
   }
 
-  private async doSetup() {
+  private doSetup() {
+    const p = promise.fulfilled(true);
+
     // Create the sessions neeed
     if (this.needAdminSession) {
-      await this.createSession(this.adminReq, ConsoleUserType.admin);
+      p.then(() => this.createSession(this.adminReq, ConsoleUserType.admin));
     }
 
     if (this.needUserSession) {
-      await this.createSession(this.userReq, ConsoleUserType.user);
+      p.then(() => this.createSession(this.userReq, ConsoleUserType.user));
     }
 
-    this.setupOps.forEach(async op => {
-      await protractor.promise.controlFlow().execute(() => op.bind(this)());
+    this.setupOps.forEach(op => {
+      p.then(() => protractor.promise.controlFlow().execute(() => op.bind(this)()));
     });
+
+    return promise;
   }
 
   private addSetupOp(fn: Function, desc?: string) {
+    const that = this;
     this.setupOps.push(() => protractor.promise.controlFlow().execute(() => {
       E2E.debugLog(desc || 'Performing setup op');
       return fn();
     }));
     return this;
   }
+
 }
 
 /**

src/test-e2e/endpoints/endpoints.po.ts

@@ -16,11 +16,9 @@ export class EndpointsTable extends ListTableComponent {
 
   async getEndpointData(row: ElementFinder) {
     const allRows = row.all(by.tagName('app-table-cell') as ElementFinder);
-    const favoriteCell = allRows.get(6);
-    const favElement = favoriteCell.element(`app-table-cell-favorite app-table-cell-favorite ${FavoritesStarMock.BASE_CLASS_SELECTOR}`);
-    console.log(await favElement.getText());
+    const star = await allRows.get(6).getWebElement();
     const favorite = new FavoritesStarMock(
-      favElement
+      element(star)
     );
     const data = {
       name: await allRows.get(0).getText(),
@@ -55,7 +53,7 @@ export class EndpointsTable extends ListTableComponent {
 
   async setEndpointAsFavorite(name: string) {
     const data = await this.getEndpointDataForEndpoint(name);
-    data.favorite.set();
+    await data.favorite.set();
   }
 
   openActionMenu(row: ElementFinder) {

src/test-e2e/home/home-e2e.spec.ts

@@ -28,9 +28,9 @@ fdescribe('Home', () => {
   fit('- should have favorites list', async () => {
     await endpointPage.navigateTo();
     await endpointPage.table.setEndpointAsFavorite(toConnect.name);
-    await dashboardPage.navigateTo();
-    await dashboardPage.favoritesList.waitUntilShown();
-    const starShown = await dashboardPage.favoritesList.endpointCard.isFavoriteStarShown();
-    expect(starShown).toBe(true);
+    // await dashboardPage.navigateTo();
+    // await dashboardPage.favoritesList.waitUntilShown();
+    // const starShown = await dashboardPage.favoritesList.endpointCard.isFavoriteStarShown();
+    // expect(starShown).toBe(true);
   });
 });

src/test-e2e/po/favorites/favorite-star.po.ts

@@ -8,8 +8,9 @@ export class FavoritesStarMock extends Component {
   }
 
   public async isFavorite() {
-    const favoriteIcon = this.finder.element('mat-icon');
+    const favoriteIcon = this.finder;
     const icon = await favoriteIcon.getText();
+    console.log(icon)
     return icon === 'star';
   }
 

src/test-e2e/po/favorites/favorites-global-list.endpoint.component.po.ts

@@ -3,11 +3,10 @@ import { by, ElementFinder } from 'protractor';
 import { BASE_CSS_SELECTOR } from './favorite-test-helpers';
 import { MetaCard, MetaCardTitleType } from '../meta-card.po';
 
-export class FavoritesGlobalListEndpointMock extends MetaCard {
+export class FavoritesGlobalListEndpointMock {
   static readonly SELECTOR = `${BASE_CSS_SELECTOR}__endpoint-card`;
   constructor(groupElementFinder: ElementFinder) {
-    groupElementFinder.getText().then(console.log);
-    const endpointCard = groupElementFinder.element(by.css(FavoritesGlobalListEndpointMock.SELECTOR));
-    super(endpointCard, MetaCardTitleType.CUSTOM);
+    // const endpointCard = groupElementFinder.element(by.css(FavoritesGlobalListEndpointMock.SELECTOR));
+    // super(endpointCard, MetaCardTitleType.CUSTOM);
   }
 }