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

🧪 Fix for a couple of failing e2e tests (#47253) 

Co-authored-by: Jon Lane <jon.lane@automattic.com>
This commit is contained in:
Jonathan Lane 2024-05-09 01:33:26 -07:00 committed by GitHub
parent 54eba223b8
commit 18e83a2467
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 115 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce/changelog/e2e-fix-flaky-buildkite-tests Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: dev
Fix for a couple of flaky e2e tests

196
plugins/woocommerce/tests/e2e-pw/tests/merchant/products/block-editor/create-variable-product-block-editor.spec.js
View File

@ -79,113 +79,121 @@ test.describe( 'Variations tab', () => {
test.skip( 'can create a variation option and publish the product', async ( {
page,
} ) => {
await page.goto( NEW_EDITOR_ADD_PRODUCT_URL );
await disableVariableProductBlockTour( { page } );
await test.step( 'Load new product editor, disable tour', async () => {
await page.goto( NEW_EDITOR_ADD_PRODUCT_URL );
await disableVariableProductBlockTour( { page } );
} );
await clickOnTab( 'General', page );
await page
.getByPlaceholder( 'e.g. 12 oz Coffee Mug' )
.fill( productData.name );
await page
.locator(
'[data-template-block-id="basic-details"] .components-summary-control'
)
.last()
.fill( productData.summary );
await clickOnTab( 'Variations', page );
await page
.getByRole( 'heading', { name: 'Variation options' } )
.isVisible();
await page
.locator( '.woocommerce-attribute-field' )
.getByRole( 'button', {
name: 'Add sizes',
} )
.click();
await page
.getByRole( 'heading', { name: 'Add variation options' } )
.isVisible();
await page.locator( 'text=Create "Size"' ).click();
const attributeColumn = page.getByPlaceholder(
'Search or create attribute'
);
await expect( attributeColumn ).toHaveValue( 'Size' );
for ( const option of attributesData.options ) {
await test.step( 'Click on General tab, enter product name and summary', async () => {
await clickOnTab( 'General', page );
await page
.getByPlaceholder( 'e.g. 12 oz Coffee Mug' )
.fill( productData.name );
await page
.locator(
'.woocommerce-new-attribute-modal__table-attribute-value-column .woocommerce-experimental-select-control__input'
'[data-template-block-id="basic-details"] .components-summary-control'
)
.fill( option );
.last()
.fill( productData.summary );
} );
await page.locator( `text=Create "${ option }"` ).click();
await test.step( 'Click on Variations tab, add a new attribute', async () => {
await clickOnTab( 'Variations', page );
await page
.getByRole( 'heading', { name: 'Variation options' } )
.isVisible();
await page
.locator( '.woocommerce-attribute-field' )
.getByRole( 'button', {
name: 'Add sizes',
} )
.click();
} );
await test.step( 'Add attribute options', async () => {
await page
.getByRole( 'heading', { name: 'Add variation options' } )
.isVisible();
await page.waitForLoadState( 'domcontentloaded' );
await page.locator( 'text=Create "Size"' ).click();
const attributeColumn = page.getByPlaceholder(
'Search or create attribute'
);
await expect( attributeColumn ).toHaveValue( 'Size' );
for ( const option of attributesData.options ) {
await page
.locator(
'.woocommerce-new-attribute-modal__table-attribute-value-column .woocommerce-experimental-select-control__input'
)
.fill( option );
await page.locator( `text=Create "${ option }"` ).click();
await expect(
page.locator( '.woocommerce-attribute-term-field' )
).toContainText( option );
}
await page
.locator( '.woocommerce-new-attribute-modal__buttons' )
.getByRole( 'button', {
name: 'Add',
} )
.click();
} );
await test.step( 'Add prices to variations', async () => {
await expect(
page.getByText(
'3 variations do not have prices. Variations that do not have prices will not be visible to customers.Set prices'
)
).toBeVisible();
await page.on( 'dialog', ( dialog ) => dialog.accept( '50' ) );
await page
.getByRole( 'button', { name: 'Set prices' } )
.click();
await expect(
page.locator( '.woocommerce-attribute-term-field' )
).toContainText( option );
}
page.getByText( '$50.00' ).nth( 2 )
).toBeVisible();
await page
.locator( '.woocommerce-new-attribute-modal__buttons' )
.getByRole( 'button', {
name: 'Add',
} )
.click();
await expect(
page.getByLabel( 'Dismiss this notice' )
).toContainText( '3 variations updated.' );
page.on( 'dialog', ( dialog ) => dialog.accept( '50' ) );
await page.locator( `text=Set prices` ).click( { timeout: 3000 } );
await expect(
page.getByRole( 'button', { name: 'Select all (3)' } )
).toBeVisible();
} );
await page.waitForResponse(
( response ) =>
response
.url()
.includes( '/variations/batch?_locale=user' ) &&
response.status() === 200
);
await expect(
await test.step( 'Publish the product', async () => {
await page
.locator(
'.woocommerce-product-variations__table-body > div'
)
.count()
).toEqual( attributesData.options.length );
.locator( '.woocommerce-product-header__actions' )
.getByRole( 'button', {
name: 'Publish',
} )
.click();
await page
.locator( '.woocommerce-product-variations__table-body > div' )
.first()
.locator( 'text="$50.00"' )
.waitFor( { state: 'visible', timeout: 3000 } );
await page
.locator( '.woocommerce-product-header__actions' )
.getByRole( 'button', {
name: 'Publish',
} )
.click();
// await page
// .locator( '.woocommerce-product-publish-panel__header' )
// .getByRole( 'button', {
// name: 'Publish',
// } )
// .click();
const element = page.locator( 'div.components-snackbar__content' );
if ( Array.isArray( element ) ) {
await expect( await element[ 0 ].innerText() ).toMatch(
`${ attributesData.options.length } variations updated.`
const element = page.locator(
'div.components-snackbar__content'
);
await expect( await element[ 1 ].innerText() ).toMatch(
/Product published/
);
}
if ( Array.isArray( element ) ) {
await expect( await element[ 0 ].innerText() ).toMatch(
`${ attributesData.options.length } variations updated.`
);
await expect( await element[ 1 ].innerText() ).toMatch(
/Product published/
);
}
} );
} );
test( 'can edit a variation', async ( { page } ) => {

4
plugins/woocommerce/tests/e2e-pw/tests/merchant/products/block-editor/product-attributes-block-editor.spec.js
View File

@ -114,6 +114,8 @@ test.skip( 'can create and add attributes', async ( { page, product } ) => {
await test.step( 'add new attributes', async () => {
await page.getByRole( 'button', { name: 'Add new' } ).click();
await page.waitForLoadState( 'domcontentloaded' );
// Add attributes that do not exist
await page.getByPlaceholder( 'Search or create attribute' ).click();
@ -214,6 +216,8 @@ test.skip( 'can add existing attributes', async ( {
await test.step( 'add an existing attribute', async () => {
await page.getByRole( 'button', { name: 'Add new' } ).click();
await page.waitForLoadState( 'domcontentloaded' );
// Add attributes that do not exist
await page.getByPlaceholder( 'Search or create attribute' ).click();

8
plugins/woocommerce/tests/e2e-pw/tests/shopper/cart-checkout-calculate-tax.spec.js
View File

@ -159,7 +159,7 @@ test.describe.serial( 'Tax rates in the cart and checkout', () => {
).toBeVisible();
await expect(
page.getByRole( 'cell', {
name: '$250.00 (includes $50.00 Nasty Tax)',
name: '$250.00 (includes $50.00 Tax)',
} )
).toBeVisible();
} );
@ -180,8 +180,8 @@ test.describe.serial( 'Tax rates in the cart and checkout', () => {
} )
).toBeVisible();
await expect(
page.getByRole( 'row', {
name: 'Total $250.00 (includes $50.00 Nasty Tax)',
page.getByRole( 'cell', {
name: '$250.00 (includes $50.00 Tax)',
} )
).toBeVisible();
} );
@ -274,7 +274,7 @@ test.describe.serial( 'Tax rates in the cart and checkout', () => {
page.getByRole( 'row', { name: 'Subtotal $200.00' } )
).toBeVisible();
await expect(
page.getByRole( 'row', { name: 'Nasty Tax $50.00' } )
page.getByRole( 'row', { name: 'Tax $50.00' } )
).toBeVisible();
await expect(
page.getByRole( 'row', { name: 'Total $250.00' } )

1
plugins/woocommerce/tests/e2e-pw/utils/login.js
View File

@ -1,5 +1,6 @@
const { expect } = require( '../fixtures/fixtures' );
const logIn = async ( page, username, password, assertSuccess = true ) => {
await page.waitForSelector( 'form' );
await page.getByLabel( 'Username or Email Address' ).fill( username );
await page.getByRole( 'textbox', { name: 'Password' } ).fill( password );
await page.getByRole( 'button', { name: 'Log In' } ).click();