Merge branch 'develop' into woopmnt-5447-backend-update-backend-for-new-challenge-forms

Author: mgascam

changelog/chore-add-amazon-pay-feature-flag

@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+chore: add amazon pay feature flag.

changelog/dev-qit-e2e-basic-checkout

@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Dev only changes to run E2E tests with QIT.

changelog/fix-payment-methods-logos-overflow-text-color

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: text color of payment method icons on checkout page when a dark background is used

client/checkout/blocks/payment-methods-logos/style.scss

@@ -21,7 +21,7 @@
 		width: 38px;
 		height: 24px;
 		background-color: rgba( $gray-700, 0.1 );
-		color: $gray-900;
+		color: var( --wp--preset--color--contrast, $gray-900 );
 		text-align: center;
 		line-height: 24px;
 		border-radius: 3px;

includes/class-wc-payments-features.php

@@ -31,6 +31,7 @@ class WC_Payments_Features {
 	const WOOPAY_GLOBAL_THEME_SUPPORT_FLAG_NAME               = '_wcpay_feature_woopay_global_theme_support';
 	const WCPAY_DYNAMIC_CHECKOUT_PLACE_ORDER_BUTTON_FLAG_NAME = '_wcpay_feature_dynamic_checkout_place_order_button';
 	const ACCOUNT_DETAILS_FLAG_NAME                           = '_wcpay_feature_account_details';
+	const AMAZON_PAY_FLAG_NAME                                = '_wcpay_feature_amazon_pay';
 
 	/**
 	 * Indicates whether card payments are enabled for this (Stripe) account.
@@ -362,6 +363,15 @@ public static function is_account_details_enabled(): bool {
 		return '1' === get_option( self::ACCOUNT_DETAILS_FLAG_NAME, '0' );
 	}
 
+	/**
+	 * Checks whether Amazon Pay is enabled.
+	 *
+	 * @return bool
+	 */
+	public static function is_amazon_pay_enabled(): bool {
+		return '1' === get_option( self::AMAZON_PAY_FLAG_NAME, '0' );
+	}
+
 	/**
 	 * Returns feature flags as an array suitable for display on the front-end.
 	 *

tests/qit/config/default.env

@@ -7,3 +7,11 @@
 QIT_USER=your_qit_username
 QIT_PASSWORD=your_qit_application_password
 
+# ===========================================
+# E2E TEST CREDENTIALS (optional - for basic connectivity testing)
+# ===========================================
+# These provide basic WooPayments plugin connectivity for E2E tests
+E2E_JP_SITE_ID=your_site_id_here
+E2E_JP_BLOG_TOKEN=your_blog_token_here
+E2E_JP_USER_TOKEN=your_user_token_here
+

tests/qit/e2e-runner.sh

@@ -22,18 +22,63 @@ echo "Running E2E tests..."
 # Change to project root directory to build plugin
 cd "$WCP_ROOT"
 
-# Foundation version: Simplified build process for easier testing
-# For this foundation PR, we'll always build to avoid complex signature computation issues
+# Compute a signature of sources relevant to the release build and
+# skip rebuilding if nothing has changed since the last build.
+compute_build_signature() {
+    # Hash tracked files that affect the release artifact. This includes
+    # sources packaged in the zip and build/config files that affect the output.
+    git ls-files -z -- \
+        assets \
+        i18n \
+        includes \
+        languages \
+        lib \
+        src \
+        templates \
+        client \
+        tasks/release.js \
+        webpack \
+        webpack.config.js \
+        babel.config.js \
+        package.json \
+        package-lock.json \
+        composer.json \
+        composer.lock \
+        woocommerce-payments.php \
+        changelog.txt \
+        readme.txt \
+        SECURITY.md \
+        2>/dev/null \
+    | xargs -0 shasum -a 256 2>/dev/null \
+    | shasum -a 256 \
+    | awk '{print $1}'
+
+    # Explicitly return 0 to avoid pipefail issues
+    return 0
+}
 
 BUILD_HASH_FILE="$WCP_ROOT/woocommerce-payments.zip.hash"
 
-# For this foundation PR, always build if zip doesn't exist or if forced
-if [[ -n "${WCP_FORCE_BUILD:-}" ]] || [[ ! -f "woocommerce-payments.zip" ]]; then
-    echo "Building WooPayments plugin..."
+CURRENT_SIG="$(compute_build_signature)"
+
+# If WCP_FORCE_BUILD is set, always rebuild
+if [[ -n "${WCP_FORCE_BUILD:-}" ]]; then
+    echo "WCP_FORCE_BUILD set; forcing build of WooPayments plugin..."
     npm run build:release
-    echo "foundation-build-$(date +%s)" > "$BUILD_HASH_FILE"
+    echo "$CURRENT_SIG" > "$BUILD_HASH_FILE"
+elif [[ -f "woocommerce-payments.zip" && -f "$BUILD_HASH_FILE" ]]; then
+    LAST_SIG="$(cat "$BUILD_HASH_FILE" 2>/dev/null || true)"
+    if [[ "$CURRENT_SIG" == "$LAST_SIG" && -n "$CURRENT_SIG" ]]; then
+        echo "No relevant changes detected since last build; skipping build."
+    else
+        echo "Changes detected; rebuilding WooPayments plugin..."
+        npm run build:release
+        echo "$CURRENT_SIG" > "$BUILD_HASH_FILE"
+    fi
 else
-    echo "Using existing woocommerce-payments.zip"
+    echo "Building WooPayments plugin..."
+    npm run build:release
+    echo "$CURRENT_SIG" > "$BUILD_HASH_FILE"
 fi
 
 # Change to QIT directory so qit.yml is automatically found
@@ -46,10 +91,27 @@ else
     QIT_CMD="$QIT_BINARY"
 fi
 
-echo "Running QIT E2E foundation tests (no Jetpack credentials)..."
+# Pass basic Jetpack environment variables
+env_args=()
+if [[ -n "${E2E_JP_SITE_ID:-}" ]]; then
+    env_args+=( --env "E2E_JP_SITE_ID=${E2E_JP_SITE_ID}" )
+fi
+if [[ -n "${E2E_JP_BLOG_TOKEN:-}" ]]; then
+    env_args+=( --env "E2E_JP_BLOG_TOKEN=${E2E_JP_BLOG_TOKEN}" )
+fi
+if [[ -n "${E2E_JP_USER_TOKEN:-}" ]]; then
+    env_args+=( --env "E2E_JP_USER_TOKEN=${E2E_JP_USER_TOKEN}" )
+fi
 
 # Run our QIT E2E tests (qit.yml automatically loaded from current directory)
-"$QIT_CMD" run:e2e woocommerce-payments ./e2e \
-    --source "$WCP_ROOT/woocommerce-payments.zip"
+echo "Running QIT E2E tests with Jetpack functionality..."
+if [ ${#env_args[@]} -eq 0 ]; then
+    "$QIT_CMD" run:e2e woocommerce-payments ./e2e \
+        --source "$WCP_ROOT/woocommerce-payments.zip"
+else
+    "$QIT_CMD" run:e2e woocommerce-payments ./e2e \
+        --source "$WCP_ROOT/woocommerce-payments.zip" \
+        "${env_args[@]}"
+fi
 
 echo "QIT E2E foundation tests completed!"

tests/qit/e2e/basic.spec.js

@@ -15,15 +15,13 @@ test( 'Load home page', async ( { page } ) => {
 } );
 
 /**
- * Test WooCommerce Payments onboarding flow access
- * Since we're running in development mode without Jetpack connection,
- * we expect to always land on the onboarding flow.
+ * Test admin authentication and WooPayments plugin access
  */
-test( 'Access WooCommerce Payments onboarding as admin', async ( { page } ) => {
+test( 'Access WooPayments as admin', async ( { page } ) => {
 	// Use QIT helper to login as admin
 	await qit.loginAsAdmin( page );
 
-	// Navigate to WooCommerce Payments settings
+	// Navigate to WooPayments settings
 	await page.goto(
 		'/wp-admin/admin.php?page=wc-admin&path=%2Fpayments%2Foverview'
 	);
@@ -33,13 +31,21 @@ test( 'Access WooCommerce Payments onboarding as admin', async ( { page } ) => {
 		page.locator( 'h1:not(.screen-reader-text)' ).first()
 	).toContainText( /Settings|Payments|Overview/, { timeout: 15000 } );
 
-	// In development mode without Jetpack connection, we should be on onboarding
-	expect( page.url() ).toContain( 'onboarding' );
+	// Check that we can successfully load the WooPayments interface
+	// Either we get the overview (if fully connected) OR the onboarding.
+	const isOnboarding = page.url().includes( 'onboarding' );
+	const isOverview = page.url().includes( 'payments' );
 
-	// The onboarding page should load without errors
-	await expect( page.locator( 'body' ) ).not.toHaveText(
-		/500|404|Fatal error/
-	);
+	// We should be on either the onboarding or overview page (both indicate success)
+	expect( isOnboarding || isOverview ).toBe( true );
+
+	// If we're on onboarding, it should be functional (not errored)
+	if ( isOnboarding ) {
+		// The onboarding page should load without errors
+		await expect( page.locator( 'body' ) ).not.toHaveText(
+			/500|404|Fatal error/
+		);
+	}
 } );
 
 /**