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

Merge pull request #30822 from woocommerce/fix/25963 

add product id support to addToCartFromShopPage / removeFromCart
This commit is contained in:
Greg 2021-09-28 10:22:26 -06:00 committed by GitHub
parent 2bc34aac53 ef778b8985
commit 1d4310a52f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
View File

@ -23,7 +23,6 @@ const {
const config = require( 'config' );
const simpleProductPrice = config.has( 'products.simple.price' ) ? config.get( 'products.simple.price' ) : '9.99';
const simpleProductName = config.get( 'products.simple.name' );
const california = 'state:US:CA';
const sanFranciscoZIP = '94107';
const shippingZoneNameUS = 'US with Flat rate';
@ -32,8 +31,10 @@ const shippingZoneNameSF = 'SF with Local pickup';
const runAddNewShippingZoneTest = () => {
describe('WooCommerce Shipping Settings - Add new shipping zone', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
await withRestApi.deleteAllShippingZones();
await merchant.login();
});
@ -64,7 +65,7 @@ const runAddNewShippingZoneTest = () => {
// Add product to cart as a shopper
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCart();
// Set shipping country to United States (US)
@ -120,7 +121,7 @@ const runAddNewShippingZoneTest = () => {
await expect(page).toMatchElement('.shipping ul#shipping_method > li', {text: 'Local pickup'});
await expect(page).toMatchElement('.order-total .amount', {text: `$${simpleProductPrice}`});
await shopper.removeFromCart(simpleProductName);
await shopper.removeFromCart( productId );
});
});
};

11
tests/e2e/core-tests/specs/shopper/front-end-cart-calculate-shipping.test.js
View File

@ -35,9 +35,12 @@ const shippingCountryFR = 'country:FR';
const runCartCalculateShippingTest = () => {
describe('Cart Calculate Shipping', () => {
let firstProductId;
let secondProductId;
beforeAll(async () => {
await createSimpleProduct(firstProductName);
await createSimpleProduct(secondProductName, secondProductPrice);
firstProductId = await createSimpleProduct(firstProductName);
secondProductId = await createSimpleProduct(secondProductName, secondProductPrice);
await withRestApi.resetSettingsGroupToDefault( 'general' );
@ -56,7 +59,7 @@ const runCartCalculateShippingTest = () => {
it('allows customer to calculate Free Shipping if in Germany', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(firstProductName);
await shopper.addToCartFromShopPage( firstProductId );
await shopper.goToCart();
// Set shipping country to Germany
@ -97,7 +100,7 @@ const runCartCalculateShippingTest = () => {
it('should show correct total cart price with 2 products and flat rate', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(secondProductName);
await shopper.addToCartFromShopPage( secondProductId );
await shopper.goToCart();
await shopper.setCartQuantity(firstProductName, 1);

6
tests/e2e/core-tests/specs/shopper/front-end-cart-coupons.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
/**
* Internal dependencies
*/
@ -43,15 +42,16 @@ const getCoupon = (couponType) => {
const runCartApplyCouponsTest = () => {
describe('Cart applying coupons', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
couponFixedCart = await createCoupon();
couponPercentage = await createCoupon('50', 'Percentage discount');
couponFixedProduct = await createCoupon('5', 'Fixed product discount');
await shopper.emptyCart();
await shopper.goToShop();
await shopper.addToCartFromShopPage('Simple product');
await shopper.addToCartFromShopPage( productId );
await uiUnblocked();
await shopper.goToCart();
});

5
tests/e2e/core-tests/specs/shopper/front-end-cart-redirection.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
/**
* Internal dependencies
*/
@ -50,7 +49,7 @@ const runCartRedirectionTest = () => {
await page.waitFor(1000); // to avoid flakiness
await shopper.productIsInCart(simpleProductName);
await shopper.removeFromCart(simpleProductName);
await shopper.removeFromCart( simplePostIdValue );
});
it('can redirect user to cart from detail page', async () => {
@ -61,7 +60,7 @@ const runCartRedirectionTest = () => {
await page.waitFor(1000); // to avoid flakiness
await shopper.productIsInCart(simpleProductName);
await shopper.removeFromCart(simpleProductName);
await shopper.removeFromCart( simplePostIdValue );
});
afterAll(async () => {

12
tests/e2e/core-tests/specs/shopper/front-end-cart.test.js
View File

@ -24,8 +24,10 @@ const twoProductPrice = singleProductPrice * 2;
const runCartPageTest = () => {
describe('Cart page', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
await withRestApi.resetSettingsGroupToDefault('general');
await withRestApi.resetSettingsGroupToDefault('products');
await withRestApi.resetSettingsGroupToDefault('tax');
@ -38,7 +40,7 @@ const runCartPageTest = () => {
it('should add the product to the cart from the shop page', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCart();
await shopper.productIsInCart(simpleProductName);
@ -46,7 +48,7 @@ const runCartPageTest = () => {
it('should increase item qty when "Add to cart" of the same product is clicked', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCart();
await shopper.productIsInCart(simpleProductName, 2);
@ -63,7 +65,7 @@ const runCartPageTest = () => {
it('should remove the item from the cart when remove is clicked', async () => {
await shopper.goToCart();
await shopper.removeFromCart(simpleProductName);
await shopper.removeFromCart( productId );
await uiUnblocked();
await expect(page).toMatchElement('.cart-empty', {text: 'Your cart is currently empty.'});
@ -71,7 +73,7 @@ const runCartPageTest = () => {
it('should update subtotal in cart totals when adding product to the cart', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCart();
await shopper.productIsInCart(simpleProductName, 1);

7
tests/e2e/core-tests/specs/shopper/front-end-checkout-coupons.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect, jest/no-standalone-expect */
/**
* Internal dependencies
*/
@ -44,15 +43,17 @@ const getCoupon = (couponType) => {
const runCheckoutApplyCouponsTest = () => {
describe('Checkout coupons', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
couponFixedCart = await createCoupon();
couponPercentage = await createCoupon('50', 'Percentage discount');
couponFixedProduct = await createCoupon('5', 'Fixed product discount');
await shopper.emptyCart();
await shopper.goToShop();
await waitForSelectorWithoutThrow( '.add_to_cart_button' );
await shopper.addToCartFromShopPage('Simple product');
await shopper.addToCartFromShopPage( productId );
await uiUnblocked();
await shopper.goToCheckout();
});

8
tests/e2e/core-tests/specs/shopper/front-end-checkout-create-account.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
/**
* Internal dependencies
*/
@ -23,13 +22,14 @@ const {
} = require( '@jest/globals' );
const config = require( 'config' );
const simpleProductName = config.get( 'products.simple.name' );
const customerBilling = config.get( 'addresses.customer.billing' );
const runCheckoutCreateAccountTest = () => {
describe('Shopper Checkout Create Account', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
await withRestApi.deleteCustomerByEmail( customerBilling.email );
// Set checkbox for creating an account during checkout
@ -45,7 +45,7 @@ const runCheckoutCreateAccountTest = () => {
// Add simple product to cart and proceed to checkout
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await uiUnblocked();
await shopper.goToCheckout();
});

8
tests/e2e/core-tests/specs/shopper/front-end-checkout-login-account.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
/**
* Internal dependencies
*/
@ -21,12 +20,13 @@ const {
} = require( '@jest/globals' );
const config = require('config');
const simpleProductName = config.get('products.simple.name');
const runCheckoutLoginAccountTest = () => {
describe('Shopper Checkout Login Account', () => {
let productId;
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
// Set checkbox for logging to account during checkout
await merchant.login();
@ -37,7 +37,7 @@ const runCheckoutLoginAccountTest = () => {
// Add simple product to cart and proceed to checkout
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await uiUnblocked();
await shopper.goToCheckout();
});

16
tests/e2e/core-tests/specs/shopper/front-end-checkout.test.js
View File

@ -21,9 +21,11 @@ let guestOrderId;
let customerOrderId;
const runCheckoutPageTest = () => {
let productId;
describe('Checkout page', () => {
beforeAll(async () => {
await createSimpleProduct();
productId = await createSimpleProduct();
await withRestApi.resetSettingsGroupToDefault('general');
await withRestApi.resetSettingsGroupToDefault('products');
await withRestApi.resetSettingsGroupToDefault('tax');
@ -54,14 +56,14 @@ const runCheckoutPageTest = () => {
it('should display cart items in order review', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `1`, singleProductPrice, singleProductPrice);
});
it('allows customer to choose available payment methods', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `2`, twoProductPrice, twoProductPrice);
@ -71,7 +73,7 @@ const runCheckoutPageTest = () => {
it('allows customer to fill billing details', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `3`, threeProductPrice, threeProductPrice);
await shopper.fillBillingDetails(config.get('addresses.customer.billing'));
@ -79,7 +81,7 @@ const runCheckoutPageTest = () => {
it('allows customer to fill shipping details', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `4`, fourProductPrice, fourProductPrice);
@ -94,7 +96,7 @@ const runCheckoutPageTest = () => {
it('allows guest customer to place order', async () => {
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `5`, fiveProductPrice, fiveProductPrice);
await shopper.fillBillingDetails(config.get('addresses.customer.billing'));
@ -117,7 +119,7 @@ const runCheckoutPageTest = () => {
it('allows existing customer to place order', async () => {
await shopper.login();
await shopper.goToShop();
await shopper.addToCartFromShopPage(simpleProductName);
await shopper.addToCartFromShopPage( productId );
await shopper.goToCheckout();
await shopper.productIsInCheckout(simpleProductName, `1`, singleProductPrice, singleProductPrice);
await shopper.fillBillingDetails(config.get('addresses.customer.billing'));

1
tests/e2e/core-tests/specs/shopper/front-end-my-account-create-account.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests */
/**
* Internal dependencies
*/

5
tests/e2e/core-tests/specs/shopper/front-end-single-product.test.js
View File

@ -1,4 +1,3 @@
/* eslint-disable jest/no-export, jest/no-disabled-tests */
/**
* Internal dependencies
*/
@ -56,7 +55,7 @@ const runSingleProductPageTest = () => {
it('should be able to remove simple products from the cart', async () => {
// Remove items from cart
await shopper.removeFromCart(simpleProductName);
await shopper.removeFromCart( simplePostIdValue );
await uiUnblocked();
await expect(page).toMatchElement('.cart-empty', {text: 'Your cart is currently empty.'});
});
@ -89,7 +88,7 @@ const runSingleProductPageTest = () => {
it('should be able to remove variation products from the cart', async () => {
// Remove items from cart
await shopper.removeFromCart(defaultVariableProduct.name);
await shopper.removeFromCart( variableProductId );
await uiUnblocked();
await expect(page).toMatchElement('.cart-empty', {text: 'Your cart is currently empty.'});
});

1
tests/e2e/utils/CHANGELOG.md
View File

@ -4,6 +4,7 @@
- `utils.waitForTimeout( delay )` pause processing for `delay` milliseconds
- `AdminEdit` class with utility functions for the respective edit screens
- Update `shopper.addToCartFromShopPage()` and `.removeFromCart()` to accept product Id or Title
# 0.1.6

4
tests/e2e/utils/README.md
View File

@ -116,7 +116,7 @@ This package provides support for enabling retries in tests:
| Function | Parameters | Description |
|----------|------------|-------------|
| `addToCart` | | Add an item to the cart from a single product page |
| `addToCartFromShopPage` | `productTitle` | Add an item to the cart from a single product page |
| `addToCartFromShopPage` | `productIdOrTitle` | Add an item to the cart from the shop page |
| `fillBillingDetails` | `customerBillingDetails` | Fill billing fields in checkout form using configured address |
| `fillShippingDetails` | `customerShippingDetails` | Fill shipping fields in checkout form using configured address |
| `goToAddresses` | | Go to My Account -> Address Details |
@ -131,7 +131,7 @@ This package provides support for enabling retries in tests:
| `login` | | Log in as the shopper |
| `placeOrder` | | Place an order from the checkout page |
| `productIsInCheckout` | `productTitle, quantity, total, cartSubtotal` | Verify product is in cart on checkout page |
| `removeFromCart` | `productTitle` | Remove a product from the cart on the cart page |
| `removeFromCart` | `productIdOrTitle` | Remove a product from the cart on the cart page |
| `setCartQuantity` | `productTitle, quantityValue` | Change the quantity of a product on the cart page |
| `searchForProduct` | | Searching for a product name and landing on its detail page |
| `emptyCart` | | Removes any products and coupons that are in the cart |

21
tests/e2e/utils/src/flows/shopper.js
View File

@ -40,14 +40,21 @@ const shopper = {
] );
},
addToCartFromShopPage: async ( productTitle ) => {
const addToCartXPath = `//li[contains(@class, "type-product") and a/h2[contains(text(), "${ productTitle }")]]` +
addToCartFromShopPage: async ( productIdOrTitle ) => {
if ( Number.isInteger( productIdOrTitle ) ) {
const addToCart = `a[data-product_id="${ productIdOrTitle }"]`;
await page.click( addToCart );
await expect( page ).toMatchElement( addToCart + '.added' );
} else {
const addToCartXPath = `//li[contains(@class, "type-product") and a/h2[contains(text(), "${ productIdOrTitle }")]]` +
'//a[contains(@class, "add_to_cart_button") and contains(@class, "ajax_add_to_cart")';
const [ addToCartButton ] = await page.$x( addToCartXPath + ']' );
addToCartButton.click();
await addToCartButton.click();
await page.waitFor( addToCartXPath + ' and contains(@class, "added")]' );
}
},
goToCheckout: async () => {
@ -121,12 +128,16 @@ const shopper = {
await expect( page ).toFill( '#shipping_postcode', customerShippingDetails.postcode );
},
removeFromCart: async ( productTitle ) => {
const cartItemXPath = getCartItemExpression(productTitle);
removeFromCart: async ( productIdOrTitle ) => {
if ( Number.isInteger( productIdOrTitle ) ) {
await page.click( `a[data-product_id="${ productIdOrTitle }"]` );
} else {
const cartItemXPath = getCartItemExpression( productIdOrTitle );
const removeItemXPath = cartItemXPath + '//' + getRemoveExpression();
const [ removeButton ] = await page.$x( removeItemXPath );
await removeButton.click();
}
},
emptyCart: async () => {