Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' of github.com:woocommerce/woocommerce into add/e2e-db-upgrade

This commit is contained in:
Greg 2021-08-06 09:34:43 -06:00
parent 6dd33564b9 cc106854b4
commit f3447f713d
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/smoke-test-daily.yml vendored
View File

@ -32,6 +32,7 @@ jobs:
SMOKE_TEST_URL: ${{ secrets.SMOKE_TEST_URL }} SMOKE_TEST_URL: ${{ secrets.SMOKE_TEST_URL }}
SMOKE_TEST_ADMIN_USER: ${{ secrets.SMOKE_TEST_ADMIN_USER }} SMOKE_TEST_ADMIN_USER: ${{ secrets.SMOKE_TEST_ADMIN_USER }}
SMOKE_TEST_ADMIN_PASSWORD: ${{ secrets.SMOKE_TEST_ADMIN_PASSWORD }} SMOKE_TEST_ADMIN_PASSWORD: ${{ secrets.SMOKE_TEST_ADMIN_PASSWORD }}
SMOKE_TEST_ADMIN_USER_EMAIL: ${{ secrets.SMOKE_TEST_ADMIN_USER_EMAIL }}
SMOKE_TEST_CUSTOMER_USER: ${{ secrets.SMOKE_TEST_CUSTOMER_USER }} SMOKE_TEST_CUSTOMER_USER: ${{ secrets.SMOKE_TEST_CUSTOMER_USER }}
SMOKE_TEST_CUSTOMER_PASSWORD: ${{ secrets.SMOKE_TEST_CUSTOMER_PASSWORD }} SMOKE_TEST_CUSTOMER_PASSWORD: ${{ secrets.SMOKE_TEST_CUSTOMER_PASSWORD }}
WC_E2E_SCREENSHOTS: 1 WC_E2E_SCREENSHOTS: 1

2
includes/admin/meta-boxes/views/html-product-data-general.php
View File

@ -31,6 +31,8 @@ defined( 'ABSPATH' ) || exit;
'description' => __( 'This text will be shown on the button linking to the external product.', 'woocommerce' ), 'description' => __( 'This text will be shown on the button linking to the external product.', 'woocommerce' ),
) )
); );
do_action( 'woocommerce_product_options_external' );
?> ?>
</div> </div>

3
tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/no-standalone-expect */
/** /**
* Internal dependencies * Internal dependencies
*/ */
@ -12,7 +11,7 @@ const {
const config = require( 'config' ); const config = require( 'config' );
const customerEmail = config.get( 'addresses.customer.billing.email' ); const customerEmail = config.get( 'addresses.customer.billing.email' );
const adminEmail = 'admin@woocommercecoree2etestsuite.com'; const adminEmail = config.has( 'users.admin.email' ) ? config.get( 'users.admin.email' ) : 'admin@woocommercecoree2etestsuite.com';
const storeName = 'WooCommerce Core E2E Test Suite'; const storeName = 'WooCommerce Core E2E Test Suite';
let orderId; let orderId;

3
tests/e2e/env/config/custom-environment-variables.json vendored
View File

@ -3,7 +3,8 @@
"users": { "users": {
"admin": { "admin": {
"username": "SMOKE_TEST_ADMIN_USER", "username": "SMOKE_TEST_ADMIN_USER",
"password": "SMOKE_TEST_ADMIN_PASSWORD" "password": "SMOKE_TEST_ADMIN_PASSWORD",
"email": "SMOKE_TEST_ADMIN_USER_EMAIL"
}, },
"customer": { "customer": {
"username": "SMOKE_TEST_CUSTOMER_USER", "username": "SMOKE_TEST_CUSTOMER_USER",