[2.0] Remove E2E test utils that are now available upstream (#5755)

* Update @wordpress/e2e-test-utils to v4.16.0

* Remove E2E test utils that are now available upstream

* Use new arg format for `deleteTheme()`

* Set default timeout to 10s

Author: pierlon

package-lock.json

@@ -44,7 +44,7 @@
     "@wordpress/browserslist-config": "2.6.0",
     "@wordpress/components": "10.0.5",
     "@wordpress/data": "4.22.3",
-    "@wordpress/e2e-test-utils": "4.9.0",
+    "@wordpress/e2e-test-utils": "4.16.0",
     "@wordpress/edit-post": "3.19.0",
     "@wordpress/eslint-plugin": "7.0.0",
     "@wordpress/hooks": "2.8.0",

package.json

@@ -200,7 +200,7 @@ beforeAll( async () => {
 	observeConsoleLogging();
 	await setBrowserViewport( 'large' );
 	await page.setDefaultNavigationTimeout( 10000 );
-	await page.setDefaultTimeout( 3000 );
+	await page.setDefaultTimeout( 10000 );
 } );
 
 // eslint-disable-next-line jest/require-top-level-describe

tests/e2e/config/bootstrap.js

@@ -1,14 +1,12 @@
 /**
  * WordPress dependencies
  */
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage, activateTheme, installTheme } from '@wordpress/e2e-test-utils';
 
 /**
  * Internal dependencies
  */
 import { completeWizard, cleanUpSettings, clickMode } from '../../utils/onboarding-wizard-utils';
-import { installTheme } from '../../utils/install-theme';
-import { activateTheme } from '../../utils/activate-theme';
 
 describe( 'AMP settings screen newly activated', () => {
 	beforeEach( async () => {

tests/e2e/specs/admin/amp-options.js

@@ -1,8 +1,10 @@
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
+import { activateTheme, deleteTheme, installTheme } from '@wordpress/e2e-test-utils';
+
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
 import {
 	moveToTemplateModeScreen,
@@ -11,9 +13,6 @@ import {
 	testPreviousButton,
 	cleanUpSettings,
 } from '../../utils/onboarding-wizard-utils';
-import { installTheme } from '../../utils/install-theme';
-import { activateTheme } from '../../utils/activate-theme';
-import { deleteTheme } from '../../utils/delete-theme';
 
 describe( 'Template mode', () => {
 	beforeEach( async () => {
@@ -93,7 +92,7 @@ describe( 'Template mode recommendations with non-reader-theme active', () => {
 	} );
 
 	afterEach( async () => {
-		await deleteTheme( 'hestia', 'twentytwenty' );
+		await deleteTheme( 'hestia', { newThemeSlug: 'twentytwenty' } );
 	} );
 
 	it( 'makes correct recommendations when user is not technical and the current theme is not a reader theme', async () => {

tests/e2e/specs/amp-onboarding/template-mode.js

@@ -1,13 +1,12 @@
 /**
  * WordPress dependencies
  */
-import { createNewPost, visitAdminPage } from '@wordpress/e2e-test-utils';
+import { createNewPost, visitAdminPage, activatePlugin, deactivatePlugin } from '@wordpress/e2e-test-utils';
 
 /**
  * Internal dependencies
  */
 import { cleanUpSettings } from '../../utils/onboarding-wizard-utils';
-import { activatePlugin, deactivatePlugin } from '../../utils';
 
 const postPreviewBtnSelector = '.components-button.editor-post-preview';
 const ampPreviewBtnSelector = `${ postPreviewBtnSelector } + .amp-wrapper-post-preview > .amp-editor-post-preview`;

tests/e2e/specs/block-editor/amp-preview-button.js

@@ -1,12 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createNewPost } from '@wordpress/e2e-test-utils';
-
-/**
- * Internal dependencies
- */
-import { activatePlugin, deactivatePlugin } from '../../utils';
+import { createNewPost, activatePlugin, deactivatePlugin } from '@wordpress/e2e-test-utils';
 
 describe( 'Enable AMP Toggle', () => {
 	it( 'should display even when Gutenberg is not active', async () => {