Run Jetpack smoke test against multiple test accounts (#1365)

* Run Jetpack smoke test against multiple test accounts

* Add Jetpack users and refine spec file

lib/flows/jetpack-connect-flow.js

@@ -96,6 +96,7 @@ export default class JetpackConnectFlow {
 	async disconnectFromWPAdmin( account ) {
 		// 'Login into wporg site'
 		const user = dataHelper.getAccountConfig( account );
+		await driverManager.clearCookiesAndDeleteLocalStorage( this.driver );
 		const loginPage = await WPAdminLogonPage.Visit( this.driver, user[ 2 ] );
 		await loginPage.login( user[ 0 ], user[ 1 ] );
 
@@ -106,6 +107,6 @@ export default class JetpackConnectFlow {
 		// 'Can disconnect site if connected'
 		const wpAdminJetpack = await WPAdminJetpackPage.Expect( this.driver );
 		if ( ! await wpAdminJetpack.atAGlanceDisplayed() ) return;
-		return wpAdminJetpack.disconnectSite();
+		return await wpAdminJetpack.disconnectSite();
 	}
 }

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

@@ -51,6 +51,10 @@ export default class WPAdminJetpackPage extends AsyncBaseContainer {
 		await driverHelper.clickWhenClickable( this.driver, manageConnectionButton );
 		await driverHelper.clickWhenClickable( this.driver, disconnectButton );
 
-		return await driverHelper.waitTillPresentAndDisplayed( this.driver, successDisconnectNotice );
+		return await driverHelper.waitTillPresentAndDisplayed(
+			this.driver,
+			successDisconnectNotice,
+			this.explicitWaitMS * 2
+		);
 	}
 }

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

@@ -11,9 +11,9 @@ export default class WPAdminPostsPage extends AsyncBaseContainer {
 	}
 
 	async viewFirstPost() {
-		const viewAnchor = By.css( '.row-actions .view a' );
+		const viewAnchor = By.css( '.status-publish .row-actions .view a' );
 		const postPage = By.css( '#page' );
-
+		await driverHelper.waitTillPresentAndDisplayed( this.driver, viewAnchor );
 		await driverHelper.followLinkWhenFollowable( this.driver, viewAnchor );
 		return await driverHelper.waitTillPresentAndDisplayed( this.driver, postPage );
 	}

specs-jetpack/connect-disconnect-spec.js

@@ -9,13 +9,15 @@ import WPAdminLogonPage from '../lib/pages/wp-admin/wp-admin-logon-page';
 import WPAdminSidebar from '../lib/pages/wp-admin/wp-admin-sidebar.js';
 import JetpackConnectFlow from '../lib/flows/jetpack-connect-flow';
 import WPAdminPostsPage from '../lib/pages/wp-admin/wp-admin-posts-page';
+import WPAdminDashboardPage from '../lib/pages/wp-admin/wp-admin-dashboard-page';
 import * as driverManager from '../lib/driver-manager';
 import * as dataHelper from '../lib/data-helper';
 
 const mochaTimeOut = config.get( 'mochaTimeoutMS' );
 const startBrowserTimeoutMS = config.get( 'startBrowserTimeoutMS' );
 const screenSize = driverManager.currentScreenSize();
-const user = dataHelper.getAccountConfig( 'asoJetpackUser' );
+const jetpackUser = process.env.JETPACKUSER;
+const user = dataHelper.getAccountConfig( jetpackUser );
 let driver;
 
 before( async function() {
@@ -27,11 +29,11 @@ describe( 'Disconnect wporg site', function() {
 	this.timeout( mochaTimeOut );
 
 	step( 'Can disconnect wporg site', async function() {
-		await driverManager.ensureNotLoggedIn( driver );
+		await driverManager.clearCookiesAndDeleteLocalStorage( driver, user[ 2 ] );
 		await new JetpackConnectFlow( driver, 'jetpackConnectUser' ).disconnectFromWPAdmin(
-			'asoJetpackUser'
+			jetpackUser
 		);
-		await driverManager.clearCookiesAndDeleteLocalStorage( driver );
+		await driverManager.clearCookiesAndDeleteLocalStorage( driver, user[ 2 ] );
 	} );
 } );
 
@@ -69,6 +71,14 @@ describe( `Jetpack Connect and Disconnect: (${ screenSize })`, function() {
 		} );
 
 		step( 'Can click the free plan button', async function() {
+			// Some of the users are not the plan owners, so skipping this step for them
+			if (
+				[ 'siteGroundJetpackUser', 'bluehostJetpackUserSub', 'goDaddyJetpackUserSub' ].includes(
+					jetpackUser
+				)
+			) {
+				return await WPAdminDashboardPage.Visit( driver, user[ 2 ] );
+			}
 			const pickAPlanPage = await PickAPlanPage.Expect( driver );
 			return await pickAPlanPage.selectFreePlanJetpack();
 		} );
@@ -88,7 +98,7 @@ describe( `Jetpack Connect and Disconnect: (${ screenSize })`, function() {
 		step( 'Can disconnect Jetpack connection in wp-admin', async function() {
 			await driverManager.clearCookiesAndDeleteLocalStorage( driver, user[ 2 ] );
 			await new JetpackConnectFlow( driver, 'jetpackConnectUser' ).disconnectFromWPAdmin(
-				'asoJetpackUser'
+				jetpackUser
 			);
 		} );
 

specs-jetpack/runner.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+export JETPACKHOST=PRESSABLE
+export TARGET=JETPACK
+array=( 'goDaddyJetpackUser' 'asoJetpackUser' 'goDaddyJetpackUserSub'
+'bluehostJetpackUser' 'bluehostJetpackUserSub' 'siteGroundJetpackUser')
+
+for i in "${array[@]}"
+do
+  export JETPACKUSER="$i"
+	eval "./node_modules/.bin/mocha ./specs-jetpack/connect-disconnect-spec.js &"
+done