Enhancement/1617 e2e coverage for scopes

assets/js/modules/analytics/common/account-create.js

@@ -162,10 +162,8 @@ export default function AccountCreate() {
 				<TimezoneSelect />
 			</div>
 
-			<p>
-				{ hasProvisioningScope && __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }
-				{ ! hasProvisioningScope && __( 'You will need to give Site Kit permission to create an Analytics account on your behalf and also accept the Google Analytics terms of service.', 'google-site-kit' ) }
-			</p>
+			{ hasProvisioningScope && <p id="googlesitekit_analytics_need_tos_redirect_msg">{ __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }</p> }
+			{ ! hasProvisioningScope && <p id="googlesitekit_analytics_need_permissions_msg">{ __( 'You will need to give Site Kit permission to create an Analytics account on your behalf and also accept the Google Analytics terms of service.', 'google-site-kit' ) }</p> }
 
 			<div className="googlesitekit-setup-module__action">
 				<Button

jest-puppeteer.config.js

@@ -30,6 +30,9 @@ module.exports = {
 		args: [
 			// https://peter.sh/experiments/chromium-command-line-switches/
 			...coreLaunchArgs,
+			'--disable-gpu',
+			'--no-sandbox',
+			'--disable-setuid-sandbox',
 			'--disable-dev-shm-usage',
 		],
 	},

tests/e2e/specs/modules/analytics/write-scope-requests.test.js

@@ -0,0 +1,242 @@
+/**
+ * Analytics write scope requests tests.
+ *
+ * Site Kit by Google, Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * WordPress dependencies
+ */
+import { activatePlugin, createURL, visitAdminPage } from '@wordpress/e2e-test-utils';
+
+/**
+ * Internal dependencies
+ */
+import {
+	deactivateUtilityPlugins,
+	resetSiteKit,
+	setSearchConsoleProperty,
+	useRequestInterception,
+} from '../../../utils';
+
+describe( 'Analytics write scope requests', () => {
+	let scope;
+	let bypassCreatePropertyRequest;
+	let bypassCreateProfileRequest;
+
+	beforeAll( async () => {
+		await page.setRequestInterception( true );
+		useRequestInterception( ( request ) => {
+			if ( request.url().startsWith( 'https://sitekit.withgoogle.com/o/oauth2/auth' ) ) {
+				request.respond( {
+					status: 302,
+					headers: {
+						location: createURL( '/wp-admin/index.php', `oauth2callback=1&code=valid-test-code&scope=${ scope }` ),
+					},
+				} );
+			} else if ( request.url().match( 'analytics/data/create-account-ticket' ) ) {
+				request.respond( {
+					status: 200,
+					body: JSON.stringify( { id: `${ Math.ceil( 1000 * Math.random() ) }` } ),
+				} );
+			} else if ( request.url().match( 'analytics/data/create-property' ) ) {
+				if ( bypassCreatePropertyRequest ) {
+					request.continue();
+					bypassCreatePropertyRequest = false;
+				} else {
+					request.respond( {
+						status: 200,
+						body: JSON.stringify( {
+							accountId: '100',
+							id: 'UA-100-1',
+							internalWebPropertyId: '200',
+							kind: 'analytics#webproperty',
+							level: 'STANDARD',
+							name: 'Test Property X',
+							websiteUrl: '/wp-admin/',
+							permissions: {
+								effective: [
+									'READ_AND_ANALYZE',
+								],
+							},
+						} ),
+					} );
+				}
+			} else if ( request.url().match( 'analytics/data/create-profile' ) ) {
+				if ( bypassCreateProfileRequest ) {
+					request.continue();
+					bypassCreateProfileRequest = false;
+				} else {
+					request.respond( {
+						status: 200,
+						body: JSON.stringify( {
+							id: '300',
+							accountId: '100',
+							webPropertyId: 'UA-100-1',
+							internalWebPropertyId: '200',
+							kind: 'analytics#profile',
+							level: 'STANDARD',
+							name: 'Test Profile X',
+							type: 'WEB',
+							websiteUrl: '/wp-admin/',
+							permissions: {
+								effective: [
+									'READ_AND_ANALYZE',
+								],
+							},
+						} ),
+					} );
+				}
+			} else if ( request.url().match( '/wp-json/google-site-kit/v1/data/' ) ) {
+				request.respond( { status: 200 } );
+			} else if ( request.url().match( `//analytics.google.com/analytics/web/` ) ) {
+				request.respond( { status: 200 } );
+			} else {
+				request.continue();
+			}
+		} );
+	} );
+
+	beforeEach( async () => {
+		scope = 'https://www.googleapis.com/auth/analytics.provision';
+		bypassCreatePropertyRequest = true;
+		bypassCreateProfileRequest = true;
+
+		await activatePlugin( 'e2e-tests-proxy-auth-plugin' );
+		await activatePlugin( 'e2e-tests-site-verification-plugin' );
+		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
+	} );
+
+	afterEach( async () => {
+		await deactivateUtilityPlugins();
+		await resetSiteKit();
+	} );
+
+	it( 'creating an analytics account when not having the https://www.googleapis.com/auth/analytics.provision scope yet.', async () => {
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock-no-account' );
+		await setSearchConsoleProperty();
+
+		// Go to the analytics setup page.
+		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
+		await page.waitForSelector( '.mdc-tab-bar' );
+		await expect( page ).toClick( '.mdc-tab', { text: /connect more services/i } );
+		await page.waitForSelector( '.googlesitekit-settings-connect-module--analytics' );
+		await expect( page ).toClick( '.googlesitekit-cta-link', { text: /set up analytics/i } );
+		await page.waitForSelector( '.googlesitekit-setup-module--analytics' );
+		await page.waitForSelector( '.googlesitekit-setup-module__inputs' );
+
+		// The user sees a notice above the button that explains they will need to grant additional permissions.
+		await expect( page ).toMatchElement( '#googlesitekit_analytics_need_permissions_msg' );
+
+		// Upon clicking the button, they're redirected to OAuth (should be mocked).
+		await Promise.all( [
+			page.waitForNavigation(), // User is sent directly to OAuth.
+			expect( page ).toClick( '.mdc-button', { text: /create account/i } ),
+		] );
+
+		// When returning, their original action is automatically invoked, without requiring them to click the button again.
+		await page.waitForRequest( ( req ) => req.url().match( 'analytics/data/create-account-ticket' ) );
+
+		// They should be redirected to the Analytics TOS (can be mocked to an immediate success redirect to Site Kit (...?gatoscallback=1...)).
+		await page.waitForRequest( ( req ) => req.url().match( 'analytics.google.com/analytics/web' ) );
+	} );
+
+	it( 'creating an analytics property when not having the https://www.googleapis.com/auth/analytics.edit scope yet.', async () => {
+		scope = 'https://www.googleapis.com/auth/analytics.edit';
+		bypassCreateProfileRequest = false;
+
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
+		await setSearchConsoleProperty();
+
+		// Go to the analytics setup page.
+		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
+		await page.waitForSelector( '.mdc-tab-bar' );
+		await expect( page ).toClick( '.mdc-tab', { text: /connect more services/i } );
+		await page.waitForSelector( '.googlesitekit-settings-connect-module--analytics' );
+		await expect( page ).toClick( '.googlesitekit-cta-link', { text: /set up analytics/i } );
+		await page.waitForSelector( '.googlesitekit-setup-module--analytics' );
+		await page.waitForSelector( '.googlesitekit-setup-module__inputs' );
+
+		// Select "Test Account A" account.
+		await expect( page ).toClick( '.googlesitekit-analytics__select-account' );
+		await expect( page ).toClick( '.mdc-menu-surface--open li', { text: /test account a/i } );
+
+		// Select "create a new property" option.
+		await expect( page ).toClick( '.googlesitekit-analytics__select-property' );
+		await expect( page ).toClick( '.mdc-menu-surface--open li', { text: /set up a new property/i } );
+
+		// Click on confirm changes button and wait for permissions modal dialog.
+		await expect( page ).toClick( '.mdc-button', { text: /configure analytics/i } );
+		await page.waitForSelector( '.mdc-dialog__container' );
+
+		// Click on proceed button and wait for oauth request.
+		await Promise.all( [
+			page.waitForNavigation(),
+			expect( page ).toClick( '.mdc-dialog__actions .mdc-button', { text: /proceed/i } ),
+			page.waitForRequest( ( req ) => req.url().match( 'sitekit.withgoogle.com/o/oauth2/auth' ) ),
+		] );
+
+		// They should end up on the dashboard.
+		await Promise.all( [
+			page.waitForNavigation(),
+			page.waitForSelector( '.googlesitekit-publisher-win__title' ),
+		] );
+	} );
+
+	it( 'creating an analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.', async () => {
+		scope = 'https://www.googleapis.com/auth/analytics.edit';
+
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
+		await setSearchConsoleProperty();
+
+		// Go to the analytics setup page.
+		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
+		await page.waitForSelector( '.mdc-tab-bar' );
+		await expect( page ).toClick( '.mdc-tab', { text: /connect more services/i } );
+		await page.waitForSelector( '.googlesitekit-settings-connect-module--analytics' );
+		await expect( page ).toClick( '.googlesitekit-cta-link', { text: /set up analytics/i } );
+		await page.waitForSelector( '.googlesitekit-setup-module--analytics' );
+		await page.waitForSelector( '.googlesitekit-setup-module__inputs' );
+
+		// Select "Test Account A" account.
+		await expect( page ).toClick( '.googlesitekit-analytics__select-account' );
+		await expect( page ).toClick( '.mdc-menu-surface--open li', { text: /test account a/i } );
+
+		// Select "Test Property X" property.
+		await expect( page ).toClick( '.googlesitekit-analytics__select-property' );
+		await expect( page ).toClick( '.mdc-menu-surface--open li', { text: /test property x/i } );
+
+		// Select "create a new property" option.
+		await expect( page ).toClick( '.googlesitekit-analytics__select-profile' );
+		await expect( page ).toClick( '.mdc-menu-surface--open li', { text: /set up a new view/i } );
+
+		// Click on confirm changes button and wait for permissions modal dialog.
+		await expect( page ).toClick( '.mdc-button', { text: /configure analytics/i } );
+		await page.waitForSelector( '.mdc-dialog__container' );
+
+		// Click on proceed button and wait for oauth request.
+		await Promise.all( [
+			page.waitForNavigation(),
+			expect( page ).toClick( '.mdc-dialog__actions .mdc-button', { text: /proceed/i } ),
+			page.waitForRequest( ( req ) => req.url().match( 'sitekit.withgoogle.com/o/oauth2/auth' ) ),
+		] );
+
+		// They should end up on the dashboard.
+		await Promise.all( [
+			page.waitForNavigation(),
+			page.waitForSelector( '.googlesitekit-publisher-win__title' ),
+		] );
+	} );
+} );