diff --git a/tests/qa/parallel.projects.config.ts b/tests/qa/parallel.projects.config.ts deleted file mode 100644 index 29f0e8801..000000000 --- a/tests/qa/parallel.projects.config.ts +++ /dev/null @@ -1,142 +0,0 @@ -export const parallelProjects = [ - { - name: 'parallel-transaction-block', - dependencies: [ 'setup-gateway-block-paypal-pay-later-acdc' ], - testMatch: /01-block-germany\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /02-classic-germany\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-block-excluding-tax', - dependencies: [ 'setup-gateway-block-paypal-pay-later-acdc' ], - testMatch: /03-block-germany-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-excluding-tax', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /04-classic-germany-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-block-authorized', - dependencies: [ 'setup-gateway-block-paypal-pay-later-acdc' ], - testMatch: /05-block-germany-authorized\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-authorized', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /06-classic-germany-authorized\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-block-button-orientation', - dependencies: [ 'setup-gateway-block-paypal-pay-later-acdc' ], - testMatch: /07-block-germany-button-orientation\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-button-orientation', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /08-classic-germany-button-orientation\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-wp-debugging', - dependencies: [ 'setup-gateway-block-paypal-pay-later-acdc' ], - testMatch: /09-block-germany-wp-debugging\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-wp-debugging', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /10-classic-germany-wp-debugging\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-standard-card-button', - dependencies: [ 'setup-gateway-classic-standard-card-button' ], - testMatch: /11-classic-germany-standard-card-button\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-standard-card-button-excluding-tax', - dependencies: [ 'setup-gateway-classic-standard-card-button' ], - testMatch: - /12-classic-germany-standard-card-button-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-standard-card-button-authorized', - dependencies: [ 'setup-gateway-classic-standard-card-button' ], - testMatch: /13-classic-germany-standard-card-button-authorized\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-debit-or-credit-card', - dependencies: [ 'setup-gateway-classic-debit-or-credit-card' ], - testMatch: /14-classic-germany-debit-or-credit-card\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-debit-or-credit-card-excluding-tax', - dependencies: [ 'setup-gateway-classic-debit-or-credit-card' ], - testMatch: - /15-classic-germany-debit-or-credit-card-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-germany', - dependencies: [ 'setup-gateway-classic-pay-upon-invoice' ], - testMatch: /16-classic-germany-pay-upon-invoice\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-germany-excluding-tax', - dependencies: [ 'setup-gateway-classic-pay-upon-invoice' ], - testMatch: /17-classic-germany-pay-upon-invoice-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-mexico', - dependencies: [ 'setup-gateway-classic-oxxo' ], - testMatch: /18-classic-mexico-oxxo\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-mexico-excluding-tax', - dependencies: [ 'setup-gateway-classic-oxxo' ], - testMatch: /19-classic-mexico-oxxo-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-usa', - dependencies: [ 'setup-gateway-classic-venmo' ], - testMatch: /20-classic-usa-venmo\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-usa-excluding-tax', - dependencies: [ 'setup-gateway-classic-venmo' ], - testMatch: /21-classic-usa-venmo-excluding-tax\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-transaction-classic-specific-merchant', - dependencies: [ 'setup-store-classic-germany' ], - testMatch: /22-classic-germany-specific-merchant\.spec/, - fullyParallel: true, - }, - { - name: 'parallel-refund', - dependencies: [ 'setup-gateway-classic-paypal-pay-later-acdc' ], - testMatch: /parallel-refund-block-germany\.spec/, - fullyParallel: true, - }, -]; diff --git a/tests/qa/playwright.config.ts b/tests/qa/playwright.config.ts index 0d708165e..e243dca70 100644 --- a/tests/qa/playwright.config.ts +++ b/tests/qa/playwright.config.ts @@ -96,8 +96,6 @@ export default defineConfig( { fullyParallel: false, }, ...storeSetupProjects, - ...pcpSetupProjects, - ...gatewaySetupProjects, { name: 'all', dependencies: [ 'setup-woocommerce' ], diff --git a/tests/qa/resources/types.ts b/tests/qa/resources/types.ts index faeab29e0..06ceebea0 100644 --- a/tests/qa/resources/types.ts +++ b/tests/qa/resources/types.ts @@ -46,18 +46,6 @@ export type PcpPayment = { }; export namespace PcpSettings { - export type StandardPayments = { [ key: string ]: any }; - - export type PayLater = { [ key: string ]: any }; - - export type AdvancedCardProcessing = { [ key: string ]: any }; - - export type StandardCardButton = { [ key: string ]: any }; - - export type Oxxo = { [ key: string ]: any }; - - export type PayUponInvoice = { [ key: string ]: any }; - export type OnboardingStepTitle = | 'PayPal Payments' | 'Set up store type' @@ -80,16 +68,3 @@ export namespace PcpSettings { enableOptionalPaymentMethods: boolean; }; } - -export type PcpConfig = { - merchant?: PcpMerchant; - clearPCPDB?: boolean; - disconnectMerchant?: boolean; - enablePayUponInvoice?: boolean; - standardPayments?: PcpSettings.StandardPayments; - payLater?: PcpSettings.PayLater; - advancedCardProcessing?: PcpSettings.AdvancedCardProcessing; - standardCardButton?: PcpSettings.StandardCardButton; - oxxo?: PcpSettings.Oxxo; - payUponInvoice?: PcpSettings.PayUponInvoice; -}; diff --git a/tests/qa/tests/.setup/gateways/index.ts b/tests/qa/tests/.setup/gateways/index.ts deleted file mode 100644 index e216f4000..000000000 --- a/tests/qa/tests/.setup/gateways/index.ts +++ /dev/null @@ -1,44 +0,0 @@ -export const gatewaySetupProjects = [ - { - name: 'setup-gateway-block-paypal-pay-later-acdc', - dependencies: [ 'setup-pcp-block-germany' ], - testMatch: /setup-gateway-paypal-pay-later-acdc\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-paypal-pay-later-acdc', - dependencies: [ 'setup-pcp-classic-germany' ], - testMatch: /setup-gateway-paypal-pay-later-acdc\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-standard-card-button', - dependencies: [ 'setup-pcp-classic-germany' ], - testMatch: /setup-gateway-standard-card-button\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-debit-or-credit-card', - dependencies: [ 'setup-pcp-classic-germany' ], - testMatch: /setup-gateway-debit-or-credit-card\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-pay-upon-invoice', - dependencies: [ 'setup-pcp-classic-germany' ], - testMatch: /setup-gateway-pay-upon-invoice\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-venmo', - dependencies: [ 'setup-pcp-classic-usa' ], - testMatch: /setup-gateway-venmo\.ts/, - fullyParallel: false, - }, - { - name: 'setup-gateway-classic-oxxo', - dependencies: [ 'setup-pcp-classic-mexico' ], - testMatch: /setup-gateway-oxxo\.ts/, - fullyParallel: false, - }, -]; \ No newline at end of file diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-debit-or-credit-card.ts b/tests/qa/tests/.setup/gateways/setup-gateway-debit-or-credit-card.ts deleted file mode 100644 index 8fb2d8c3c..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-debit-or-credit-card.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { debitOrCreditCard } from '../../../resources'; - -setup( 'Setup Debit or Credit Card', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( debitOrCreditCard.method ); -} ); diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-oxxo.ts b/tests/qa/tests/.setup/gateways/setup-gateway-oxxo.ts deleted file mode 100644 index 454157501..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-oxxo.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { oxxo } from '../../../resources'; - -setup( 'Setup OXXO', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( oxxo.method ); -} ); diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-pay-upon-invoice.ts b/tests/qa/tests/.setup/gateways/setup-gateway-pay-upon-invoice.ts deleted file mode 100644 index 49304885e..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-pay-upon-invoice.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { payUponInvoice } from '../../../resources'; - -setup( 'Setup Pay upon Invoice', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( payUponInvoice.method ); -} ); diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-paypal-pay-later-acdc.ts b/tests/qa/tests/.setup/gateways/setup-gateway-paypal-pay-later-acdc.ts deleted file mode 100644 index 654a7d329..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-paypal-pay-later-acdc.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { acdc, payLater, payPal } from '../../../resources'; - -setup( 'Setup PayPal, Pay Later, ACDC', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( payPal.method ); - await utils.pcpPaymentMethodIsEnabled( payLater.method ); - await utils.pcpPaymentMethodIsEnabled( acdc.method ); -} ); diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-standard-card-button.ts b/tests/qa/tests/.setup/gateways/setup-gateway-standard-card-button.ts deleted file mode 100644 index 308a32611..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-standard-card-button.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { standardCardButton } from '../../../resources'; - -setup( 'Setup Standard Card Button', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( standardCardButton.method ); -} ); diff --git a/tests/qa/tests/.setup/gateways/setup-gateway-venmo.ts b/tests/qa/tests/.setup/gateways/setup-gateway-venmo.ts deleted file mode 100644 index 7260e36c1..000000000 --- a/tests/qa/tests/.setup/gateways/setup-gateway-venmo.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { venmo } from '../../../resources'; - -setup( 'Setup Venmo', async ( { utils } ) => { - await utils.pcpPaymentMethodIsEnabled( venmo.method ); -} ); diff --git a/tests/qa/tests/.setup/pcp/index.ts b/tests/qa/tests/.setup/pcp/index.ts deleted file mode 100644 index ca5e1e2ce..000000000 --- a/tests/qa/tests/.setup/pcp/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -export const pcpSetupProjects = [ - { - name: 'setup-pcp-block-germany', - dependencies: [ 'setup-store-block-germany' ], - testMatch: /setup-pcp-germany\.ts/, - fullyParallel: false, - }, - { - name: 'setup-pcp-classic-germany', - dependencies: [ 'setup-store-classic-germany' ], - testMatch: /setup-pcp-germany\.ts/, - fullyParallel: false, - }, - { - name: 'setup-pcp-classic-mexico', - dependencies: [ 'setup-store-classic-mexico' ], - testMatch: /setup-pcp-mexico\.ts/, - fullyParallel: false, - }, - { - name: 'setup-pcp-classic-usa', - dependencies: [ 'setup-store-classic-usa' ], - testMatch: /setup-pcp-usa\.ts/, - fullyParallel: false, - }, -]; \ No newline at end of file diff --git a/tests/qa/tests/.setup/pcp/setup-pcp-germany.ts b/tests/qa/tests/.setup/pcp/setup-pcp-germany.ts deleted file mode 100644 index ea6e8158c..000000000 --- a/tests/qa/tests/.setup/pcp/setup-pcp-germany.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { pcpConfigGermany } from '../../../resources'; - -setup( 'Setup PCP merchant from Germany', async ( { utils } ) => { - await utils.configurePcp( pcpConfigGermany ); -} ); diff --git a/tests/qa/tests/.setup/pcp/setup-pcp-mexico.ts b/tests/qa/tests/.setup/pcp/setup-pcp-mexico.ts deleted file mode 100644 index 47bedfbb8..000000000 --- a/tests/qa/tests/.setup/pcp/setup-pcp-mexico.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { pcpConfigMexico } from '../../../resources'; - -setup( 'Setup PCP merchant from Mexico', async ( { utils } ) => { - await utils.configurePcp( pcpConfigMexico ); -} ); diff --git a/tests/qa/tests/.setup/pcp/setup-pcp-usa.ts b/tests/qa/tests/.setup/pcp/setup-pcp-usa.ts deleted file mode 100644 index 446f4fcdd..000000000 --- a/tests/qa/tests/.setup/pcp/setup-pcp-usa.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Internal dependencies - */ -import { test as setup } from '../../../utils'; -import { pcpConfigUsa } from '../../../resources'; - -setup( 'Setup PCP merchant from USA', async ( { utils } ) => { - await utils.configurePcp( pcpConfigUsa ); -} ); diff --git a/tests/qa/utils/utils.ts b/tests/qa/utils/utils.ts index b9e2f312b..44dd00da9 100644 --- a/tests/qa/utils/utils.ts +++ b/tests/qa/utils/utils.ts @@ -25,7 +25,6 @@ import { wpDebuggingPlugin, pcpPlugin, PcpMerchant, - PcpConfig, } from '../resources'; import { getCustomerStorageStateName } from './helpers'; @@ -243,7 +242,7 @@ export class Utils { } }; - configurePcp = async ( data: PcpConfig ) => { + configurePcp = async ( data ) => { if ( ! ( await this.requestUtils.isPluginInstalled( pcpPlugin.slug ) ) ) {