Skip to content

Commit f187c98

Browse files
mgascammgascam
committed
Refactor QIT development tools for WooPayments: update comments, enhance setup functions, and add connection validation tests
1 parent ebb5a08 commit f187c98

File tree

3 files changed

+201
-16
lines changed

3 files changed

+201
-16
lines changed

‎includes/wp-cli/class-wp-cli-qit-dev-command.php‎

Lines changed: 69 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use WCPay\Database_Cache;
99

1010
/**
11-
* QIT development tools for WooCommerce Payments E2E testing.
11+
* QIT development tools for WooPayments E2E testing.
1212
* Provides Jetpack connection setup for QIT environments.
1313
*/
1414
class WP_CLI_QIT_Dev_Command {
@@ -45,16 +45,22 @@ public function qit_setup( array $args, array $assoc_args ): void {
4545
$blog_token = isset( $assoc_args['blog_token'] ) ? (string) $assoc_args['blog_token'] : '123.ABC.QIT';
4646
$user_token = isset( $assoc_args['user_token'] ) ? (string) $assoc_args['user_token'] : '123.ABC.QIT.1';
4747

48+
// Force test mode BEFORE any other operations (since this is a test account).
49+
$this->force_test_mode();
50+
4851
// Set up Jetpack connection.
4952
$this->setup_jetpack_connection( $blog_id, $blog_token, $user_token );
5053

51-
// Refresh account data to get real account info from server.
54+
// Enable dev mode (like WCP Dev Tools plugin does).
55+
$this->enable_dev_mode();
56+
57+
// Refresh account data to get real account info from server (like regular E2E tests).
5258
if ( class_exists( 'WC_Payments' ) ) {
5359
$this->refresh_account_data();
5460
}
5561

56-
\WP_CLI::success( "QIT WCPay setup completed for blog ID {$blog_id}" );
57-
\WP_CLI::line( 'Account data will be fetched from server based on Jetpack connection.' );
62+
\WP_CLI::success( "QIT WooPayments setup completed for blog ID {$blog_id}" );
63+
\WP_CLI::line( 'Account data will be fetched from server based on Jetpack connection' );
5864
}
5965

6066
/**
@@ -76,7 +82,42 @@ private function setup_jetpack_connection( int $blog_id, string $blog_token, str
7682
}
7783

7884
/**
79-
* Refreshes WCPay account data from the server.
85+
* Enables WCP development mode like the WCP Dev Tools plugin.
86+
*/
87+
private function enable_dev_mode(): void {
88+
// Enable dev mode like WCP Dev Tools plugin does.
89+
update_option( 'wcpaydev_dev_mode', '1' );
90+
91+
// Add the dev mode filter like WCP Dev Tools plugin does.
92+
add_filter( 'wcpay_dev_mode', '__return_true' );
93+
94+
\WP_CLI::log( 'Enabled WCPay dev mode with filter' );
95+
}
96+
97+
/**
98+
* Forces WCP test mode by setting filters and gateway settings.
99+
*/
100+
private function force_test_mode(): void {
101+
// Force test mode onboarding and test mode since we're using a test account.
102+
add_filter( 'wcpay_test_mode_onboarding', '__return_true' );
103+
add_filter( 'wcpay_test_mode', '__return_true' );
104+
105+
// Also try setting the gateway settings to enable test mode.
106+
$gateway_settings = get_option( 'woocommerce_woocommerce_payments_settings', [] );
107+
$gateway_settings['test_mode'] = 'yes';
108+
update_option( 'woocommerce_woocommerce_payments_settings', $gateway_settings );
109+
110+
// CRITICAL: Use WC_Payments_Onboarding_Service to set test mode (this sets test_mode_onboarding).
111+
if ( class_exists( 'WC_Payments_Onboarding_Service' ) ) {
112+
\WC_Payments_Onboarding_Service::set_test_mode( true );
113+
\WP_CLI::log( 'Set WC_Payments_Onboarding_Service test mode - this enables test_mode_onboarding' );
114+
}
115+
116+
\WP_CLI::log( 'Forced WCPay test mode for test account (filters + gateway settings + onboarding service)' );
117+
}
118+
119+
/**
120+
* Refreshes account data from the WCP server and validates the connection.
80121
*/
81122
private function refresh_account_data(): void {
82123
if ( ! class_exists( 'WC_Payments' ) ) {
@@ -85,20 +126,37 @@ private function refresh_account_data(): void {
85126
}
86127

87128
try {
88-
\WC_Payments::get_account_service()->refresh_account_data();
89-
\WP_CLI::log( 'Account data refreshed from server' );
129+
$account_service = \WC_Payments::get_account_service();
130+
\WP_CLI::log( 'Attempting to refresh account data...' );
131+
132+
$result = $account_service->refresh_account_data();
133+
134+
// Check if data was actually set.
135+
$database_cache = \WC_Payments::get_database_cache();
136+
$account_data = $database_cache ? $database_cache->get( Database_Cache::ACCOUNT_KEY ) : null;
137+
138+
if ( $account_data ) {
139+
\WP_CLI::log( 'Account data refreshed successfully from server' );
140+
// Verify key fields exist without exposing sensitive data.
141+
$has_account_id = isset( $account_data['account_id'] ) && ! empty( $account_data['account_id'] );
142+
$has_keys = isset( $account_data['live_publishable_key'] ) || isset( $account_data['test_publishable_key'] );
143+
$status = $account_data['status'] ?? 'unknown';
144+
\WP_CLI::log( 'Account validation: ID=' . ( $has_account_id ? 'present' : 'missing' ) . ', Keys=' . ( $has_keys ? 'present' : 'missing' ) . ', Status=' . $status );
145+
} else {
146+
\WP_CLI::warning( 'Account refresh completed but no account data cached - connection may be invalid' );
147+
}
90148
} catch ( \Exception $e ) {
91-
\WP_CLI::log( 'Account refresh failed (expected in local dev): ' . $e->getMessage() );
149+
\WP_CLI::warning( 'Account refresh failed: ' . $e->getMessage() );
92150
}
93151
}
94152

95153
/**
96-
* Shows QIT WCPay connection status for debugging.
154+
* Shows QIT WooPayments connection status for debugging.
97155
*
98156
* @when after_wp_load
99157
*/
100158
public function qit_status(): void {
101-
\WP_CLI::line( '=== QIT WCPay Connection Status ===' );
159+
\WP_CLI::line( '=== QIT WooPayments Connection Status ===' );
102160

103161
if ( class_exists( 'Jetpack_Options' ) ) {
104162
$blog_id = Jetpack_Options::get_option( 'id' );
@@ -113,6 +171,6 @@ public function qit_status(): void {
113171
}
114172
}
115173

116-
\WP_CLI::line( 'Dev Mode: ' . ( get_option( 'wcpay_dev_mode' ) ? 'Enabled' : 'Disabled' ) );
174+
\WP_CLI::line( 'Dev Mode: ' . ( get_option( 'wcpaydev_dev_mode' ) ? 'Enabled' : 'Disabled' ) );
117175
}
118176
}

‎tests/qit/e2e/bootstrap/setup.sh‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
set -euo pipefail
44
IFS=$'\n\t'
55

6-
# QIT Bootstrap Setup for WooCommerce Payments E2E Tests
6+
# QIT Bootstrap Setup for WooPayments E2E Tests
77
# This script runs before tests to configure the plugin environment
88

9-
echo "Setting up WooCommerce Payments for E2E testing..."
9+
echo "Setting up WooPayments for E2E testing..."
1010

1111
# Ensure environment is marked as local so dev-only CLI commands are available
1212
wp config set WP_ENVIRONMENT_TYPE local --quiet 2>/dev/null || true
@@ -41,9 +41,13 @@ wp user create testcustomer [email protected] \
4141
--last_name="Customer" \
4242
--quiet
4343

44-
echo "Setting up WooCommerce Payments configuration..."
44+
echo "Setting up WooPayments configuration..."
4545

46-
# Check required environment variables for Jetpack authentication
46+
# Enable WooPayments settings (same as main E2E tests)
47+
echo "Creating/updating WooPayments settings"
48+
wp option set woocommerce_woocommerce_payments_settings --format=json '{"enabled":"yes"}'
49+
50+
# Check required environment variables for basic Jetpack authentication
4751
if [ -n "${E2E_JP_SITE_ID:-}" ] && [ -n "${E2E_JP_BLOG_TOKEN:-}" ] && [ -n "${E2E_JP_USER_TOKEN:-}" ]; then
4852
echo "Configuring WCPay with Jetpack authentication..."
4953

@@ -52,7 +56,7 @@ if [ -n "${E2E_JP_SITE_ID:-}" ] && [ -n "${E2E_JP_BLOG_TOKEN:-}" ] && [ -n "${E2
5256
--blog_token="$E2E_JP_BLOG_TOKEN" \
5357
--user_token="$E2E_JP_USER_TOKEN"
5458

55-
echo "✅ WCPay connection configured - account data fetched from server"
59+
echo "✅ WooPayments connection configured - account data fetched from server"
5660

5761
else
5862
echo "No Jetpack credentials configured - using default development mode"

‎tests/qit/e2e/checkout.spec.js‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
/**
2+
* External dependencies
3+
*/
4+
const { test, expect } = require( '@playwright/test' );
5+
import qit from '/qitHelpers';
6+
7+
/**
8+
* WooPayments Connection Validation Tests
9+
*
10+
* These tests verify that WooPayments is properly connected and configured
11+
* in the QIT E2E testing environment. They validate the core connection without
12+
* testing actual checkout functionality.
13+
*/
14+
test.describe( 'WooPayments Connection Status', () => {
15+
test( 'should verify WooPayments is connected (not showing Connect screen)', async ( {
16+
page,
17+
} ) => {
18+
// Login as admin first
19+
await qit.loginAsAdmin( page );
20+
21+
// Navigate directly to WooPayments settings
22+
await page.goto(
23+
'/wp-admin/admin.php?page=wc-settings&tab=checkout&section=woocommerce_payments'
24+
);
25+
26+
const pageContent = await page.textContent( 'body' );
27+
28+
// If we see primary "Connect" buttons, we're NOT connected
29+
if (
30+
pageContent.includes( 'Connect your store' ) ||
31+
pageContent.includes( 'Connect WooPayments' ) ||
32+
pageContent.includes( 'Set up WooPayments' )
33+
) {
34+
throw new Error(
35+
'WooPayments is NOT connected - showing Connect screen'
36+
);
37+
}
38+
39+
// Look for connected account configuration options
40+
// These elements only appear when WC Payments is connected and configured
41+
const hasConnectedFeatures =
42+
pageContent.includes( 'Enable WooPayments' ) ||
43+
pageContent.includes( 'Enable/disable' ) ||
44+
pageContent.includes( 'Payment methods' ) ||
45+
pageContent.includes( 'Capture charges automatically' ) ||
46+
pageContent.includes( 'Manual capture' ) ||
47+
pageContent.includes( 'Test mode' ) ||
48+
pageContent.includes( 'Debug mode' );
49+
50+
if ( ! hasConnectedFeatures ) {
51+
throw new Error(
52+
'No WooPayments configuration options found - may not be properly connected'
53+
);
54+
}
55+
56+
expect( hasConnectedFeatures ).toBe( true );
57+
58+
// Additional verification: Should not see primary connection prompts
59+
expect( pageContent ).not.toContain( 'Connect your store' );
60+
expect( pageContent ).not.toContain( 'Connect WooPayments' );
61+
} );
62+
63+
test( 'should verify account data is fetched from server', async ( {
64+
page,
65+
} ) => {
66+
// Login as admin first
67+
await qit.loginAsAdmin( page );
68+
69+
// Navigate to WooPayments overview page to check account status
70+
await page.goto(
71+
'/wp-admin/admin.php?page=wc-admin&path=%2Fpayments%2Foverview'
72+
);
73+
74+
const pageContent = await page.textContent( 'body' );
75+
76+
// Account should be connected via Jetpack
77+
// Look for specific indicators that account data was fetched from test account
78+
const hasAccountData =
79+
pageContent.includes( 'Test account' ) ||
80+
pageContent.includes( 'Live account' ) ||
81+
pageContent.includes( 'Account status' ) ||
82+
pageContent.includes( 'Payments' ) ||
83+
pageContent.includes( 'Overview' ) ||
84+
pageContent.includes( 'Deposits' ) ||
85+
pageContent.includes( 'Transactions' ) ||
86+
// Test account specific indicators
87+
pageContent.includes( 'acct_' ) || // Stripe account ID
88+
pageContent.includes( 'Your store is connected' ) ||
89+
pageContent.includes( 'Payment methods' );
90+
91+
if ( ! hasAccountData ) {
92+
// Check if we're seeing an error or connection issue
93+
if (
94+
pageContent.includes( 'Connect' ) ||
95+
pageContent.includes( 'Set up' )
96+
) {
97+
throw new Error(
98+
'Account is not connected - showing setup/connect screen'
99+
);
100+
}
101+
102+
if (
103+
pageContent.includes( 'Error' ) ||
104+
pageContent.includes( 'Unable to connect' )
105+
) {
106+
throw new Error(
107+
'Connection error detected - account data not fetched'
108+
);
109+
}
110+
111+
throw new Error(
112+
'No account data indicators found - connection may have failed'
113+
);
114+
}
115+
116+
// Verify Jetpack connection is working
117+
expect( hasAccountData ).toBe( true );
118+
119+
// Additional check: Should not see connection errors
120+
expect( pageContent ).not.toContain( 'Unable to connect' );
121+
expect( pageContent ).not.toContain( 'Connection failed' );
122+
} );
123+
} );

0 commit comments

Comments
 (0)