Specify the --user argument to wp wc CLI calls before wc (#4272)

* Specify the --user argument to wp wc CLI calls before wc
* Make the option setup more robust against a pre-existing woocommerce_stripe_settings option
* Changelog

---------

Co-authored-by: Malith Senaweera <[email protected]>

Author: daledupreez

bin/docker-setup.sh

@@ -103,7 +103,7 @@ cli wp option set woocommerce_allow_tracking "no"
 cli wp option set woocommerce_coming_soon "no"
 
 echo "Importing WooCommerce shop pages..."
-cli wp wc --user=admin tool run install_pages
+cli wp --user=admin wc tool run install_pages
 
 echo "Installing and activating the WordPress Importer plugin..."
 cli wp plugin install wordpress-importer --activate

changelog.txt

@@ -20,6 +20,7 @@
 * Fix - Prevents fatal errors for cases where we fail to load product details
 * Fix - Address an edge case with webhook URL comparisons
 * Fix - Show correct gateway name in non payments settings pages.
+* Dev - Minor fix to e2e setup code
 
 = 9.4.1 - 2025-04-17 =
 * Dev - Forces rollback of version 9.4.0.

readme.txt

@@ -130,5 +130,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Prevents fatal errors for cases where we fail to load product details
 * Fix - Address an edge case with webhook URL comparisons
 * Fix - Show correct gateway name in non payments settings pages.
+* Dev - Minor fix to e2e setup code
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

tests/e2e/bin/setup.sh

@@ -111,12 +111,12 @@ redirect_output cli wp option set woocommerce_coming_soon "no"
 echo " - Installing Storefront theme"
 redirect_output cli wp theme install storefront --activate
 
-redirect_output cli wp wc --user=${ADMIN_USER} tool run install_pages
+redirect_output cli wp --user=${ADMIN_USER} wc tool run install_pages
 
 echo " - Configuring Shipping and Taxes"
-redirect_output cli wp wc shipping_zone create --name="Everywhere" --order=1 --user=${ADMIN_USER}
-redirect_output cli wp wc shipping_zone_method create 1 --method_id="flat_rate" --user=${ADMIN_USER}
-redirect_output cli wp wc shipping_zone_method create 1 --method_id="free_shipping" --user=${ADMIN_USER}
+redirect_output cli wp --user=${ADMIN_USER} wc shipping_zone create --name="Everywhere" --order=1
+redirect_output cli wp --user=${ADMIN_USER} wc shipping_zone_method create 1 --method_id="flat_rate"
+redirect_output cli wp --user=${ADMIN_USER} wc shipping_zone_method create 1 --method_id="free_shipping"
 redirect_output cli wp option update --format=json woocommerce_flat_rate_1_settings '{"title":"Flat rate","tax_status":"taxable","cost":"10"}'
 
 echo " - Creating Cart and Checkout shortcode pages"
@@ -135,7 +135,7 @@ echo " - Activating plugin"
 redirect_output cli wp plugin activate woocommerce-gateway-stripe
 
 echo " - Updating WooCommerce Gateway Stripe settings"
-redirect_output cli wp option add woocommerce_stripe_settings --format=json "{\"enabled\":\"yes\",\"title\":\"Credit Card (Stripe)\",\"description\":\"Pay with your credit card via Stripe.\",\"api_credentials\":\"\",\"testmode\":\"yes\",\"test_publishable_key\":\"${STRIPE_PUB_KEY}\",\"test_secret_key\":\"${STRIPE_SECRET_KEY}\",\"publishable_key\":\"\",\"secret_key\":\"\",\"webhook\":\"\",\"test_webhook_secret\":\"\",\"webhook_secret\":\"\",\"inline_cc_form\":\"no\",\"statement_descriptor\":\"\",\"short_statement_descriptor\":\"\",\"capture\":\"yes\",\"payment_request\":\"yes\",\"payment_request_button_type\":\"buy\",\"payment_request_button_theme\":\"dark\",\"payment_request_button_locations\":[\"product\",\"cart\",\"checkout\"],\"payment_request_button_size\":\"default\",\"saved_cards\":\"yes\",\"logging\":\"no\",\"upe_checkout_experience_enabled\":\"yes\"}"
+redirect_output cli wp option update woocommerce_stripe_settings --format=json "{\"enabled\":\"yes\",\"title\":\"Credit Card (Stripe)\",\"description\":\"Pay with your credit card via Stripe.\",\"api_credentials\":\"\",\"testmode\":\"yes\",\"test_publishable_key\":\"${STRIPE_PUB_KEY}\",\"test_secret_key\":\"${STRIPE_SECRET_KEY}\",\"publishable_key\":\"\",\"secret_key\":\"\",\"webhook\":\"\",\"test_webhook_secret\":\"\",\"webhook_secret\":\"\",\"inline_cc_form\":\"no\",\"statement_descriptor\":\"\",\"short_statement_descriptor\":\"\",\"capture\":\"yes\",\"payment_request\":\"yes\",\"payment_request_button_type\":\"buy\",\"payment_request_button_theme\":\"dark\",\"payment_request_button_locations\":[\"product\",\"cart\",\"checkout\"],\"payment_request_button_size\":\"default\",\"saved_cards\":\"yes\",\"logging\":\"no\",\"upe_checkout_experience_enabled\":\"yes\"}"
 
 echo " - Enabling the ACH feature flag"
 redirect_output cli wp option update _wcstripe_feature_lpm_ach 'yes'

tests/e2e/utils/playwright-setup.js

@@ -255,12 +255,12 @@ export const setupWoo = async () => {
 		'wp option set woocommerce_product_type "both"',
 		'wp option set woocommerce_allow_tracking "no"',
 		'wp option set woocommerce_coming_soon "no"',
-		`wp wc --user=${ ADMIN_USER } tool run install_pages`,
+		`wp --user=${ ADMIN_USER } wc tool run install_pages`,
 		'wp plugin install wordpress-importer --activate',
 		'wp import wp-content/plugins/woocommerce/sample-data/sample_products.xml --authors=skip',
-		`wp wc shipping_zone create --name="Everywhere" --order=1 --user=${ ADMIN_USER }`,
-		`wp wc shipping_zone_method create 1 --method_id="flat_rate" --user=${ ADMIN_USER }`,
-		`wp wc shipping_zone_method create 1 --method_id="free_shipping" --user=${ ADMIN_USER }`,
+		`wp --user=${ ADMIN_USER } wc shipping_zone create --name="Everywhere" --order=1`,
+		`wp --user=${ ADMIN_USER } wc shipping_zone_method create 1 --method_id="flat_rate"`,
+		`wp --user=${ ADMIN_USER } wc shipping_zone_method create 1 --method_id="free_shipping"`,
 		`wp option update --format=json woocommerce_flat_rate_1_settings '{"title":"Flat rate","tax_status":"taxable","cost":"10"}'`,
 		`wp post create --post_type=page --post_title='Cart Shortcode' --post_name='cart-shortcode' --post_status=publish --page_template='template-fullwidth.php' --post_content='${ shortcodeCartPostContent }'`,
 		`wp post create --post_type=page --post_title='Checkout Shortcode' --post_name='checkout-shortcode' --post_status=publish --page_template='template-fullwidth.php' --post_content='${ shortcodeCheckoutPostContent }'`,