From 9352269b1ee99ecb9047c90fe5e367dc3716d0ae Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Tue, 30 Jun 2020 11:08:14 +0300
Subject: [PATCH 01/24] Add base write-scope-requests.test.js file.

---
 .../analytics/write-scope-requests.test.js    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 tests/e2e/specs/modules/analytics/write-scope-requests.test.js

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
new file mode 100644
index 00000000000..a060ca46a24
--- /dev/null
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+
+/**
+ * Internal dependencies
+ */
+import {
+	deactivateUtilityPlugins,
+	resetSiteKit,
+	setSiteVerification,
+	setSearchConsoleProperty,
+	setupAnalytics,
+	useRequestInterception,
+} from '../../../utils';
+
+describe( 'Analytics write scope requests', () => {
+	beforeAll( async () => {
+		await page.setRequestInterception( true );
+		useRequestInterception( ( request ) => {
+			if ( request.url().match( 'google-site-kit/v1/data/' ) ) {
+				request.respond( {
+					status: 200,
+					body: JSON.stringify( mockBatchResponse ),
+				} );
+			} else {
+				request.continue();
+			}
+		} );
+	} );
+
+	beforeEach( async () => {
+		await activatePlugin( 'e2e-tests-oauth-callback-plugin' )
+		await setSiteVerification();
+		await setSearchConsoleProperty();
+		await setupAnalytics();
+	} );
+
+	afterEach( async () => {
+		await deactivateUtilityPlugins();
+		await resetSiteKit();
+	} );
+} );

From f5990e8f45a923de75e7431a1afb8e4d5b9a7f77 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Wed, 1 Jul 2020 16:55:56 +0300
Subject: [PATCH 02/24] Add check for a notice above the button that explains
 user will need to grant additional permissions.

---
 .../analytics/common/account-create.js        |  6 +--
 jest-puppeteer.config.js                      | 40 ++++++++++++++++++
 .../analytics/write-scope-requests.test.js    | 42 +++++++++++++++----
 3 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 jest-puppeteer.config.js

diff --git a/assets/js/modules/analytics/common/account-create.js b/assets/js/modules/analytics/common/account-create.js
index ec075d80870..8260f7559a5 100644
--- a/assets/js/modules/analytics/common/account-create.js
+++ b/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 className="googlesitekit-tos-redirect-msg">{ __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }</p> }
+			{ ! hasProvisioningScope && <p className="googlesitekit-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
diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js
new file mode 100644
index 00000000000..00fa3d6e469
--- /dev/null
+++ b/jest-puppeteer.config.js
@@ -0,0 +1,40 @@
+/**
+ * Puppeteer config.
+ *
+ * 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.
+ */
+
+const config = require( '@wordpress/scripts/config/puppeteer.config.js' );
+
+const coreConfig = config || {};
+const coreLaunch = coreConfig.launch || {};
+const coreLaunchArgs = coreLaunch.args || [];
+
+// https://github.com/smooth-code/jest-puppeteer/blob/master/packages/jest-environment-puppeteer/README.md#jest-puppeteerconfigjs
+module.exports = {
+	...coreConfig,
+	launch: {
+		...coreLaunch,
+		args: [
+			// https://peter.sh/experiments/chromium-command-line-switches/
+			...coreLaunchArgs,
+			'--disable-gpu',
+			'--no-sandbox',
+			'--lang=en-US',
+			'--disable-setuid-sandbox',
+			'--disable-dev-shm-usage',
+		],
+	},
+};
diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index a060ca46a24..07818b23057 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -16,15 +16,18 @@
  * limitations under the License.
  */
 
+/**
+ * WordPress dependencies
+ */
+import { activatePlugin, createURL, visitAdminPage } from '@wordpress/e2e-test-utils';
+
 /**
  * Internal dependencies
  */
 import {
 	deactivateUtilityPlugins,
 	resetSiteKit,
-	setSiteVerification,
 	setSearchConsoleProperty,
-	setupAnalytics,
 	useRequestInterception,
 } from '../../../utils';
 
@@ -32,11 +35,22 @@ describe( 'Analytics write scope requests', () => {
 	beforeAll( async () => {
 		await page.setRequestInterception( true );
 		useRequestInterception( ( request ) => {
-			if ( request.url().match( 'google-site-kit/v1/data/' ) ) {
+			if ( request.url().startsWith( 'https://sitekit.withgoogle.com/o/oauth2/auth' ) ) {
 				request.respond( {
-					status: 200,
-					body: JSON.stringify( mockBatchResponse ),
+					status: 302,
+					headers: {
+						location: createURL( '/wp-admin/index.php', [
+							'oauth2callback=1',
+							'code=valid-test-code',
+							// This is how the additional scope is granted.
+							'scope=',//https://www.googleapis.com/auth/analytics.provision',
+						].join( '&' ) ),
+					},
 				} );
+			} else if ( request.url().match( 'analytics/data/create-account-ticket' ) ) {
+				request.respond( { status: 200 } ); // Do nothing for now, return 200 to prevent error.
+			} else if ( request.url().match( '/wp-json/google-site-kit/v1/data/' ) ) {
+				request.respond( { status: 200 } );
 			} else {
 				request.continue();
 			}
@@ -44,14 +58,26 @@ describe( 'Analytics write scope requests', () => {
 	} );
 
 	beforeEach( async () => {
-		await activatePlugin( 'e2e-tests-oauth-callback-plugin' )
-		await setSiteVerification();
+		await activatePlugin( 'e2e-tests-proxy-auth-plugin' );
+		await activatePlugin( 'e2e-tests-site-verification-plugin' );
+		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock-no-account' );
 		await setSearchConsoleProperty();
-		await setupAnalytics();
 	} );
 
 	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 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 expect( page ).toMatchElement( '.googlesitekit-permissions-msg' );
+	} );
 } );

From 1801ad5becec35529c02d4b766f78b000a8ea582 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Wed, 1 Jul 2020 18:41:24 +0300
Subject: [PATCH 03/24] Implement the first part of e2e to check creating ga
 account permissions.

---
 .../analytics/common/account-create.js        |  4 ++--
 .../analytics/write-scope-requests.test.js    | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/assets/js/modules/analytics/common/account-create.js b/assets/js/modules/analytics/common/account-create.js
index 8260f7559a5..3cded90e609 100644
--- a/assets/js/modules/analytics/common/account-create.js
+++ b/assets/js/modules/analytics/common/account-create.js
@@ -162,8 +162,8 @@ export default function AccountCreate() {
 				<TimezoneSelect />
 			</div>
 
-			{ hasProvisioningScope && <p className="googlesitekit-tos-redirect-msg">{ __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }</p> }
-			{ ! hasProvisioningScope && <p className="googlesitekit-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> }
+			{ 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
diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 07818b23057..a6b7da3d3ca 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -43,7 +43,7 @@ describe( 'Analytics write scope requests', () => {
 							'oauth2callback=1',
 							'code=valid-test-code',
 							// This is how the additional scope is granted.
-							'scope=',//https://www.googleapis.com/auth/analytics.provision',
+							'scope=https://www.googleapis.com/auth/analytics.provision',
 						].join( '&' ) ),
 					},
 				} );
@@ -78,6 +78,24 @@ describe( 'Analytics write scope requests', () => {
 		await expect( page ).toClick( '.googlesitekit-cta-link', { text: /set up analytics/i } );
 		await page.waitForSelector( '.googlesitekit-setup-module--analytics' );
 
-		await expect( page ).toMatchElement( '.googlesitekit-permissions-msg' );
+		// 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...)).
+
+		// They should end up on the dashboard.
 	} );
+
+	it.todo( 'creating an Analytics property when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
+
+	it.todo( 'creating an Analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
 } );

From 221a4c6c0de1341ffa8984a30e8cb70623305ac3 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 2 Jul 2020 15:48:53 +0300
Subject: [PATCH 04/24] Update request interseption to return correct ticket id
 and mock TOS redirect.

---
 .../modules/analytics/write-scope-requests.test.js   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index a6b7da3d3ca..2c1f66f6ae8 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -48,9 +48,19 @@ describe( 'Analytics write scope requests', () => {
 					},
 				} );
 			} else if ( request.url().match( 'analytics/data/create-account-ticket' ) ) {
-				request.respond( { status: 200 } ); // Do nothing for now, return 200 to prevent error.
+				request.respond( {
+					status: 200,
+					body: JSON.stringify( { id: `${ Math.ceil( 1000 * Math.random() ) }` } ),
+				} );
 			} 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: 302,
+					headers: {
+						location: createURL( '/wp-admin/index.php', 'gatoscallback=1' ),
+					},
+				} );
 			} else {
 				request.continue();
 			}

From c593d864bf370fdd8bf1d274ab9841f6a16166c0 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 2 Jul 2020 20:39:29 +0300
Subject: [PATCH 05/24] Rework the "creating an analytics account when not
 having scope yet" test to not check dashboard page.

---
 .../analytics/write-scope-requests.test.js     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 2c1f66f6ae8..71e722bcd40 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -55,12 +55,7 @@ describe( 'Analytics write scope requests', () => {
 			} 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: 302,
-					headers: {
-						location: createURL( '/wp-admin/index.php', 'gatoscallback=1' ),
-					},
-				} );
+				request.respond( { status: 200 } );
 			} else {
 				request.continue();
 			}
@@ -71,8 +66,6 @@ describe( 'Analytics write scope requests', () => {
 		await activatePlugin( 'e2e-tests-proxy-auth-plugin' );
 		await activatePlugin( 'e2e-tests-site-verification-plugin' );
 		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
-		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock-no-account' );
-		await setSearchConsoleProperty();
 	} );
 
 	afterEach( async () => {
@@ -80,7 +73,11 @@ describe( 'Analytics write scope requests', () => {
 		await resetSiteKit();
 	} );
 
-	it( 'creating an analytics account when not having the https://www.googleapis.com/auth/analytics.provision scope yet.', async () => {
+	it.only( '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 } );
@@ -101,8 +98,7 @@ describe( 'Analytics write scope requests', () => {
 		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...)).
-
-		// They should end up on the dashboard.
+		await page.waitForRequest( ( req ) => req.url().match( 'analytics.google.com/analytics/web' ) );
 	} );
 
 	it.todo( 'creating an Analytics property when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );

From 85d641de1daebf429d965d400afcc9d305b26216 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 2 Jul 2020 21:42:54 +0300
Subject: [PATCH 06/24] Implement "creating an analytics property when not
 having the scope yet" test.

---
 .../analytics/write-scope-requests.test.js    | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 71e722bcd40..29d8dce7d72 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -29,6 +29,7 @@ import {
 	resetSiteKit,
 	setSearchConsoleProperty,
 	useRequestInterception,
+	setupAnalytics,
 } from '../../../utils';
 
 describe( 'Analytics write scope requests', () => {
@@ -73,7 +74,7 @@ describe( 'Analytics write scope requests', () => {
 		await resetSiteKit();
 	} );
 
-	it.only( 'creating an analytics account when not having the https://www.googleapis.com/auth/analytics.provision scope yet.', async () => {
+	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();
 
@@ -101,7 +102,35 @@ describe( 'Analytics write scope requests', () => {
 		await page.waitForRequest( ( req ) => req.url().match( 'analytics.google.com/analytics/web' ) );
 	} );
 
-	it.todo( 'creating an Analytics property when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
+	it( 'creating an analytics property when not having the https://www.googleapis.com/auth/analytics.edit scope yet.', async () => {
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
+		await setSearchConsoleProperty();
+		await setupAnalytics();
+
+		// Go to the analytics settings and edit it.
+		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
+		await expect( page ).toClick( '#googlesitekit-settings-module__header--analytics' );
+		await expect( page ).toClick( '.googlesitekit-settings-module--analytics .googlesitekit-cta-link', { text: /edit/i } );
+
+		// 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: /confirm changes/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' ) ),
+		] );
+	} );
 
-	it.todo( 'creating an Analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
+	it.todo( 'creating an analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
 } );

From 3cbacbffbb3149e4dd8b2908366a948bc7f47ef6 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 2 Jul 2020 21:55:55 +0300
Subject: [PATCH 07/24] Fix too early lookup issue.

---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 29d8dce7d72..40b6c1d63e6 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -85,6 +85,7 @@ describe( 'Analytics write scope requests', () => {
 		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' );

From 61a8015cddb18b90775a7ba20fcf166c553449f9 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 2 Jul 2020 22:06:09 +0300
Subject: [PATCH 08/24] Implement "creating an analytics view when not having
 scope yet" test.

---
 .../analytics/write-scope-requests.test.js    | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 40b6c1d63e6..98ae2a34d54 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -133,5 +133,37 @@ describe( 'Analytics write scope requests', () => {
 		] );
 	} );
 
-	it.todo( 'creating an analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.' );
+	it( 'creating an analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.', async () => {
+		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
+		await setSearchConsoleProperty();
+		await setupAnalytics();
+
+		// Go to the analytics settings and edit it.
+		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
+		await expect( page ).toClick( '#googlesitekit-settings-module__header--analytics' );
+		await expect( page ).toClick( '.googlesitekit-settings-module--analytics .googlesitekit-cta-link', { text: /edit/i } );
+
+		// 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: /confirm changes/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' ) ),
+		] );
+	} );
 } );

From af0a7400adc0370a53b3aade06507f6f8bd787a1 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Wed, 8 Jul 2020 22:03:22 +0300
Subject: [PATCH 09/24] Add view name field to the analytics setup form.

---
 assets/js/modules/analytics/setup/setup-form.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/js/modules/analytics/setup/setup-form.js b/assets/js/modules/analytics/setup/setup-form.js
index 4e90b0ccf2f..5ccc2291a05 100644
--- a/assets/js/modules/analytics/setup/setup-form.js
+++ b/assets/js/modules/analytics/setup/setup-form.js
@@ -41,6 +41,7 @@ import {
 	ExistingTagNotice,
 	ProfileSelect,
 	PropertySelect,
+	ProfileNameTextField,
 } from '../common/';
 import { trackEvent } from '../../../util';
 import { isPermissionScopeError } from '../../../googlesitekit/datastore/user/utils/is-permission-scope-error';
@@ -99,6 +100,10 @@ export default function SetupForm( { finishSetup } ) {
 				<ProfileSelect />
 			</div>
 
+			<div className="googlesitekit-setup-module__inputs googlesitekit-setup-module__inputs--multiline">
+				<ProfileNameTextField />
+			</div>
+
 			<div className="googlesitekit-setup-module__action">
 				<Button disabled={ ! canSubmitChanges }>
 					{ __( 'Configure Analytics', 'google-site-kit' ) }

From c763201bca5710ee57853d9b2b3ebaa504219f01 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Wed, 8 Jul 2020 22:24:22 +0300
Subject: [PATCH 10/24] Fix default view name issue.

---
 assets/js/modules/analytics/common/ProfileNameTextField.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/js/modules/analytics/common/ProfileNameTextField.js b/assets/js/modules/analytics/common/ProfileNameTextField.js
index d5f25400193..395938f9974 100644
--- a/assets/js/modules/analytics/common/ProfileNameTextField.js
+++ b/assets/js/modules/analytics/common/ProfileNameTextField.js
@@ -43,7 +43,9 @@ export default function ProfileNameTextField() {
 	}, [] );
 
 	useEffect( () => {
-		setValues( FORM_SETUP, { profileName: __( 'All Web Site Data', 'google-site-kit' ) } );
+		if ( ! profileName ) {
+			setValues( FORM_SETUP, { profileName: __( 'All Web Site Data', 'google-site-kit' ) } );
+		}
 	}, [] );
 
 	// bounce if an existing profile is selected

From 067e8a945f4ffcd913ce6d602e84b43cf42d6a80 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Thu, 9 Jul 2020 20:22:14 +0300
Subject: [PATCH 11/24] Update e2e tests to properly check property and profile
 creation.

---
 jest-puppeteer.config.js                      |   1 -
 .../analytics/write-scope-requests.test.js    | 107 +++++++++++++++---
 2 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js
index 00fa3d6e469..3fadc92c9e0 100644
--- a/jest-puppeteer.config.js
+++ b/jest-puppeteer.config.js
@@ -32,7 +32,6 @@ module.exports = {
 			...coreLaunchArgs,
 			'--disable-gpu',
 			'--no-sandbox',
-			'--lang=en-US',
 			'--disable-setuid-sandbox',
 			'--disable-dev-shm-usage',
 		],
diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 98ae2a34d54..f86763f3ed4 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -29,10 +29,13 @@ import {
 	resetSiteKit,
 	setSearchConsoleProperty,
 	useRequestInterception,
-	setupAnalytics,
 } from '../../../utils';
 
 describe( 'Analytics write scope requests', () => {
+	let scope;
+	let bypassCreatePropertyRequest;
+	let bypassCreateProfileRequest;
+
 	beforeAll( async () => {
 		await page.setRequestInterception( true );
 		useRequestInterception( ( request ) => {
@@ -40,12 +43,7 @@ describe( 'Analytics write scope requests', () => {
 				request.respond( {
 					status: 302,
 					headers: {
-						location: createURL( '/wp-admin/index.php', [
-							'oauth2callback=1',
-							'code=valid-test-code',
-							// This is how the additional scope is granted.
-							'scope=https://www.googleapis.com/auth/analytics.provision',
-						].join( '&' ) ),
+						location: createURL( '/wp-admin/index.php', `oauth2callback=1&code=valid-test-code&scope=${ scope }` ),
 					},
 				} );
 			} else if ( request.url().match( 'analytics/data/create-account-ticket' ) ) {
@@ -53,6 +51,54 @@ describe( 'Analytics write scope requests', () => {
 					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/` ) ) {
@@ -64,6 +110,10 @@ describe( 'Analytics write scope requests', () => {
 	} );
 
 	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' );
@@ -104,14 +154,20 @@ describe( 'Analytics write scope requests', () => {
 	} );
 
 	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();
-		await setupAnalytics();
 
-		// Go to the analytics settings and edit it.
+		// Go to the analytics setup page.
 		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
-		await expect( page ).toClick( '#googlesitekit-settings-module__header--analytics' );
-		await expect( page ).toClick( '.googlesitekit-settings-module--analytics .googlesitekit-cta-link', { text: /edit/i } );
+		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' );
@@ -122,7 +178,7 @@ describe( 'Analytics write scope requests', () => {
 		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: /confirm changes/i } );
+		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.
@@ -131,17 +187,28 @@ describe( 'Analytics write scope requests', () => {
 			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();
-		await setupAnalytics();
 
-		// Go to the analytics settings and edit it.
+		// Go to the analytics setup page.
 		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
-		await expect( page ).toClick( '#googlesitekit-settings-module__header--analytics' );
-		await expect( page ).toClick( '.googlesitekit-settings-module--analytics .googlesitekit-cta-link', { text: /edit/i } );
+		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' );
@@ -156,7 +223,7 @@ describe( 'Analytics write scope requests', () => {
 		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: /confirm changes/i } );
+		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.
@@ -165,5 +232,11 @@ describe( 'Analytics write scope requests', () => {
 			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' ),
+		] );
 	} );
 } );

From 3784da0a8a0d548c3b36493b93baece30dd53f77 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 15:20:50 +0300
Subject: [PATCH 12/24] Address PR feedback.

---
 .../analytics/write-scope-requests.test.js    | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index f86763f3ed4..7d4a4eee745 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -33,8 +33,11 @@ import {
 
 describe( 'Analytics write scope requests', () => {
 	let scope;
-	let bypassCreatePropertyRequest;
-	let bypassCreateProfileRequest;
+	// These variables are used to determine whether or not we need to intercept requests to the server. By default the first request 
+	// won't be intercepted to reach the server and to trigger the insufficient scopes error on the server. The following requests will
+	// be intercepted and mocked to immediately return fake data to emulate property/profile creation.
+	let interceptCreatePropertyRequest;
+	let interceptCreateProfileRequest;
 
 	beforeAll( async () => {
 		await page.setRequestInterception( true );
@@ -52,10 +55,7 @@ describe( 'Analytics write scope requests', () => {
 					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 {
+				if ( interceptCreatePropertyRequest ) {
 					request.respond( {
 						status: 200,
 						body: JSON.stringify( {
@@ -73,12 +73,12 @@ describe( 'Analytics write scope requests', () => {
 							},
 						} ),
 					} );
+				} else {
+					request.continue();
+					interceptCreatePropertyRequest = true;
 				}
 			} else if ( request.url().match( 'analytics/data/create-profile' ) ) {
-				if ( bypassCreateProfileRequest ) {
-					request.continue();
-					bypassCreateProfileRequest = false;
-				} else {
+				if ( interceptCreateProfileRequest ) {
 					request.respond( {
 						status: 200,
 						body: JSON.stringify( {
@@ -98,6 +98,9 @@ describe( 'Analytics write scope requests', () => {
 							},
 						} ),
 					} );
+				} else {
+					request.continue();
+					interceptCreateProfileRequest = true;
 				}
 			} else if ( request.url().match( '/wp-json/google-site-kit/v1/data/' ) ) {
 				request.respond( { status: 200 } );
@@ -111,8 +114,8 @@ describe( 'Analytics write scope requests', () => {
 
 	beforeEach( async () => {
 		scope = 'https://www.googleapis.com/auth/analytics.provision';
-		bypassCreatePropertyRequest = true;
-		bypassCreateProfileRequest = true;
+		interceptCreatePropertyRequest = false;
+		interceptCreateProfileRequest = false;
 
 		await activatePlugin( 'e2e-tests-proxy-auth-plugin' );
 		await activatePlugin( 'e2e-tests-site-verification-plugin' );
@@ -124,7 +127,7 @@ describe( 'Analytics write scope requests', () => {
 		await resetSiteKit();
 	} );
 
-	it( 'creating an analytics account when not having the https://www.googleapis.com/auth/analytics.provision scope yet.', async () => {
+	it( 'it prompts for additional permissions during a new Analytics account creation if the user has not granted the Analytics provisioning scope', async () => {
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock-no-account' );
 		await setSearchConsoleProperty();
 
@@ -153,9 +156,9 @@ describe( 'Analytics write scope requests', () => {
 		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 () => {
+	it( 'it prompts for additional permissions during a new Analytics property creation if the user has not granted the Analytics edit scope', async () => {
 		scope = 'https://www.googleapis.com/auth/analytics.edit';
-		bypassCreateProfileRequest = false;
+		interceptCreateProfileRequest = true;
 
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
 		await setSearchConsoleProperty();
@@ -195,7 +198,7 @@ describe( 'Analytics write scope requests', () => {
 		] );
 	} );
 
-	it( 'creating an analytics view when not having the https://www.googleapis.com/auth/analytics.edit scope yet.', async () => {
+	it( 'it prompts for additional permissions during a new Analytics profile creation if the user has not granted the Analytics edit scope', async () => {
 		scope = 'https://www.googleapis.com/auth/analytics.edit';
 
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
@@ -218,7 +221,7 @@ describe( 'Analytics write scope requests', () => {
 		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.
+		// Select "Set up a new view" 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 } );
 

From 76cc54beace3ebba8f3badc1e86034aa3717b8be Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 15:44:46 +0300
Subject: [PATCH 13/24] Fix eslint issue.

---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 7d4a4eee745..616af5d5535 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -33,7 +33,7 @@ import {
 
 describe( 'Analytics write scope requests', () => {
 	let scope;
-	// These variables are used to determine whether or not we need to intercept requests to the server. By default the first request 
+	// These variables are used to determine whether or not we need to intercept requests to the server. By default the first request
 	// won't be intercepted to reach the server and to trigger the insufficient scopes error on the server. The following requests will
 	// be intercepted and mocked to immediately return fake data to emulate property/profile creation.
 	let interceptCreatePropertyRequest;

From f074876e6b4d31081c870cbd6d2a59ff4dc54307 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 16:20:19 +0300
Subject: [PATCH 14/24] Address PR feedback.

---
 assets/js/modules/analytics/common/account-create.js |  4 ++--
 .../modules/analytics/write-scope-requests.test.js   | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/assets/js/modules/analytics/common/account-create.js b/assets/js/modules/analytics/common/account-create.js
index 3cded90e609..a9841622b3c 100644
--- a/assets/js/modules/analytics/common/account-create.js
+++ b/assets/js/modules/analytics/common/account-create.js
@@ -162,8 +162,8 @@ export default function AccountCreate() {
 				<TimezoneSelect />
 			</div>
 
-			{ 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> }
+			{ hasProvisioningScope && <p>{ __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }</p> }
+			{ ! hasProvisioningScope && <p>{ __( '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
diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 616af5d5535..446d780c89b 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -27,8 +27,8 @@ import { activatePlugin, createURL, visitAdminPage } from '@wordpress/e2e-test-u
 import {
 	deactivateUtilityPlugins,
 	resetSiteKit,
-	setSearchConsoleProperty,
 	useRequestInterception,
+	setupSiteKit,
 } from '../../../utils';
 
 describe( 'Analytics write scope requests', () => {
@@ -117,9 +117,10 @@ describe( 'Analytics write scope requests', () => {
 		interceptCreatePropertyRequest = false;
 		interceptCreateProfileRequest = false;
 
-		await activatePlugin( 'e2e-tests-proxy-auth-plugin' );
 		await activatePlugin( 'e2e-tests-site-verification-plugin' );
 		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
+
+		await setupSiteKit();
 	} );
 
 	afterEach( async () => {
@@ -129,7 +130,6 @@ describe( 'Analytics write scope requests', () => {
 
 	it( 'it prompts for additional permissions during a new Analytics account creation if the user has not granted the Analytics provisioning scope', 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' );
@@ -141,7 +141,7 @@ describe( 'Analytics write scope requests', () => {
 		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' );
+		await expect( page ).toMatchElement( 'p', { text: /You will need to give Site Kit permission to create an Analytics account /i } );
 
 		// Upon clicking the button, they're redirected to OAuth (should be mocked).
 		await Promise.all( [
@@ -161,7 +161,6 @@ describe( 'Analytics write scope requests', () => {
 		interceptCreateProfileRequest = true;
 
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );
-		await setSearchConsoleProperty();
 
 		// Go to the analytics setup page.
 		await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' );
@@ -176,7 +175,7 @@ describe( 'Analytics write scope requests', () => {
 		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.
+		// Select "Set up 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 } );
 
@@ -202,7 +201,6 @@ describe( 'Analytics write scope requests', () => {
 		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' );

From b143953345a2fde096dfb44d3106668f4869ecfa Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 21:08:54 +0300
Subject: [PATCH 15/24] Update test name.

Co-authored-by: Evan Mattson <evan.mattson@10up.com>
---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 446d780c89b..1c160fb6bfd 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -128,7 +128,7 @@ describe( 'Analytics write scope requests', () => {
 		await resetSiteKit();
 	} );
 
-	it( 'it prompts for additional permissions during a new Analytics account creation if the user has not granted the Analytics provisioning scope', async () => {
+	it( 'prompts for additional permissions during a new Analytics account creation if the user has not granted the Analytics provisioning scope', async () => {
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock-no-account' );
 
 		// Go to the analytics setup page.

From 79a330793f087f3777e82aebccad2dde9f06aeaf Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 21:09:23 +0300
Subject: [PATCH 16/24] Remove extra space at the end of match element string.

Co-authored-by: Evan Mattson <evan.mattson@10up.com>
---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 1c160fb6bfd..da5068a1910 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -141,7 +141,7 @@ describe( 'Analytics write scope requests', () => {
 		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( 'p', { text: /You will need to give Site Kit permission to create an Analytics account /i } );
+		await expect( page ).toMatchElement( 'p', { text: /You will need to give Site Kit permission to create an Analytics account/i } );
 
 		// Upon clicking the button, they're redirected to OAuth (should be mocked).
 		await Promise.all( [

From 6760bec6210174aa636c5ca2da57e0c12dd465f7 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 21:09:35 +0300
Subject: [PATCH 17/24] Update test name.

Co-authored-by: Evan Mattson <evan.mattson@10up.com>
---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index da5068a1910..88c60605d53 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -156,7 +156,7 @@ describe( 'Analytics write scope requests', () => {
 		await page.waitForRequest( ( req ) => req.url().match( 'analytics.google.com/analytics/web' ) );
 	} );
 
-	it( 'it prompts for additional permissions during a new Analytics property creation if the user has not granted the Analytics edit scope', async () => {
+	it( 'prompts for additional permissions during a new Analytics property creation if the user has not granted the Analytics edit scope', async () => {
 		scope = 'https://www.googleapis.com/auth/analytics.edit';
 		interceptCreateProfileRequest = true;
 

From 307afb49747b1f2b696e5a795d48eda70abb2f46 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 21:09:55 +0300
Subject: [PATCH 18/24] Update test name.

Co-authored-by: Evan Mattson <evan.mattson@10up.com>
---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 88c60605d53..a272f574bdc 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -197,7 +197,7 @@ describe( 'Analytics write scope requests', () => {
 		] );
 	} );
 
-	it( 'it prompts for additional permissions during a new Analytics profile creation if the user has not granted the Analytics edit scope', async () => {
+	it( 'prompts for additional permissions during a new Analytics profile creation if the user has not granted the Analytics edit scope', async () => {
 		scope = 'https://www.googleapis.com/auth/analytics.edit';
 
 		await activatePlugin( 'e2e-tests-module-setup-analytics-api-mock' );

From 1a34b2545ad7c91d26a375d20930100dd76dfffd Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 21:11:30 +0300
Subject: [PATCH 19/24] Remove unnecessary plugin.

Co-authored-by: Evan Mattson <evan.mattson@10up.com>
---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index a272f574bdc..84e78dfedbb 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -117,7 +117,6 @@ describe( 'Analytics write scope requests', () => {
 		interceptCreatePropertyRequest = false;
 		interceptCreateProfileRequest = false;
 
-		await activatePlugin( 'e2e-tests-site-verification-plugin' );
 		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
 
 		await setupSiteKit();

From 691557f900439d99070eaaefa93377e30bdc8e24 Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Fri, 10 Jul 2020 22:41:51 +0300
Subject: [PATCH 20/24] Add back e2e-tests-site-verification-plugin plugin.

---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 84e78dfedbb..a272f574bdc 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -117,6 +117,7 @@ describe( 'Analytics write scope requests', () => {
 		interceptCreatePropertyRequest = false;
 		interceptCreateProfileRequest = false;
 
+		await activatePlugin( 'e2e-tests-site-verification-plugin' );
 		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
 
 		await setupSiteKit();

From 003a54586a866cd46359511a06bab3155bfed78e Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Sat, 11 Jul 2020 00:41:35 +0300
Subject: [PATCH 21/24] Remove e2e-tests-site-verification-plugin plugin
 activation.

---
 tests/e2e/specs/modules/analytics/write-scope-requests.test.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index a272f574bdc..98fa69c4c97 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -117,9 +117,7 @@ describe( 'Analytics write scope requests', () => {
 		interceptCreatePropertyRequest = false;
 		interceptCreateProfileRequest = false;
 
-		await activatePlugin( 'e2e-tests-site-verification-plugin' );
 		await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
-
 		await setupSiteKit();
 	} );
 

From 6cf2405a4cf71f57e0023bcd23f3a787742d237f Mon Sep 17 00:00:00 2001
From: Eugene Manuilov <eugene.manuilov@gmail.com>
Date: Mon, 13 Jul 2020 20:51:45 +0300
Subject: [PATCH 22/24] Revert changes in the account-create.js script.

---
 assets/js/modules/analytics/common/account-create.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assets/js/modules/analytics/common/account-create.js b/assets/js/modules/analytics/common/account-create.js
index a9841622b3c..ec075d80870 100644
--- a/assets/js/modules/analytics/common/account-create.js
+++ b/assets/js/modules/analytics/common/account-create.js
@@ -162,8 +162,10 @@ export default function AccountCreate() {
 				<TimezoneSelect />
 			</div>
 
-			{ hasProvisioningScope && <p>{ __( 'You will be redirected to Google Analytics to accept the terms of service.', 'google-site-kit' ) }</p> }
-			{ ! hasProvisioningScope && <p>{ __( '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> }
+			<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>
 
 			<div className="googlesitekit-setup-module__action">
 				<Button

From 56cd7de29783500d692c8d36d867c476429b7d72 Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Tue, 14 Jul 2020 12:45:13 +0300
Subject: [PATCH 23/24] Downgrade focus-trap-react to v6.

---
 package-lock.json | 46 +++++++++++++++++++++++++++++++---------------
 package.json      |  2 +-
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0d21688f43..fc0ada578db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9500,12 +9500,6 @@
           "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
           "dev": true
         },
-        "prettier": {
-          "version": "npm:wp-prettier@2.0.5",
-          "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz",
-          "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==",
-          "dev": true
-        },
         "resolve": {
           "version": "1.17.0",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
@@ -20467,11 +20461,27 @@
       }
     },
     "focus-trap-react": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-7.0.1.tgz",
-      "integrity": "sha512-12TxHtVntj/sCsT3bwB3pPK+3rACMFLO7LBfk4nKrw1HERRmO/oc0+woD9vZKffxo5zkxkz9amc9rou9reVnpA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-6.0.0.tgz",
+      "integrity": "sha512-mvEYxmP75PMx0vOqoIAmJHO/qUEvdTAdz6gLlEZyxxODnuKQdnKea2RWTYxghAPrV+ibiIq2o/GTSgQycnAjcw==",
       "requires": {
-        "focus-trap": "^5.1.0"
+        "focus-trap": "^4.0.2"
+      },
+      "dependencies": {
+        "focus-trap": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-4.0.2.tgz",
+          "integrity": "sha512-HtLjfAK7Hp2qbBtLS6wEznID1mPT+48ZnP2nkHzgjpL4kroYHg0CdqJ5cTXk+UO5znAxF5fRUkhdyfgrhh8Lzw==",
+          "requires": {
+            "tabbable": "^3.1.2",
+            "xtend": "^4.0.1"
+          }
+        },
+        "tabbable": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-3.1.2.tgz",
+          "integrity": "sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ=="
+        }
       }
     },
     "follow-redirects": {
@@ -22538,7 +22548,7 @@
     },
     "ignore-walk": {
       "version": "3.0.1",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
       "dev": true,
       "optional": true,
@@ -27852,7 +27862,7 @@
     },
     "needle": {
       "version": "2.2.0",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
       "dev": true,
       "optional": true,
@@ -28076,7 +28086,7 @@
     },
     "node-pre-gyp": {
       "version": "0.10.0",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
       "dev": true,
       "optional": true,
@@ -28347,7 +28357,7 @@
     },
     "npm-bundled": {
       "version": "1.0.3",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
       "dev": true,
       "optional": true
@@ -28525,7 +28535,7 @@
     },
     "npm-packlist": {
       "version": "1.1.10",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
       "dev": true,
       "optional": true,
@@ -31387,6 +31397,12 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "prettier": {
+      "version": "npm:wp-prettier@2.0.5",
+      "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz",
+      "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==",
+      "dev": true
+    },
     "prettier-linter-helpers": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
diff --git a/package.json b/package.json
index df344b9a943..13c66a0def4 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "classnames": "^2.2.6",
     "dompurify": "^2.0.12",
     "element-closest": "^3.0.2",
-    "focus-trap-react": "^7.0.1",
+    "focus-trap-react": "^6.0.0",
     "formdata-polyfill": "^3.0.20",
     "husky": "^4.2.5",
     "intl": "^1.2.5",

From 356303d2a67ffead997b60580fa0567b0496bffb Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Tue, 14 Jul 2020 14:02:13 +0300
Subject: [PATCH 24/24] Update tests to ensure original action is automatically
 invoked on return from oAuth.

---
 .../modules/analytics/write-scope-requests.test.js  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
index 98fa69c4c97..448d4463a11 100644
--- a/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
+++ b/tests/e2e/specs/modules/analytics/write-scope-requests.test.js
@@ -150,7 +150,7 @@ describe( 'Analytics write scope requests', () => {
 		// 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...)).
+		// They should be redirected to the Analytics TOS.
 		await page.waitForRequest( ( req ) => req.url().match( 'analytics.google.com/analytics/web' ) );
 	} );
 
@@ -183,16 +183,20 @@ describe( 'Analytics write scope requests', () => {
 
 		// 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' ) ),
 		] );
 
+		// 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-property' ) );
+		await page.waitForRequest( ( req ) => req.url().match( 'analytics/data/create-profile' ) );
+
 		// They should end up on the dashboard.
 		await Promise.all( [
 			page.waitForNavigation(),
 			page.waitForSelector( '.googlesitekit-publisher-win__title' ),
 		] );
+		await expect( page ).toMatchElement( '.googlesitekit-publisher-win__title', { text: /Congrats on completing the setup for Analytics!/i } );
 	} );
 
 	it( 'prompts for additional permissions during a new Analytics profile creation if the user has not granted the Analytics edit scope', async () => {
@@ -227,15 +231,18 @@ describe( 'Analytics write scope requests', () => {
 
 		// 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' ) ),
 		] );
 
+		// 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-profile' ) );
+
 		// They should end up on the dashboard.
 		await Promise.all( [
 			page.waitForNavigation(),
 			page.waitForSelector( '.googlesitekit-publisher-win__title' ),
 		] );
+		await expect( page ).toMatchElement( '.googlesitekit-publisher-win__title', { text: /Congrats on completing the setup for Analytics!/i } );
 	} );
 } );