Remove and address sleep statements in wp-jetpack-plans-spec.js (#1737

)

* Add `waitTillPresentAndDisplayed` to `clickPurchaseButton` function
* Add `waitTillPresentAndDisplayed` to `clickUpgradeNudge` function
* Remove `sleep` statements

lib/pages/jetpack-plans-sales-page.js

@@ -12,6 +12,7 @@ export default class JetpackPlansSalesPage extends AsyncBaseContainer {
 
 	async clickPurchaseButton() {
 		const selector = By.css( '.cta-install #btn-mast-getstarted' );
+		await driverHelper.waitTillPresentAndDisplayed( this.driver, selector );
 		return await driverHelper.clickWhenClickable( this.driver, selector );
 	}
 }

lib/pages/wp-admin/wp-admin-jetpack-page.js

@@ -36,6 +36,7 @@ export default class WPAdminJetpackPage extends AsyncBaseContainer {
 
 	async clickUpgradeNudge() {
 		const selector = By.css( '.dops-notice a[href*="upgrade"]' );
+		await driverHelper.waitTillPresentAndDisplayed( this.driver, selector );
 		return await driverHelper.clickWhenClickable( this.driver, selector );
 	}
 

specs-jetpack-calypso/wp-jetpack-plans-spec.js

@@ -65,13 +65,11 @@ describe( `[${ host }] Jetpack Plans: (${ screenSize }) @jetpack`, function() {
 		step( 'Can find and click Upgrade nudge button', async function() {
 			await driverHelper.refreshIfJNError( driver );
 			const jetpackDashboard = await WPAdminJetpackPage.Expect( driver );
-			await driver.sleep( 3000 ); // The nudge buttons are loaded after the page, and there's no good loaded status indicator to key off of
 			return await jetpackDashboard.clickUpgradeNudge();
 		} );
 
 		step( 'Can click the Proceed button', async function() {
 			const jetpackPlanSalesPage = await JetpackPlanSalesPage.Expect( driver );
-			await driver.sleep( 3000 ); // The upgrade buttons are loaded after the page, and there's no good loaded status indicator to key off of
 			return await jetpackPlanSalesPage.clickPurchaseButton();
 		} );