From edd8f545df59249bf80d678d5b07fa41163bb230 Mon Sep 17 00:00:00 2001 From: Bero Date: Fri, 16 Apr 2021 11:54:10 +0200 Subject: [PATCH 1/5] Always search all addons --- includes/admin/views/html-admin-page-addons.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index ceea4ec99e5..3a8dd3648ed 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -56,8 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) { value="" placeholder=""> - - +
From 64f15fc284ccb3e0963a57d6e08c50c46ca2d9f7 Mon Sep 17 00:00:00 2001 From: Veljko Date: Wed, 21 Apr 2021 14:52:29 +0200 Subject: [PATCH 2/5] Rename test scenario --- tests/e2e/core-tests/specs/shopper/front-end-cart.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js b/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js index 2497d0a40f7..c9b221fc3cd 100644 --- a/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js +++ b/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js @@ -36,7 +36,7 @@ const runCartPageTest = () => { await expect(page).toMatchElement('.cart-empty', {text: 'Your cart is currently empty.'}); }); - it('should add the product to the cart when "Add to cart" is clicked', async () => { + it('should add the product to the cart from the shop page', async () => { await shopper.goToShop(); await shopper.addToCartFromShopPage(simpleProductName); From ce2f04feeb68c4638d9a7faca3215771f2ade0d4 Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 09:47:49 +0200 Subject: [PATCH 3/5] Added new scenario of non-virtual product --- .../merchant/wp-admin-product-new.test.js | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index 5155fbae0b6..f944d99d82d 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -3,11 +3,12 @@ * Internal dependencies */ const { + shopper, merchant, clickTab, uiUnblocked, evalAndClick, - setCheckbox, + verifyAndPublish, } = require( '@woocommerce/e2e-utils' ); const { waitAndClick, @@ -24,7 +25,8 @@ const { } = require( '@jest/globals' ); const config = require( 'config' ); -const simpleProductName = config.get( 'products.simple.name' ); +const VirtualProductName = 'Virtual Product Name'; +const NonVirtualProductName = 'Non-Virtual Product Name'; const simpleProductPrice = config.has('products.simple.price') ? config.get('products.simple.price') : '9.99'; const verifyPublishAndTrash = async () => { @@ -61,23 +63,47 @@ const runAddSimpleProductTest = () => { await merchant.login(); }); - it('can create simple virtual product titled "Simple Product" with regular price $9.99', async () => { + it('can create simple virtual product and add it to the cart', async () => { await openNewProductAndVerify(); - // Set product data - await expect(page).toFill('#title', simpleProductName); + // Set product data and publish the product + await expect(page).toFill('#title', VirtualProductName); await expect(page).toClick('#_virtual'); + await clickTab('General'); await expect(page).toFill('#_regular_price', simpleProductPrice); + await verifyAndPublish(); - // Publish product, verify that it was published. Trash product, verify that it was trashed. - await verifyPublishAndTrash( - '#publish', - '.updated.notice', - 'Product published.', - 'Move to Trash', - '1 product moved to the Trash.' - ); + await merchant.logout(); + + // See product in the shop end and add to the cart + await shopper.goToShop(); + await shopper.addToCartFromShopPage(VirtualProductName); + await shopper.goToCart(); + await shopper.productIsInCart(VirtualProductName); + + // Remove product from cart + await shopper.removeFromCart(VirtualProductName); + }); + + it('can create simple non-virtual product and add it to the cart', async () => { + await merchant.login(); + await openNewProductAndVerify(); + + // Set product data and publish the product + await expect(page).toFill('#title', NonVirtualProductName); + await clickTab('General'); + await expect(page).toFill('#_regular_price', simpleProductPrice); + await verifyAndPublish(); + + // See product in the shop end and add to the cart + await shopper.goToShop(); + await shopper.addToCartFromShopPage(NonVirtualProductName); + await shopper.goToCart(); + await shopper.productIsInCart(NonVirtualProductName); + + // Remove product from cart + await shopper.removeFromCart(NonVirtualProductName); }); }); }; From fd85f8239bb166a793d8d953b5e4d7dc86b54502 Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 10:21:36 +0200 Subject: [PATCH 4/5] Update test scenarios to cover both flows --- .../specs/merchant/wp-admin-product-new.test.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index f944d99d82d..5ef7630151e 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -69,19 +69,21 @@ const runAddSimpleProductTest = () => { // Set product data and publish the product await expect(page).toFill('#title', VirtualProductName); await expect(page).toClick('#_virtual'); - await clickTab('General'); await expect(page).toFill('#_regular_price', simpleProductPrice); await verifyAndPublish(); await merchant.logout(); - // See product in the shop end and add to the cart + // See product in the shop and add it to the cart await shopper.goToShop(); await shopper.addToCartFromShopPage(VirtualProductName); await shopper.goToCart(); await shopper.productIsInCart(VirtualProductName); + // Assert that the page does not contain shipping calculation button + await expect(page).not.toMatchElement('a.shipping-calculator-button'); + // Remove product from cart await shopper.removeFromCart(VirtualProductName); }); @@ -96,12 +98,18 @@ const runAddSimpleProductTest = () => { await expect(page).toFill('#_regular_price', simpleProductPrice); await verifyAndPublish(); - // See product in the shop end and add to the cart + await merchant.logout(); + + // See product in the shop and add it to the cart await shopper.goToShop(); await shopper.addToCartFromShopPage(NonVirtualProductName); await shopper.goToCart(); await shopper.productIsInCart(NonVirtualProductName); + // Assert that the page does contain shipping calculation button + await page.waitForSelector('a.shipping-calculator-button'); + await expect(page).toMatchElement('a.shipping-calculator-button'); + // Remove product from cart await shopper.removeFromCart(NonVirtualProductName); }); From e5ced9498cef1cd83ea0ffa5c1207fb7a7648c3d Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 14:39:21 +0200 Subject: [PATCH 5/5] Add missing merchant login --- tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index 5ef7630151e..c1f7bb8707f 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -119,6 +119,7 @@ const runAddSimpleProductTest = () => { const runAddVariableProductTest = () => { describe('Add New Variable Product Page', () => { it('can create product with variations', async () => { + await merchant.login(); await openNewProductAndVerify(); // Set product data