Merge branch 'trunk' into e2e/db-healthcheck

.github/workflows/pr-build-and-e2e-tests.yml

@@ -137,6 +137,15 @@ jobs:
                   USER_SECRET: password
               run: pnpx wc-api-tests test api
 
+            - name: Upload API test report
+              uses: actions/upload-artifact@v2
+              with:
+                  name: api-test-report---pr-${{ github.event.number }}
+                  path: |
+                        package/woocommerce/packages/js/api-core-tests/allure-results
+                        package/woocommerce/packages/js/api-core-tests/allure-report
+                  retention-days: 7
+
     k6-tests-run:
         name: Runs k6 Performance tests
         runs-on: ubuntu-18.04

.github/workflows/pull-request-post-merge-processing.yml

@@ -30,7 +30,10 @@ jobs:
         with:
           php-version: '7.4'
       - name: "Run the script to assign a milestone"
-        if: "!github.event.pull_request.milestone"
+        if: |
+          contains(github.event.pull_request.labels.*.name, 'plugin: woocommerce') &&
+          !github.event.pull_request.milestone &&
+          github.event.pull_request.base.ref == 'trunk'
         run: php assign-milestone-to-merged-pr.php
         env:
           PULL_REQUEST_ID: ${{ github.event.pull_request.node_id }}

packages/js/admin-e2e-tests/src/fixtures/plugins.ts

@@ -3,6 +3,9 @@
  */
 import { httpClient } from './http-client';
 
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { utils } = require( '@woocommerce/e2e-utils' );
+
 const wpPluginsEndpoint = '/wp/v2/plugins';
 
 type Plugin = {
@@ -52,7 +55,10 @@ export async function deactivateAndDeleteAllPlugins( except: string[] = [] ) {
 	for ( const plugin of plugins ) {
 		const splitPluginName = plugin.plugin.split( '/' );
 		const slug = splitPluginName[ 1 ] || splitPluginName[ 0 ];
-		if ( ! except.includes( slug ) ) {
+		const slugFromName = utils.getSlug(
+			plugin.name.replace( ' &', '' )
+		);
+		if ( ! except.includes( slug ) && ! except.includes( slugFromName ) ) {
 			promises.push( deactivateAndDeletePlugin( plugin.plugin ) );
 		} else {
 			skippedPlugins.push( slug );

packages/js/admin-e2e-tests/src/specs/activate-and-setup/complete-onboarding-wizard.ts

@@ -449,10 +449,6 @@ const testSubscriptionsInclusion = () => {
 			await resetWooCommerceState();
 		} );
 
-		afterAll( async () => {
-			await login.logout();
-		} );
-
 		it( 'can complete the store details section', async () => {
 			await profileWizard.navigate();
 			await profileWizard.storeDetails.completeStoreDetailsSection( {
@@ -533,7 +529,6 @@ const testBusinessDetailsForm = () => {
 		const login = new Login( page );
 
 		beforeAll( async () => {
-			await login.login();
 			await resetWooCommerceState();
 		} );
 

packages/js/api-core-tests/bin/wc-api-tests.sh

@@ -35,7 +35,7 @@ report() {
 	REPORT_EXIT_CODE=$?
 
 	# Suggest opening the report
-	if [ $REPORT_EXIT_CODE -eq 0 ]; then
+	if [[ $REPORT_EXIT_CODE -eq 0 && $GITHUB_ACTIONS != "true" ]]; then
 		echo "To view the report on your browser, run:"
 		echo ""
 		echo "pnpx allure open \"$ALLURE_REPORT_DIR\""

packages/js/e2e-environment/CHANGELOG.md

@@ -8,6 +8,8 @@
 - Updated `resolveSingleE2EPath` 
   - it resolves the full path if the filePath is valid
   - otherwise, it removes `tests/e2e` from the given filePath before resolving a full path.
+- Updated `getLatestReleaseZipUrl` to make use of the assets download url over the archive zip.
+
 
 ## Added
 

packages/js/e2e-environment/utils/get-plugin-zip.js

@@ -77,11 +77,20 @@ const getLatestReleaseZipUrl = async (
 					}
 				} );
 			} else if ( authorizationToken ) {
-				// If it's a private repo, we need to download the archive this way
-				const tagName = body.tag_name;
-				resolve(
-					`https://github.com/${ repository }/archive/${ tagName }.zip`
-				);
+				// If it's a private repo, we need to download the archive this way.
+				// Use uploaded assets over downloading the zip archive.
+				if (
+					body.assets &&
+					body.assets.length > 0 &&
+					body.assets[ 0 ].browser_download_url
+				) {
+					resolve( body.assets[ 0 ].browser_download_url );
+				} else {
+					const tagName = body.tag_name;
+					resolve(
+						`https://github.com/${ repository }/archive/${ tagName }.zip`
+					);
+				}
 			} else {
 				resolve( body.assets[ 0 ].browser_download_url );
 			}

plugins/woocommerce/includes/admin/settings/views/html-webhooks-edit.php

@@ -152,7 +152,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</tbody>
 	</table>
 
-	<?php do_action( 'woocommerce_webhook_options' ); ?>
+	<?php
+	/**
+	 * Fires within the webhook editor, after the Webhook Data fields have rendered.
+	 *
+	 * @param WC_Webhook $webhook
+	 */
+	do_action( 'woocommerce_webhook_options', $webhook );
+	?>
 </div>
 
 <div id="webhook-actions" class="settings-panel">

plugins/woocommerce/tests/e2e/config/default.json

@@ -195,7 +195,11 @@
   "onboardingwizard": {
     "industry": "Test industry",
     "numberofproducts": "1 - 10",
-    "sellingelsewhere": "No"
+    "sellingelsewhere": "No",
+    "sellingOnAnotherPlatform": "Yes, on another platform",
+    "number_employees": "< 10",
+    "revenue": "Up to $2,500.00",
+    "other_platform_name": "Etsy"
   },
   "settings": {
     "shipping": {

plugins/woocommerce/tests/e2e/specs/activate-and-setup/complete-onboarding-wizard.test.js

@@ -1,11 +1,11 @@
 const {
 	testAdminOnboardingWizard,
 	testSelectiveBundleWCPay,
+	testDifferentStoreCurrenciesWCPay,
+	testSubscriptionsInclusion,
+	testBusinessDetailsForm,
 } = require( '@woocommerce/admin-e2e-tests' );
-const {
-	withRestApi,
-	IS_RETEST_MODE,
-} = require( '@woocommerce/e2e-utils' );
+const { withRestApi, IS_RETEST_MODE } = require( '@woocommerce/e2e-utils' );
 
 // Reset onboarding profile when re-running tests on a site
 if ( IS_RETEST_MODE ) {
@@ -14,3 +14,6 @@ if ( IS_RETEST_MODE ) {
 
 testAdminOnboardingWizard();
 testSelectiveBundleWCPay();
+testDifferentStoreCurrenciesWCPay();
+testSubscriptionsInclusion();
+testBusinessDetailsForm();

plugins/woocommerce/tests/e2e/specs/admin-homescreen/activity-panel.test.js

@@ -0,0 +1,3 @@
+const { testAdminHomescreenActivityPanel } = require( '@woocommerce/admin-e2e-tests' );
+
+testAdminHomescreenActivityPanel();

plugins/woocommerce/tests/e2e/specs/admin-homescreen/task-list.test.js

@@ -0,0 +1,3 @@
+const { testAdminHomescreenTasklist } = require( '@woocommerce/admin-e2e-tests' );
+
+testAdminHomescreenTasklist();