Skip to content
This repository has been archived by the owner on Feb 18, 2021. It is now read-only.

Commit

Permalink
Try workaround for #1302
Browse files Browse the repository at this point in the history
  • Loading branch information
alisterscott committed Jun 25, 2018
1 parent 3eb09ea commit 62196b3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
16 changes: 13 additions & 3 deletions lib/pages/view-page-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,25 @@ import * as driverHelper from '../driver-helper.js';

export default class ViewPagePage extends AsyncBaseContainer {
constructor( driver ) {
super( driver, By.css( '.type-page' ) );
super( driver, By.css( 'body' ) );
}

async _postInit() {
// Workaround for https://github.com/Automattic/wp-e2e-tests/issues/1302
await this.driver.navigate().refresh();
await driverHelper.waitTillPresentAndDisplayed( this.driver, By.css( '.type-page' ) );
}

async pageTitle() {
return await this.driver.findElement( By.css( '.entry-title,.post-title' ) ).getText();
const pageTitleSelector = By.css( '.entry-title,.post-title' );
await driverHelper.waitTillPresentAndDisplayed( this.driver, pageTitleSelector );
return await this.driver.findElement( pageTitleSelector ).getText();
}

async pageContent() {
return await this.driver.findElement( By.css( '.entry-content,.post-content' ) ).getText();
const pageContentSelector = By.css( '.entry-content,.post-content' );
await driverHelper.waitTillPresentAndDisplayed( this.driver, pageContentSelector );
return await this.driver.findElement( pageContentSelector ).getText();
}

async sharingButtonsVisible() {
Expand Down
16 changes: 13 additions & 3 deletions lib/pages/view-post-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@ import PaymentButtonFrontEndComponent from '../components/payment-button-front-e

export default class ViewPostPage extends AsyncBaseContainer {
constructor( driver ) {
super( driver, By.css( '.type-post' ) );
super( driver, By.css( 'body' ) );
}

async _postInit() {
// Workaround for https://github.com/Automattic/wp-e2e-tests/issues/1302
await this.driver.navigate().refresh();
await driverHelper.waitTillPresentAndDisplayed( this.driver, By.css( '.type-post' ) );
}

async postTitle() {
return await this.driver.findElement( By.css( '.entry-title,.post-title' ) ).getText();
const postTitleSelector = By.css( '.entry-title,.post-title' );
await driverHelper.waitTillPresentAndDisplayed( this.driver, postTitleSelector );
return await this.driver.findElement( postTitleSelector ).getText();
}

async commentsVisible() {
Expand All @@ -24,7 +32,9 @@ export default class ViewPostPage extends AsyncBaseContainer {
}

async postContent() {
return await this.driver.findElement( By.css( '.entry-content,.post-content' ) ).getText();
const postContentSelector = By.css( '.entry-content,.post-content' );
await driverHelper.waitTillPresentAndDisplayed( this.driver, postContentSelector );
return await this.driver.findElement( postContentSelector ).getText();
}

async categoryDisplayed() {
Expand Down
8 changes: 7 additions & 1 deletion lib/pages/view-site-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ import * as driverHelper from '../driver-helper.js';

export default class ViewSitePage extends AsyncBaseContainer {
constructor( driver, url = null ) {
super( driver, by.css( '.home' ), url );
super( driver, by.css( 'body' ), url );
}

async _postInit() {
// Workaround for https://github.com/Automattic/wp-e2e-tests/issues/1302
await this.driver.navigate().refresh();
await driverHelper.waitTillPresentAndDisplayed( this.driver, by.css( '.home' ) );
}

async viewFirstPost() {
Expand Down

0 comments on commit 62196b3

Please sign in to comment.