diff --git a/templates/single-product/title.php b/templates/single-product/title.php
index 52af1121410..f117c11089d 100644
--- a/templates/single-product/title.php
+++ b/templates/single-product/title.php
@@ -10,16 +10,13 @@
* happen. When this occurs the version of the template file will be bumped and
* the readme will list any important changes.
*
- * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce\Templates
- * @version 4.4.0
+ * @see https://docs.woocommerce.com/document/template-structure/
+ * @package WooCommerce/Templates
+ * @version 1.6.4
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
-?>
-
-
-
+the_title( '
', '
' );
diff --git a/tests/Tools/DependencyManagement/DependencyManagementTestHook.php b/tests/Tools/DependencyManagement/DependencyManagementTestHook.php
index 5017df6297a..361c7ee4639 100644
--- a/tests/Tools/DependencyManagement/DependencyManagementTestHook.php
+++ b/tests/Tools/DependencyManagement/DependencyManagementTestHook.php
@@ -25,9 +25,6 @@ final class DependencyManagementTestHook implements BeforeTestHook {
* @param string $test "TestClass::TestMethod".
*/
public function executeBeforeTest( string $test ): void {
- // Reset the instance of MockableLegacyProxy that was registered during bootstrap,
- // in order to start the test in a clean state (without anything mocked).
- wc_get_container()->get( LegacyProxy::class )->reset();
}
}
diff --git a/tests/bin/phpcs.sh b/tests/bin/phpcs.sh
index 205e63d386a..679de5e5ec5 100755
--- a/tests/bin/phpcs.sh
+++ b/tests/bin/phpcs.sh
@@ -5,6 +5,11 @@ if [[ ${RUN_PHPCS} == 1 ]]; then
IGNORE="tests/cli/,includes/libraries/,includes/api/legacy/"
if [ "$CHANGED_FILES" != "" ]; then
+ if [ ! -f "./vendor/bin/phpcs" ]; then
+ # Install wpcs globally
+ composer require woocommerce/woocommerce-sniffs --update-with-all-dependencies
+ fi
+
echo "Running Code Sniffer."
./vendor/bin/phpcs --ignore=$IGNORE --encoding=utf-8 -s -n -p $CHANGED_FILES
fi
diff --git a/tests/cli/features/bootstrap/FeatureContext.php b/tests/cli/features/bootstrap/FeatureContext.php
index 06187134756..d8a85f02164 100644
--- a/tests/cli/features/bootstrap/FeatureContext.php
+++ b/tests/cli/features/bootstrap/FeatureContext.php
@@ -130,16 +130,16 @@ class FeatureContext extends BehatContext implements ClosuredContextInterface {
private static function terminate_proc( $proc ) {
$status = proc_get_status( $proc );
- $master_pid = $status['pid'];
+ $pid = $status['pid'];
- $output = `ps -o ppid,pid,command | grep $master_pid`;
+ $output = `ps -o ppid,pid,command | grep $pid`;
foreach ( explode( PHP_EOL, $output ) as $line ) {
if ( preg_match( '/^\s*(\d+)\s+(\d+)/', $line, $matches ) ) {
$parent = $matches[1];
$child = $matches[2];
- if ( $parent == $master_pid ) {
+ if ( $parent == $pid ) {
if ( ! posix_kill( (int) $child, 9 ) ) {
throw new RuntimeException( posix_strerror( posix_get_last_error() ) );
}
@@ -147,7 +147,7 @@ class FeatureContext extends BehatContext implements ClosuredContextInterface {
}
}
- if ( ! posix_kill( (int) $master_pid, 9 ) ) {
+ if ( ! posix_kill( (int) $pid, 9 ) ) {
throw new RuntimeException( posix_strerror( posix_get_last_error() ) );
}
}
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index 898b5b89d2f..44aaebd17f3 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -94,7 +94,7 @@ Setup Wizard e2e test (located in `activate-and-setup` directory) will run befor
- Run `composer install --no-dev`
-- Run `npm run build`
+- Run `npm run build:core`
- Run the following command to build the test site using Docker: `npm run docker:up` and watch the site being built. Note that it may take a few minutes the first time you do that. The process is considered completed when the messages letting you know that WordPress was installed, WooCommerce was activated and users created will be displayed:
diff --git a/tests/e2e/specs/activate-and-setup/setup-wizard.test.js b/tests/e2e/specs/activate-and-setup/setup-wizard.test.js
index cf1f88531e7..5bb525b36b3 100644
--- a/tests/e2e/specs/activate-and-setup/setup-wizard.test.js
+++ b/tests/e2e/specs/activate-and-setup/setup-wizard.test.js
@@ -5,15 +5,16 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { completeOnboardingWizard } from '../../utils/components';
import {
+ StoreOwnerFlow,
+ completeOldSetupWizard,
+ completeOnboardingWizard,
permalinkSettingsPageSaveChanges,
setCheckbox,
settingsPageSaveChanges,
verifyCheckboxIsSet,
verifyValueOfInputField
-} from '../../utils';
+} from '@woocommerce/e2e-utils';
describe( 'Store owner can login and make sure WooCommerce is activated', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/front-end/front-end-cart.test.js b/tests/e2e/specs/front-end/front-end-cart.test.js
index 8d8e3c802da..9d01a2be141 100644
--- a/tests/e2e/specs/front-end/front-end-cart.test.js
+++ b/tests/e2e/specs/front-end/front-end-cart.test.js
@@ -5,9 +5,12 @@
/**
* Internal dependencies
*/
-import { createSimpleProduct } from '../../utils/components';
-import { CustomerFlow, StoreOwnerFlow } from '../../utils/flows';
-import { uiUnblocked } from '../../utils';
+import {
+ CustomerFlow,
+ StoreOwnerFlow,
+ createSimpleProduct,
+ uiUnblocked
+} from '@woocommerce/e2e-utils';
describe( 'Cart page', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/front-end/front-end-checkout.test.js b/tests/e2e/specs/front-end/front-end-checkout.test.js
index 3285cc377b0..55f94afbab1 100644
--- a/tests/e2e/specs/front-end/front-end-checkout.test.js
+++ b/tests/e2e/specs/front-end/front-end-checkout.test.js
@@ -5,9 +5,15 @@
/**
* Internal dependencies
*/
-import { createSimpleProduct } from '../../utils/components';
-import { CustomerFlow, StoreOwnerFlow } from '../../utils/flows';
-import { setCheckbox, settingsPageSaveChanges, uiUnblocked, verifyCheckboxIsSet } from '../../utils';
+import {
+ CustomerFlow,
+ StoreOwnerFlow,
+ createSimpleProduct,
+ setCheckbox,
+ settingsPageSaveChanges,
+ uiUnblocked,
+ verifyCheckboxIsSet
+} from '@woocommerce/e2e-utils';
const config = require( 'config' );
const simpleProductName = config.get( 'products.simple.name' );
diff --git a/tests/e2e/specs/front-end/front-end-my-account.test.js b/tests/e2e/specs/front-end/front-end-my-account.test.js
index 86a9f0c22d5..1bd82afc6c7 100644
--- a/tests/e2e/specs/front-end/front-end-my-account.test.js
+++ b/tests/e2e/specs/front-end/front-end-my-account.test.js
@@ -5,7 +5,10 @@
/**
* Internal dependencies
*/
-import { CustomerFlow, StoreOwnerFlow } from '../../utils/flows';
+import {
+ CustomerFlow,
+ StoreOwnerFlow
+} from '@woocommerce/e2e-utils';
describe( 'My account page', () => {
it( 'allows customer to login', async () => {
diff --git a/tests/e2e/specs/front-end/front-end-single-product.test.js b/tests/e2e/specs/front-end/front-end-single-product.test.js
index c0bfc6397a7..8980f67c326 100644
--- a/tests/e2e/specs/front-end/front-end-single-product.test.js
+++ b/tests/e2e/specs/front-end/front-end-single-product.test.js
@@ -5,9 +5,13 @@
/**
* Internal dependencies
*/
-import { createSimpleProduct, createVariableProduct } from '../../utils/components';
-import { CustomerFlow, StoreOwnerFlow } from '../../utils/flows';
-import { uiUnblocked } from '../../utils';
+import {
+ CustomerFlow,
+ StoreOwnerFlow,
+ createSimpleProduct,
+ createVariableProduct,
+ uiUnblocked
+} from '@woocommerce/e2e-utils';
let simplePostIdValue;
let variablePostIdValue;
diff --git a/tests/e2e/specs/wp-admin/wp-admin-coupon-new.test.js b/tests/e2e/specs/wp-admin/wp-admin-coupon-new.test.js
index 2a51930530a..ae3ff8fc095 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-coupon-new.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-coupon-new.test.js
@@ -5,8 +5,11 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { clickTab, verifyPublishAndTrash } from '../../utils';
+import {
+ StoreOwnerFlow,
+ clickTab,
+ verifyPublishAndTrash
+} from '@woocommerce/e2e-utils';
describe( 'Add New Coupon Page', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/wp-admin/wp-admin-order-new.test.js b/tests/e2e/specs/wp-admin/wp-admin-order-new.test.js
index adabaf696a5..3267eaddf76 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-order-new.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-order-new.test.js
@@ -5,8 +5,10 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { verifyPublishAndTrash } from '../../utils';
+import {
+ StoreOwnerFlow,
+ verifyPublishAndTrash
+} from '@woocommerce/e2e-utils';
describe( 'Add New Order Page', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/wp-admin/wp-admin-product-new.test.js b/tests/e2e/specs/wp-admin/wp-admin-product-new.test.js
index 0b8185072cc..11c7519678f 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-product-new.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-product-new.test.js
@@ -5,8 +5,11 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { clickTab, uiUnblocked } from '../../utils';
+import {
+ StoreOwnerFlow,
+ clickTab,
+ uiUnblocked
+} from '@woocommerce/e2e-utils';
const config = require( 'config' );
const simpleProductName = config.get( 'products.simple.name' );
diff --git a/tests/e2e/specs/wp-admin/wp-admin-settings-general.test.js b/tests/e2e/specs/wp-admin/wp-admin-settings-general.test.js
index ff229dd4762..40f316b0f45 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-settings-general.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-settings-general.test.js
@@ -5,8 +5,11 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { settingsPageSaveChanges, verifyValueOfInputField } from '../../utils';
+import {
+ StoreOwnerFlow,
+ settingsPageSaveChanges,
+ verifyValueOfInputField
+} from '@woocommerce/e2e-utils';
describe( 'WooCommerce General Settings', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/wp-admin/wp-admin-settings-product.test.js b/tests/e2e/specs/wp-admin/wp-admin-settings-product.test.js
index 2466d1f0374..d40f340fd07 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-settings-product.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-settings-product.test.js
@@ -5,8 +5,14 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
-import { setCheckbox, settingsPageSaveChanges, unsetCheckbox, verifyCheckboxIsSet, verifyCheckboxIsUnset } from '../../utils';
+import {
+ StoreOwnerFlow,
+ setCheckbox,
+ settingsPageSaveChanges,
+ unsetCheckbox,
+ verifyCheckboxIsSet,
+ verifyCheckboxIsUnset
+} from '@woocommerce/e2e-utils';
describe( 'WooCommerce Products > Downloadable Products Settings', () => {
beforeAll( async () => {
diff --git a/tests/e2e/specs/wp-admin/wp-admin-settings-tax.test.js b/tests/e2e/specs/wp-admin/wp-admin-settings-tax.test.js
index 3d3ca888e26..f77b9566bc0 100644
--- a/tests/e2e/specs/wp-admin/wp-admin-settings-tax.test.js
+++ b/tests/e2e/specs/wp-admin/wp-admin-settings-tax.test.js
@@ -5,15 +5,15 @@
/**
* Internal dependencies
*/
-import { StoreOwnerFlow } from '../../utils/flows';
import {
+ StoreOwnerFlow,
clearAndFillInput,
setCheckbox,
settingsPageSaveChanges,
uiUnblocked,
verifyCheckboxIsSet,
verifyValueOfInputField
-} from '../../utils';
+} from '@woocommerce/e2e-utils';
describe( 'WooCommerce Tax Settings', () => {
beforeAll( async () => {
diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md
new file mode 100644
index 00000000000..9ea08949678
--- /dev/null
+++ b/tests/e2e/utils/README.md
@@ -0,0 +1,35 @@
+# WooCommerce End to End Test Utilities
+
+This package contains utilities to simplify writing e2e tests specific to WooCommmerce.
+
+
+## Installation
+
+```bash
+npm install @woocommerce/e2e-utils --save
+```
+
+## Usage
+
+Example:
+~~~js
+import {
+ CustomerFlow,
+ StoreOwnerFlow,
+ createSimpleProduct,
+ uiUnblocked
+} from '@woocommerce/e2e-utils';
+
+describe( 'Cart page', () => {
+ beforeAll( async () => {
+ await StoreOwnerFlow.login();
+ await createSimpleProduct();
+ await StoreOwnerFlow.logout();
+ } );
+
+ it( 'should display no item in the cart', async () => {
+ await CustomerFlow.goToCart();
+ await expect( page ).toMatchElement( '.cart-empty', { text: 'Your cart is currently empty.' } );
+ } );
+} );
+~~~
\ No newline at end of file
diff --git a/tests/e2e/utils/index.js b/tests/e2e/utils/index.js
index 905c19d6156..bd333b76b7c 100644
--- a/tests/e2e/utils/index.js
+++ b/tests/e2e/utils/index.js
@@ -1,166 +1,14 @@
-/**
- * External dependencies
- */
-import { pressKeyWithModifier } from '@wordpress/e2e-test-utils';
+import { CustomerFlow, StoreOwnerFlow } from './src/flows';
-/**
- * Internal dependencies
- */
-const flows = require( './flows' );
+import {
+ completeOnboardingWizard,
+ completeOldSetupWizard,
+ createSimpleProduct,
+ createVariableProduct,
+ verifyAndPublish,
+} from './src/components';
-/**
- * Perform a "select all" and then fill a input.
- *
- * @param {string} selector
- * @param {string} value
- */
-const clearAndFillInput = async ( selector, value ) => {
- await page.focus( selector );
- await pressKeyWithModifier( 'primary', 'a' );
- await page.type( selector, value );
-};
-
-/**
- * Click a tab (on post type edit screen).
- *
- * @param {string} tabName Tab label
- */
-const clickTab = async ( tabName ) => {
- await expect( page ).toClick( '.wc-tabs > li > a', { text: tabName } );
-};
-
-/**
- * Save changes on a WooCommerce settings page.
- */
-const settingsPageSaveChanges = async () => {
- await page.focus( 'button.woocommerce-save-button' );
- await Promise.all( [
- page.waitForNavigation( { waitUntil: 'networkidle0' } ),
- page.click( 'button.woocommerce-save-button' ),
- ] );
-};
-
-/**
- * Save changes on Permalink settings page.
- */
-const permalinkSettingsPageSaveChanges = async () => {
- await page.focus( '.wp-core-ui .button-primary' );
- await Promise.all( [
- page.waitForNavigation( { waitUntil: 'networkidle0' } ),
- page.click( '.wp-core-ui .button-primary' ),
- ] );
-};
-
-/**
- * Set checkbox.
- *
- * @param {string} selector
- */
-const setCheckbox = async( selector ) => {
- await page.focus( selector );
- const checkbox = await page.$( selector );
- const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
- if ( checkboxStatus !== true ) {
- await page.click( selector );
- }
-};
-
-/**
- * Unset checkbox.
- *
- * @param {string} selector
- */
-const unsetCheckbox = async( selector ) => {
- await page.focus( selector );
- const checkbox = await page.$( selector );
- const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
- if ( checkboxStatus === true ) {
- await page.click( selector );
- }
-};
-
-/**
- * Wait for UI blocking to end.
- */
-const uiUnblocked = async () => {
- await page.waitForFunction( () => ! Boolean( document.querySelector( '.blockUI' ) ) );
-};
-
-/**
- * Publish, verify that item was published. Trash, verify that item was trashed.
- *
- * @param {string} button (Publish)
- * @param {string} publishNotice
- * @param {string} publishVerification
- * @param {string} trashVerification
- */
-const verifyPublishAndTrash = async ( button, publishNotice, publishVerification, trashVerification ) => {
- // Wait for auto save
- await page.waitFor( 2000 );
-
- // Publish
- await expect( page ).toClick( button );
- await page.waitForSelector( publishNotice );
-
- // Verify
- await expect( page ).toMatchElement( publishNotice, { text: publishVerification } );
- if ( button === '.order_actions li .save_order' ) {
- await expect( page ).toMatchElement( '#select2-order_status-container', { text: 'Processing' } );
- await expect( page ).toMatchElement(
- '#woocommerce-order-notes .note_content',
- {
- text: 'Order status changed from Pending payment to Processing.',
- }
- );
- }
-
- // Trash
- await expect( page ).toClick( 'a', { text: "Move to Trash" } );
- await page.waitForSelector( '#message' );
-
- // Verify
- await expect( page ).toMatchElement( publishNotice, { text: trashVerification } );
-};
-
-/**
- * Verify that checkbox is set.
- *
- * @param {string} selector Selector of the checkbox that needs to be verified.
- */
-const verifyCheckboxIsSet = async( selector ) => {
- await page.focus( selector );
- const checkbox = await page.$( selector );
- const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
- await expect( checkboxStatus ).toBe( true );
-};
-
-/**
- * Verify that checkbox is unset.
- *
- * @param {string} selector Selector of the checkbox that needs to be verified.
- */
-const verifyCheckboxIsUnset = async( selector ) => {
- await page.focus( selector );
- const checkbox = await page.$( selector );
- const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
- await expect( checkboxStatus ).not.toBe( true );
-};
-
-/**
- * Verify the value of input field once it was saved (can be used for radio buttons verification as well).
- *
- * @param {string} selector Selector of the input field that needs to be verified.
- * @param {string} value Value of the input field that needs to be verified.
- */
-const verifyValueOfInputField = async( selector, value ) => {
- await page.focus( selector );
- const field = await page.$( selector );
- const fieldValue = ( await ( await field.getProperty( 'value' ) ).jsonValue() );
- await expect( fieldValue ).toBe( value );
-};
-
-module.exports = {
- ...flows,
+import {
clearAndFillInput,
clickTab,
settingsPageSaveChanges,
@@ -172,4 +20,25 @@ module.exports = {
verifyCheckboxIsSet,
verifyCheckboxIsUnset,
verifyValueOfInputField,
-};
+} from './src/page-utils';
+
+module.exports = {
+ CustomerFlow,
+ StoreOwnerFlow,
+ completeOnboardingWizard,
+ completeOldSetupWizard,
+ createSimpleProduct,
+ createVariableProduct,
+ verifyAndPublish,
+ clearAndFillInput,
+ clickTab,
+ settingsPageSaveChanges,
+ permalinkSettingsPageSaveChanges,
+ setCheckbox,
+ unsetCheckbox,
+ uiUnblocked,
+ verifyPublishAndTrash,
+ verifyCheckboxIsSet,
+ verifyCheckboxIsUnset,
+ verifyValueOfInputField
+}
diff --git a/tests/e2e/utils/package.json b/tests/e2e/utils/package.json
new file mode 100644
index 00000000000..5bc19595935
--- /dev/null
+++ b/tests/e2e/utils/package.json
@@ -0,0 +1,16 @@
+{
+ "name": "@woocommerce/e2e-utils",
+ "version": "0.1.0",
+ "description": "End-To-End (E2E) test utils for WooCommerce",
+ "homepage": "https://github.com/woocommerce/woocommerce/tree/master/tests/e2e-utils/README.md",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/woocommerce/woocommerce.git"
+ },
+ "license": "GPL-3.0+",
+ "main": "build/index.js",
+ "module": "build-module/index.js",
+ "dependencies": {
+ "@wordpress/e2e-test-utils": "4.6.0"
+ }
+ }
diff --git a/tests/e2e/utils/components.js b/tests/e2e/utils/src/components.js
similarity index 94%
rename from tests/e2e/utils/components.js
rename to tests/e2e/utils/src/components.js
index 94be2fb76fd..37303fc6f62 100644
--- a/tests/e2e/utils/components.js
+++ b/tests/e2e/utils/src/components.js
@@ -6,9 +6,9 @@
* Internal dependencies
*/
import { StoreOwnerFlow } from './flows';
-import { clickTab, uiUnblocked, verifyCheckboxIsUnset } from './index';
-import modelRegistry from './factories';
+import modelRegistry from '../../utils/factories';
import { SimpleProduct } from '@woocommerce/model-factories';
+import { clickTab, uiUnblocked, verifyCheckboxIsUnset } from './page-utils';
const config = require( 'config' );
const simpleProductName = config.get( 'products.simple.name' );
@@ -115,7 +115,7 @@ const completeOnboardingWizard = async () => {
// Query for the product types checkboxes
const productTypesCheckboxes = await page.$$( '.components-checkbox-control__input' );
- expect( productTypesCheckboxes ).toHaveLength( 8 );
+ expect( productTypesCheckboxes ).toHaveLength( 7 );
// Select Physical and Downloadable products
for ( let i = 1; i < 2; i++ ) {
@@ -189,16 +189,26 @@ const completeOnboardingWizard = async () => {
// End of onboarding wizard
- // Wait for "Woo-hoo almost there" window to appear
- await page.waitForSelector( '.components-modal__header-heading' );
+ // Wait for homescreen welcome modal to appear
+ await page.waitForSelector( '.woocommerce__welcome-modal__page-content__header' );
await expect( page ).toMatchElement(
- '.components-modal__header-heading', { text: 'Woo hoo - you\'re almost there!' }
+ '.woocommerce__welcome-modal__page-content__header', { text: 'Welcome to your WooCommerce store\’s online HQ!' }
);
- // Wait for "Continue" button to become active
- await page.waitForSelector( 'button.is-primary:not(:disabled)' );
- // Click on "Continue" button to move to the next step
- await page.click( 'button.is-primary:not(:disabled)' );
+ // Wait for "Next" button to become active
+ await page.waitForSelector( 'button.components-guide__forward-button' );
+ // Click on "Next" button to move to the next step
+ await page.click( 'button.components-guide__forward-button' );
+
+ // Wait for "Next" button to become active
+ await page.waitForSelector( 'button.components-guide__forward-button' );
+ // Click on "Next" button to move to the next step
+ await page.click( 'button.components-guide__forward-button' );
+
+ // Wait for "Let's go" button to become active
+ await page.waitForSelector( 'button.components-guide__finish-button' );
+ // Click on "Let's go" button to move to the next step
+ await page.click( 'button.components-guide__finish-button' );
};
/**
diff --git a/tests/e2e/utils/flows.js b/tests/e2e/utils/src/flows.js
similarity index 99%
rename from tests/e2e/utils/flows.js
rename to tests/e2e/utils/src/flows.js
index cb72820abb3..512104cf11f 100644
--- a/tests/e2e/utils/flows.js
+++ b/tests/e2e/utils/src/flows.js
@@ -10,7 +10,7 @@ import { pressKeyWithModifier } from '@wordpress/e2e-test-utils';
/**
* Internal dependencies
*/
-import { clearAndFillInput } from './index';
+import { clearAndFillInput } from './page-utils';
const config = require( 'config' );
const baseUrl = config.get( 'url' );
diff --git a/tests/e2e/utils/src/page-utils.js b/tests/e2e/utils/src/page-utils.js
new file mode 100644
index 00000000000..004766479bd
--- /dev/null
+++ b/tests/e2e/utils/src/page-utils.js
@@ -0,0 +1,169 @@
+/**
+ * External dependencies
+ */
+import { pressKeyWithModifier } from '@wordpress/e2e-test-utils';
+
+/**
+ * Perform a "select all" and then fill a input.
+ *
+ * @param {string} selector
+ * @param {string} value
+ */
+const clearAndFillInput = async ( selector, value ) => {
+ await page.focus( selector );
+ await pressKeyWithModifier( 'primary', 'a' );
+ await page.type( selector, value );
+};
+
+/**
+ * Click a tab (on post type edit screen).
+ *
+ * @param {string} tabName Tab label
+ */
+const clickTab = async ( tabName ) => {
+ await expect( page ).toClick( '.wc-tabs > li > a', { text: tabName } );
+};
+
+/**
+ * Save changes on a WooCommerce settings page.
+ */
+const settingsPageSaveChanges = async () => {
+ await page.focus( 'button.woocommerce-save-button' );
+ await Promise.all( [
+ page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+ page.click( 'button.woocommerce-save-button' ),
+ ] );
+};
+
+/**
+ * Save changes on Permalink settings page.
+ */
+const permalinkSettingsPageSaveChanges = async () => {
+ await page.focus( '.wp-core-ui .button-primary' );
+ await Promise.all( [
+ page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+ page.click( '.wp-core-ui .button-primary' ),
+ ] );
+};
+
+/**
+ * Set checkbox.
+ *
+ * @param {string} selector
+ */
+const setCheckbox = async( selector ) => {
+ await page.focus( selector );
+ const checkbox = await page.$( selector );
+ const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
+ if ( checkboxStatus !== true ) {
+ await page.click( selector );
+ }
+};
+
+/**
+ * Unset checkbox.
+ *
+ * @param {string} selector
+ */
+const unsetCheckbox = async( selector ) => {
+ await page.focus( selector );
+ const checkbox = await page.$( selector );
+ const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
+ if ( checkboxStatus === true ) {
+ await page.click( selector );
+ }
+};
+
+/**
+ * Wait for UI blocking to end.
+ */
+const uiUnblocked = async () => {
+ await page.waitForFunction( () => ! Boolean( document.querySelector( '.blockUI' ) ) );
+};
+
+/**
+ * Publish, verify that item was published. Trash, verify that item was trashed.
+ *
+ * @param {string} button (Publish)
+ * @param {string} publishNotice
+ * @param {string} publishVerification
+ * @param {string} trashVerification
+ */
+const verifyPublishAndTrash = async ( button, publishNotice, publishVerification, trashVerification ) => {
+ // Wait for auto save
+ await page.waitFor( 2000 );
+
+ // Publish
+ await expect( page ).toClick( button );
+ await page.waitForSelector( publishNotice );
+
+ // Verify
+ await expect( page ).toMatchElement( publishNotice, { text: publishVerification } );
+ if ( button === '.order_actions li .save_order' ) {
+ await expect( page ).toMatchElement( '#select2-order_status-container', { text: 'Processing' } );
+ await expect( page ).toMatchElement(
+ '#woocommerce-order-notes .note_content',
+ {
+ text: 'Order status changed from Pending payment to Processing.',
+ }
+ );
+ }
+
+ // Trash
+ await expect( page ).toClick( 'a', { text: "Move to Trash" } );
+ await page.waitForSelector( '#message' );
+
+ // Verify
+ await expect( page ).toMatchElement( publishNotice, { text: trashVerification } );
+};
+
+/**
+ * Verify that checkbox is set.
+ *
+ * @param {string} selector Selector of the checkbox that needs to be verified.
+ */
+const verifyCheckboxIsSet = async( selector ) => {
+ await page.focus( selector );
+ const checkbox = await page.$( selector );
+ const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
+ await expect( checkboxStatus ).toBe( true );
+};
+
+/**
+ * Verify that checkbox is unset.
+ *
+ * @param {string} selector Selector of the checkbox that needs to be verified.
+ */
+const verifyCheckboxIsUnset = async( selector ) => {
+ await page.focus( selector );
+ const checkbox = await page.$( selector );
+ const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
+ await expect( checkboxStatus ).not.toBe( true );
+};
+
+/**
+ * Verify the value of input field once it was saved (can be used for radio buttons verification as well).
+ *
+ * @param {string} selector Selector of the input field that needs to be verified.
+ * @param {string} value Value of the input field that needs to be verified.
+ */
+const verifyValueOfInputField = async( selector, value ) => {
+ await page.focus( selector );
+ const field = await page.$( selector );
+ const fieldValue = ( await ( await field.getProperty( 'value' ) ).jsonValue() );
+ await expect( fieldValue ).toBe( value );
+};
+
+export {
+ clearAndFillInput,
+ clickTab,
+ settingsPageSaveChanges,
+ permalinkSettingsPageSaveChanges,
+ setCheckbox,
+ unsetCheckbox,
+ uiUnblocked,
+ verifyPublishAndTrash,
+ verifyCheckboxIsSet,
+ verifyCheckboxIsUnset,
+ verifyValueOfInputField,
+};
diff --git a/tests/e2e/utils/webpack-alias.js b/tests/e2e/utils/webpack-alias.js
new file mode 100644
index 00000000000..3c9d404cc68
--- /dev/null
+++ b/tests/e2e/utils/webpack-alias.js
@@ -0,0 +1,11 @@
+/**
+ * External dependencies
+ */
+const path = require( 'path' );
+
+module.exports = {
+ '@woocommerce/e2e-tests': path.resolve(
+ __dirname,
+ 'node_modules/woocommerce/tests/e2e'
+ ),
+};
diff --git a/tests/legacy/bootstrap.php b/tests/legacy/bootstrap.php
index 153f12b4678..6c45a00bda9 100644
--- a/tests/legacy/bootstrap.php
+++ b/tests/legacy/bootstrap.php
@@ -69,9 +69,6 @@ class WC_Unit_Tests_Bootstrap {
// load WC testing framework.
$this->includes();
-
- // re-initialize dependency injection, this needs to be the last operation after everything else is in place.
- $this->initialize_dependency_injection();
}
/**
@@ -121,35 +118,6 @@ class WC_Unit_Tests_Bootstrap {
CodeHacker::enable();
}
- /**
- * Re-initialize the dependency injection engine.
- *
- * The dependency injection engine has been already initialized as part of the Woo initialization, but we need
- * to replace the registered read-only container with a fully configurable one for testing.
- * To this end we hack a bit and use reflection to grab the underlying container that the read-only one stores
- * in a private property.
- *
- * Additionally, we replace the legacy/function proxies with mockable versions to easily replace anything
- * in tests as appropriate.
- *
- * @throws \Exception The Container class doesn't have a 'container' property.
- */
- private function initialize_dependency_injection() {
- try {
- $inner_container_property = new \ReflectionProperty( \Automattic\WooCommerce\Container::class, 'container' );
- } catch ( ReflectionException $ex ) {
- throw new \Exception( "Error when trying to get the private 'container' property from the " . \Automattic\WooCommerce\Container::class . ' class using reflection during unit testing bootstrap, has the property been removed or renamed?' );
- }
-
- $inner_container_property->setAccessible( true );
- $inner_container = $inner_container_property->getValue( wc_get_container() );
-
- $inner_container->replace( LegacyProxy::class, MockableLegacyProxy::class );
- $inner_container->reset_all_resolved();
-
- $GLOBALS['wc_container'] = $inner_container;
- }
-
/**
* Load WooCommerce.
*
@@ -222,6 +190,9 @@ class WC_Unit_Tests_Bootstrap {
require_once $this->tests_dir . '/framework/helpers/class-wc-helper-shipping-zones.php';
require_once $this->tests_dir . '/framework/helpers/class-wc-helper-payment-token.php';
require_once $this->tests_dir . '/framework/helpers/class-wc-helper-settings.php';
+
+ // Traits.
+ require_once $this->tests_dir . '/framework/traits/trait-wc-rest-api-complex-meta.php';
}
/**
diff --git a/tests/legacy/framework/class-wc-unit-test-case.php b/tests/legacy/framework/class-wc-unit-test-case.php
index 74289f2b413..d6dccc2da9c 100644
--- a/tests/legacy/framework/class-wc-unit-test-case.php
+++ b/tests/legacy/framework/class-wc-unit-test-case.php
@@ -183,7 +183,7 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* @return mixed The instance.
*/
public function get_instance_of( string $class_name ) {
- return wc_get_container()->get( $class_name );
+ return null;
}
/**
@@ -195,7 +195,7 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* @return mixed The instance.
*/
public function get_legacy_instance_of( string $class_name ) {
- return wc_get_container()->get( LegacyProxy::class )->get_instance_of( $class_name );
+ return null;
}
/**
@@ -204,14 +204,12 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* This may be needed when registering mocks for already resolved shared classes.
*/
public function reset_container_resolutions() {
- wc_get_container()->reset_all_resolved();
}
/**
* Reset the mock legacy proxy class so that all the registered mocks are unregistered.
*/
public function reset_legacy_proxy_mocks() {
- wc_get_container()->get( LegacyProxy::class )->reset();
}
/**
@@ -222,7 +220,6 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* @throws \Exception Invalid parameter.
*/
public function register_legacy_proxy_function_mocks( array $mocks ) {
- wc_get_container()->get( LegacyProxy::class )->register_function_mocks( $mocks );
}
/**
@@ -233,7 +230,6 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* @throws \Exception Invalid parameter.
*/
public function register_legacy_proxy_static_mocks( array $mocks ) {
- wc_get_container()->get( LegacyProxy::class )->register_static_mocks( $mocks );
}
/**
@@ -244,6 +240,5 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
* @throws \Exception Invalid parameter.
*/
public function register_legacy_proxy_class_mocks( array $mocks ) {
- wc_get_container()->get( LegacyProxy::class )->register_class_mocks( $mocks );
}
}
diff --git a/tests/legacy/framework/traits/trait-wc-rest-api-complex-meta.php b/tests/legacy/framework/traits/trait-wc-rest-api-complex-meta.php
new file mode 100644
index 00000000000..1b51c8b2531
--- /dev/null
+++ b/tests/legacy/framework/traits/trait-wc-rest-api-complex-meta.php
@@ -0,0 +1,83 @@
+ 'string_meta',
+ 'value' => 'string_value',
+ ),
+ array(
+ 'key' => 'int_meta',
+ 'value' => 1,
+ ),
+ array(
+ 'key' => 'bool_meta',
+ 'value' => true,
+ ),
+ array(
+ 'key' => 'array_meta',
+ 'value' => array( 1, 2, 'string' ),
+ ),
+ array(
+ 'key' => 'null_meta',
+ 'value' => 'null',
+ ),
+ array(
+ 'key' => 'object_meta',
+ 'value' => array(
+ 'nested_key1' => 'nested_value1',
+ 'nested_key2' => 0,
+ 'nested_key3' => true,
+ 'nested_key4' => array( 2, 3, 4 ),
+ 'nested_key5' => array( 2, 3, array( 'deep' => 'nesting' ) ),
+ ),
+ ),
+ );
+
+ /**
+ * Test to update `meta_data` field with a complex data type.
+ *
+ * @param string $url URL to send request against.
+ * @param array $options Options for customizations.
+ */
+ public function assert_update_complex_meta( $url, $options = array() ) {
+ $meta = $options['meta'] ?? self::$sample_meta;
+ $request = new WP_REST_Request( 'PUT', $url );
+ $request->set_body_params( array( 'meta_data' => $meta ) );
+
+ $response = $this->server->dispatch( $request );
+
+ $data = $response->get_data();
+
+ $this->assertEquals( 200, $response->get_status() );
+
+ $response_meta = $data['meta_data'];
+
+ foreach ( $meta as $meta_object ) {
+ $found = false;
+ foreach ( $response_meta as $response_meta_object ) {
+ if ( $response_meta_object->key === $meta_object['key'] ) {
+ $response_value = $response_meta_object->value;
+ $this->assertEquals( $meta_object['value'], $response_value );
+ $found = true;
+ break;
+ }
+ }
+ $this->assertEquals( true, $found, sprintf( 'Meta key %s was not found in response.', $meta_object['key'] ) );
+ }
+ }
+}
diff --git a/tests/legacy/unit-tests/cart/cart.php b/tests/legacy/unit-tests/cart/cart.php
index 74e574a3368..de4497ae542 100644
--- a/tests/legacy/unit-tests/cart/cart.php
+++ b/tests/legacy/unit-tests/cart/cart.php
@@ -1299,7 +1299,16 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
$variation = array_shift( $variations );
// Add the product to the cart. Methods returns boolean on failure, string on success.
- $this->assertNotFalse( WC()->cart->add_to_cart( $product->get_id(), 1, $variation['variation_id'], array( 'Size' => ucfirst( $variation['attributes']['attribute_pa_size'] ) ) ) );
+ $result = WC()->cart->add_to_cart(
+ $product->get_id(),
+ 1,
+ $variation['variation_id'],
+ array(
+ 'attribute_pa_colour' => 'red', // Set a value since this is an 'any' attribute.
+ 'attribute_pa_number' => '2', // Set a value since this is an 'any' attribute.
+ )
+ );
+ $this->assertNotFalse( $result );
// Check if the item is in the cart.
$this->assertEquals( 1, WC()->cart->get_cart_contents_count() );
@@ -2252,10 +2261,10 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
$this->assertCount( 0, WC()->cart->get_cart_contents() );
$this->assertEquals( 0, WC()->cart->get_cart_contents_count() );
- // Check that the notices contain an error message about an invalid colour.
+ // Check that the notices contain an error message about invalid colour and number.
$this->assertArrayHasKey( 'error', $notices );
$this->assertCount( 1, $notices['error'] );
- $this->assertEquals( 'colour is a required field', $notices['error'][0]['notice'] );
+ $this->assertEquals( 'colour and number are required fields', $notices['error'][0]['notice'] );
}
/**
diff --git a/tests/legacy/unit-tests/checkout/checkout.php b/tests/legacy/unit-tests/checkout/checkout.php
index 4d99a0c38d7..95056c863c2 100644
--- a/tests/legacy/unit-tests/checkout/checkout.php
+++ b/tests/legacy/unit-tests/checkout/checkout.php
@@ -279,7 +279,15 @@ class WC_Tests_Checkout extends WC_Unit_Test_Case {
$variation->set_manage_stock( true );
$variation->set_stock_quantity( 10 );
$variation->save();
- WC()->cart->add_to_cart( $variation->get_id(), 9 );
+ WC()->cart->add_to_cart(
+ $variation->get_id(),
+ 9,
+ 0,
+ array(
+ 'attribute_pa_colour' => 'red', // Set a value since this is an 'any' attribute.
+ 'attribute_pa_number' => '2', // Set a value since this is an 'any' attribute.
+ )
+ );
$this->assertEquals( true, WC()->cart->check_cart_items() );
$checkout = WC_Checkout::instance();
@@ -299,7 +307,15 @@ class WC_Tests_Checkout extends WC_Unit_Test_Case {
$this->assertEquals( 9, wc_get_held_stock_quantity( $variation ) );
WC()->cart->empty_cart();
- WC()->cart->add_to_cart( $variation->get_stock_managed_by_id(), 2 );
+ WC()->cart->add_to_cart(
+ $variation->get_stock_managed_by_id(),
+ 2,
+ 0,
+ array(
+ 'attribute_pa_colour' => 'red',
+ 'attribute_pa_number' => '2',
+ )
+ );
$this->assertEquals( false, WC()->cart->check_cart_items() );
}
diff --git a/tests/legacy/unit-tests/customer/functions.php b/tests/legacy/unit-tests/customer/functions.php
index 5e08d2fed12..41746df84e0 100644
--- a/tests/legacy/unit-tests/customer/functions.php
+++ b/tests/legacy/unit-tests/customer/functions.php
@@ -13,7 +13,7 @@ class WC_Tests_Customer_Functions extends WC_Unit_Test_Case {
/**
* Set illegal login
*
- * @param array $logins Array of blacklisted logins.
+ * @param array $logins Array of blocked logins.
* @return array
*/
public function setup_illegal_user_logins( $logins ) {
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version2/payment-gateways.php b/tests/legacy/unit-tests/rest-api/Tests/Version2/payment-gateways.php
index d8757c5d31d..5b69b55494c 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version2/payment-gateways.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version2/payment-gateways.php
@@ -6,6 +6,9 @@
* @since 3.0.0
*/
+/**
+ * Payment gateway test class.
+ */
class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
/**
@@ -107,7 +110,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
'description' => "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account.",
'order' => '',
'enabled' => false,
- 'method_title' => 'PayPal',
+ 'method_title' => 'PayPal Standard',
'method_description' => 'PayPal Standard redirects customers to PayPal to enter their payment information.',
'settings' => array_diff_key(
$this->get_settings( 'WC_Gateway_Paypal' ),
@@ -151,7 +154,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
public function test_update_payment_gateway() {
wp_set_current_user( $this->user );
- // Test defaults
+ // Test defaults.
$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v2/payment_gateways/paypal' ) );
$paypal = $response->get_data();
@@ -159,7 +162,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'admin@example.org', $paypal['settings']['email']['value'] );
$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
- // test updating single setting
+ // Test updating single setting.
$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -176,7 +179,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
- // test updating multiple settings
+ // Test updating multiple settings.
$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -194,7 +197,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
- // Test other parameters, and recheck settings
+ // Test other parameters, and recheck settings.
$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -211,7 +214,7 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
- // test bogus
+ // Test bogus parameter.
$request = new WP_REST_Request( 'POST', '/wc/v2/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -308,11 +311,11 @@ class Payment_Gateways_V2 extends WC_REST_Unit_Test_Case {
$settings = array();
$gateway->init_form_fields();
foreach ( $gateway->form_fields as $id => $field ) {
- // Make sure we at least have a title and type
+ // Make sure we at least have a title and type.
if ( empty( $field['title'] ) || empty( $field['type'] ) ) {
continue;
}
- // Ignore 'title' settings/fields -- they are UI only
+ // Ignore 'title' settings/fields -- they are UI only.
if ( 'title' === $field['type'] ) {
continue;
}
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version2/product-variations.php b/tests/legacy/unit-tests/rest-api/Tests/Version2/product-variations.php
index 22a53d4d829..560e88693ad 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version2/product-variations.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version2/product-variations.php
@@ -7,6 +7,7 @@
*/
class Product_Variations_API_V2 extends WC_REST_Unit_Test_Case {
+ use WC_REST_API_Complex_Meta;
/**
* Setup our test server, endpoints, and user info.
@@ -299,6 +300,19 @@ class Product_Variations_API_V2 extends WC_REST_Unit_Test_Case {
$this->assertEquals( 3, count( $variations ) );
}
+ /**
+ * Test updating complex meta object.
+ */
+ public function test_update_complex_meta_27282() {
+ wp_set_current_user( $this->user );
+ $product = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper::create_variation_product();
+ $product->save();
+ $variations = $product->get_available_variations( 'objects' );
+ $first_variation_id = $variations[0]->get_id();
+ $url = '/wc/v2/products/' . $product->get_id() . '/variations/' . $first_variation_id;
+ $this->assert_update_complex_meta( $url );
+ }
+
/**
* Test creating a single variation without permission.
*
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version3/orders.php b/tests/legacy/unit-tests/rest-api/Tests/Version3/orders.php
index 6ebb7477ae0..ea5768c73aa 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version3/orders.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version3/orders.php
@@ -10,6 +10,7 @@
* Class WC_Tests_API_Orders
*/
class WC_Tests_API_Orders extends WC_REST_Unit_Test_Case {
+ use WC_REST_API_Complex_Meta;
/**
* Array of order to track
@@ -76,12 +77,22 @@ class WC_Tests_API_Orders extends WC_REST_Unit_Test_Case {
$order2->save();
$request = new WP_REST_Request( 'GET', '/wc/v3/orders' );
- $request->set_query_params( array( 'orderby' => 'modified', 'order' => 'asc' ) );
+ $request->set_query_params(
+ array(
+ 'orderby' => 'modified',
+ 'order' => 'asc',
+ )
+ );
$response = $this->server->dispatch( $request );
$orders = $response->get_data();
$this->assertEquals( $order1->get_id(), $orders[0]['id'] );
- $request->set_query_params( array( 'orderby' => 'modified', 'order' => 'desc' ) );
+ $request->set_query_params(
+ array(
+ 'orderby' => 'modified',
+ 'order' => 'desc',
+ )
+ );
$response = $this->server->dispatch( $request );
$orders = $response->get_data();
$this->assertEquals( $order2->get_id(), $orders[0]['id'] );
@@ -208,6 +219,20 @@ class WC_Tests_API_Orders extends WC_REST_Unit_Test_Case {
'method_title' => 'Flat rate',
'total' => '10.00',
'instance_id' => '1',
+ 'meta_data' => array(
+ array(
+ 'key' => 'string',
+ 'value' => 'string_val',
+ ),
+ array(
+ 'key' => 'integer',
+ 'value' => 1,
+ ),
+ array(
+ 'key' => 'array',
+ 'value' => array( 1, 2 ),
+ ),
+ ),
),
),
)
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php b/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
index f9a43b64e5f..20f9245c8bd 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
@@ -6,6 +6,9 @@
* @since 3.5.0
*/
+/**
+ * Payment gateway test class.
+ */
class Payment_Gateways extends WC_REST_Unit_Test_Case {
/**
@@ -110,7 +113,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
'description' => "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account.",
'order' => '',
'enabled' => false,
- 'method_title' => 'PayPal',
+ 'method_title' => 'PayPal Standard',
'method_description' => 'PayPal Standard redirects customers to PayPal to enter their payment information.',
'method_supports' => array(
'products',
@@ -158,7 +161,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
public function test_update_payment_gateway() {
wp_set_current_user( $this->user );
- // Test defaults
+ // Test defaults.
$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v3/payment_gateways/paypal' ) );
$paypal = $response->get_data();
@@ -166,7 +169,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'admin@example.org', $paypal['settings']['email']['value'] );
$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
- // test updating single setting
+ // Test updating single setting.
$request = new WP_REST_Request( 'POST', '/wc/v3/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -183,7 +186,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'no', $paypal['settings']['testmode']['value'] );
- // test updating multiple settings
+ // Test updating multiple settings.
$request = new WP_REST_Request( 'POST', '/wc/v3/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -201,7 +204,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
- // Test other parameters, and recheck settings
+ // Test other parameters, and recheck settings.
$request = new WP_REST_Request( 'POST', '/wc/v3/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -218,7 +221,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
- // test bogus
+ // Test bogus paramter.
$request = new WP_REST_Request( 'POST', '/wc/v3/payment_gateways/paypal' );
$request->set_body_params(
array(
@@ -316,7 +319,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
$settings = array();
$gateway->init_form_fields();
foreach ( $gateway->form_fields as $id => $field ) {
- // Make sure we at least have a title and type
+ // Make sure we at least have a title and type.
if ( empty( $field['title'] ) || empty( $field['type'] ) ) {
continue;
}
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version3/products.php b/tests/legacy/unit-tests/rest-api/Tests/Version3/products.php
index 22351897134..fa00aa68af9 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version3/products.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version3/products.php
@@ -10,6 +10,7 @@
* WC_Tests_API_Product class.
*/
class WC_Tests_API_Product extends WC_REST_Unit_Test_Case {
+ use WC_REST_API_Complex_Meta;
/**
* Setup our test server, endpoints, and user info.
@@ -218,7 +219,7 @@ class WC_Tests_API_Product extends WC_REST_Unit_Test_Case {
$product = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper::create_simple_product();
$response = $this->server->dispatch( new WP_REST_Request( 'GET', '/wc/v3/products/' . $product->get_id() ) );
$data = $response->get_data();
- $date_created = date( 'Y-m-d\TH:i:s', current_time( 'timestamp' ) );
+ $date_created = gmdate( 'Y-m-d\TH:i:s', current_time( 'timestamp' ) );
$this->assertEquals( 'DUMMY SKU', $data['sku'] );
$this->assertEquals( 10, $data['regular_price'] );
@@ -455,6 +456,55 @@ class WC_Tests_API_Product extends WC_REST_Unit_Test_Case {
$this->assertEquals( 3, count( $products ) );
}
+ /**
+ * Test to update complex metadata.
+ */
+ public function test_update_complex_meta_27282() {
+ wp_set_current_user( $this->user );
+ $product = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper::create_simple_product();
+ $product->save();
+ $url = '/wc/v3/products/' . $product->get_id();
+ $this->assert_update_complex_meta( $url );
+ }
+
+ /**
+ * Test to update datetime property.
+ */
+ public function test_update_date_time() {
+ wp_set_current_user( $this->user );
+ $product = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper::create_simple_product();
+ $product->save();
+ $date_from_sale = '2020-01-01T01:01:01';
+
+ $request = new WP_REST_Request( 'PUT', '/wc/v3/products/' . $product->get_id() );
+
+ $request->set_body_params( array( 'date_on_sale_from' => $date_from_sale ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( $date_from_sale, $data['date_on_sale_from'] );
+
+ // Empty string should delete.
+ $request->set_body_params( array( 'date_on_sale_from' => '' ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( null, $data['date_on_sale_from'] );
+
+ $request->set_body_params( array( 'date_on_sale_from' => $date_from_sale ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( $date_from_sale, $data['date_on_sale_from'] );
+
+ // Null does not delete.
+ $request->set_body_params( array( 'date_on_sale_from' => null ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( $date_from_sale, $data['date_on_sale_from'] );
+ }
+
/**
* Test creating a single product without permission.
*
diff --git a/tests/legacy/unit-tests/templates/functions.php b/tests/legacy/unit-tests/templates/functions.php
index 5ef1c017291..818ae56e809 100644
--- a/tests/legacy/unit-tests/templates/functions.php
+++ b/tests/legacy/unit-tests/templates/functions.php
@@ -178,4 +178,19 @@ class WC_Tests_Template_Functions extends WC_Unit_Test_Case {
$this->assertEquals( $expected_html, $actual_html );
}
+
+ public function test_hidden_field() {
+ $actual_html = woocommerce_form_field('test',
+ array(
+ 'type' => 'hidden',
+ 'id' => 'test_field',
+ 'input_class' => array( 'test-field' ),
+ 'custom_attributes' => array( 'data-total' => '10' ),
+ 'return' => true
+ ), 'test value');
+ $expected_html = '
';
+
+ $this->assertEquals( $expected_html, $actual_html );
+
+ }
}
diff --git a/tests/legacy/unit-tests/totals/totals.php b/tests/legacy/unit-tests/totals/totals.php
index 2edd6d00fd2..71cca3b3279 100644
--- a/tests/legacy/unit-tests/totals/totals.php
+++ b/tests/legacy/unit-tests/totals/totals.php
@@ -88,7 +88,15 @@ class WC_Tests_Totals extends WC_Unit_Test_Case {
WC()->cart->add_to_cart( $product2->get_id(), 2 );
$variations = $product3->get_available_variations();
$variation = array_shift( $variations );
- WC()->cart->add_to_cart( $product3->get_id(), 1, $variation['variation_id'], array( 'Size' => ucfirst( $variation['attributes']['attribute_pa_size'] ) ) );
+ WC()->cart->add_to_cart(
+ $product3->get_id(),
+ 1,
+ $variation['variation_id'],
+ array(
+ 'attribute_pa_colour' => 'red', // Set a value since this is an 'any' attribute.
+ 'attribute_pa_number' => '2', // Set a value since this is an 'any' attribute.
+ )
+ );
WC()->cart->add_discount( $coupon->get_code() );
diff --git a/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php b/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
index 5db7b9dfec4..3cfd34aad6e 100644
--- a/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
+++ b/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
@@ -405,7 +405,7 @@ class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
);
// This filter will sequentially remove handlers, allowing us to test as though our
- // functions were accumulatively blacklisted, adding one on each call.
+ // functions were accumulatively blocked, adding one on each call.
add_filter( 'woocommerce_print_r_alternatives', array( $this, 'filter_wc_print_r_alternatives' ) );
$this->expectOutputString(
diff --git a/tests/legacy/unit-tests/util/validation.php b/tests/legacy/unit-tests/util/validation.php
index 1c08b029582..21827b43d35 100644
--- a/tests/legacy/unit-tests/util/validation.php
+++ b/tests/legacy/unit-tests/util/validation.php
@@ -123,7 +123,15 @@ class WC_Tests_Validation extends WC_Unit_Test_Case {
array( false, WC_Validation::is_postcode( '7850', 'BA' ) ),
);
- return array_merge( $it, $gb, $us, $ch, $br, $ca, $nl, $si, $ba );
+ $jp = array(
+ array( true, WC_Validation::is_postcode( '1340088', 'JP' ) ),
+ array( true, WC_Validation::is_postcode( '134-0088', 'JP' ) ),
+ array( false, WC_Validation::is_postcode( '1340-088', 'JP' ) ),
+ array( false, WC_Validation::is_postcode( '12345', 'JP' ) ),
+ array( false, WC_Validation::is_postcode( '0123', 'JP' ) ),
+ );
+
+ return array_merge( $it, $gb, $us, $ch, $br, $ca, $nl, $si, $ba, $jp );
}
/**
diff --git a/tests/php/includes/class-wc-cart-test.php b/tests/php/includes/class-wc-cart-test.php
new file mode 100644
index 00000000000..093cbf2a4cb
--- /dev/null
+++ b/tests/php/includes/class-wc-cart-test.php
@@ -0,0 +1,102 @@
+cart->empty_cart();
+ WC()->customer->set_is_vat_exempt( false );
+ WC()->session->set( 'wc_notices', null );
+ }
+
+ /**
+ * @testdox should throw a notice to the cart if an "any" attribute is empty.
+ */
+ public function test_add_variation_to_the_cart_with_empty_attributes() {
+ WC()->cart->empty_cart();
+ WC()->session->set( 'wc_notices', null );
+
+ $product = WC_Helper_Product::create_variation_product();
+ $variations = $product->get_available_variations();
+
+ // Get a variation with small pa_size and any pa_colour and pa_number.
+ $variation = $variations[0];
+
+ // Add variation using parent id.
+ WC()->cart->add_to_cart(
+ $variation['variation_id'],
+ 1,
+ 0,
+ array(
+ 'attribute_pa_colour' => '',
+ 'attribute_pa_number' => '',
+ )
+ );
+ $notices = WC()->session->get( 'wc_notices', array() );
+
+ // Check that the second add to cart call increases the quantity of the existing cart-item.
+ $this->assertCount( 0, WC()->cart->get_cart_contents() );
+ $this->assertEquals( 0, WC()->cart->get_cart_contents_count() );
+
+ // Check that the notices contain an error message about invalid colour and number.
+ $this->assertArrayHasKey( 'error', $notices );
+ $this->assertCount( 1, $notices['error'] );
+ $this->assertEquals( 'colour and number are required fields', $notices['error'][0]['notice'] );
+
+ // Reset cart.
+ WC()->cart->empty_cart();
+ WC()->customer->set_is_vat_exempt( false );
+ $product->delete( true );
+ }
+
+ /**
+ * Test show shipping.
+ */
+ public function test_show_shipping() {
+ // Test with an empty cart.
+ $this->assertFalse( WC()->cart->show_shipping() );
+
+ // Add a product to the cart.
+ $product = WC_Helper_Product::create_simple_product();
+ WC()->cart->add_to_cart( $product->get_id(), 1 );
+
+ // Test with "woocommerce_ship_to_countries" disabled.
+ $default_ship_to_countries = get_option( 'woocommerce_ship_to_countries', '' );
+ update_option( 'woocommerce_ship_to_countries', 'disabled' );
+ $this->assertFalse( WC()->cart->show_shipping() );
+
+ // Test with default "woocommerce_ship_to_countries" and "woocommerce_shipping_cost_requires_address".
+ update_option( 'woocommerce_ship_to_countries', $default_ship_to_countries );
+ $this->assertTrue( WC()->cart->show_shipping() );
+
+ // Test with "woocommerce_shipping_cost_requires_address" enabled.
+ $default_shipping_cost_requires_address = get_option( 'woocommerce_shipping_cost_requires_address', 'no' );
+ update_option( 'woocommerce_shipping_cost_requires_address', 'yes' );
+ $this->assertFalse( WC()->cart->show_shipping() );
+
+ // Set address for shipping calculation required for "woocommerce_shipping_cost_requires_address".
+ WC()->cart->get_customer()->set_shipping_country( 'US' );
+ WC()->cart->get_customer()->set_shipping_state( 'NY' );
+ WC()->cart->get_customer()->set_shipping_postcode( '12345' );
+ $this->assertTrue( WC()->cart->show_shipping() );
+
+ // Reset.
+ update_option( 'woocommerce_shipping_cost_requires_address', $default_shipping_cost_requires_address );
+ $product->delete( true );
+ WC()->cart->get_customer()->set_shipping_country( 'GB' );
+ WC()->cart->get_customer()->set_shipping_state( '' );
+ WC()->cart->get_customer()->set_shipping_postcode( '' );
+ }
+}
diff --git a/tests/php/includes/data-stores/class-wc-product-data-store-cpt-test.php b/tests/php/includes/data-stores/class-wc-product-data-store-cpt-test.php
new file mode 100644
index 00000000000..a2519bab3d6
--- /dev/null
+++ b/tests/php/includes/data-stores/class-wc-product-data-store-cpt-test.php
@@ -0,0 +1,41 @@
+set_name( 'Blue widget' );
+ $parent->set_sku( 'blue-widget-1' );
+ $parent->save();
+
+ $variation = new WC_Product_Variation();
+ $variation->set_parent_id( $parent->get_id() );
+ $variation->set_sku( '' );
+ $variation->save();
+
+ $data_store = WC_Data_Store::load( 'product' );
+
+ // No variations should be found searching for just the parent.
+ $results = $data_store->search_products( 'blue-widget-1', '', false, true );
+ $this->assertContains( $parent->get_id(), $results );
+ $this->assertNotContains( $variation->get_id(), $results );
+
+ // Variation should be found when searching for it.
+ $results = $data_store->search_products( 'blue-widget-1', '', true, true );
+ $this->assertContains( $parent->get_id(), $results );
+ $this->assertContains( $variation->get_id(), $results );
+
+ $variation->set_sku( 'test-widget' );
+ $variation->save();
+
+ // Variations should be found when searching for their specific SKU.
+ $results = $data_store->search_products( 'test-widget', '', true, true );
+ $this->assertContains( $variation->get_id(), $results );
+ }
+}
diff --git a/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php b/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php
deleted file mode 100644
index cc241e61301..00000000000
--- a/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-container = new ExtendedContainer();
-
- $this->sut = new class() extends AbstractServiceProvider {
- // phpcs:disable
-
- /**
- * Public version of add_with_auto_arguments, which is usually protected.
- */
- public function add_with_auto_arguments( string $class_name, $concrete = null, bool $shared = false ) : DefinitionInterface {
- return parent::add_with_auto_arguments( $class_name, $concrete, $shared );
- }
-
- /**
- * The mandatory 'register' method (defined in the base class as abstract).
- * Not implemented because this class is tested on its own, not as a service provider actually registered on a container.
- */
- public function register() {}
-
- // phpcs:enable
- };
-
- $this->sut->setContainer( $this->container );
- }
-
- /**
- * Runs before all the tests of the class.
- */
- public static function setUpBeforeClass() {
- /**
- * Return a new instance of ClassWithDependencies.
- *
- * @param DependencyClass $dependency The dependency to inject.
- * @return ClassWithDependencies The new instance.
- */
- function get_new_dependency_class( DependencyClass $dependency ) {
- return new ClassWithDependencies( $dependency );
- };
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should throw an exception if an invalid class name is passed as class name.
- */
- public function test_add_with_auto_arguments_throws_on_non_class_passed_as_class_name() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "AbstractServiceProvider::add_with_auto_arguments: error when reflecting class 'foobar': Class foobar does not exist" );
-
- $this->sut->add_with_auto_arguments( 'foobar' );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should throw an exception if the passed class has a private constructor.
- */
- public function test_add_with_auto_arguments_throws_on_class_private_constructor() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "AbstractServiceProvider::add_with_auto_arguments: constructor of class '" . ClassWithPrivateConstructor::class . "' isn't public, instances can't be created." );
-
- $this->sut->add_with_auto_arguments( ClassWithPrivateConstructor::class );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should throw an exception if the passed concrete is a class with a private constructor.
- */
- public function test_add_with_auto_arguments_throws_on_concrete_private_constructor() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "AbstractServiceProvider::add_with_auto_arguments: constructor of class '" . ClassWithPrivateConstructor::class . "' isn't public, instances can't be created." );
-
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, ClassWithPrivateConstructor::class );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should throw an exception if the passed class has a constructor argument without type hint.
- */
- public function test_add_with_auto_arguments_throws_on_constructor_argument_without_type_hint() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "AbstractServiceProvider::add_with_auto_arguments: constructor argument 'argument_without_type_hint' of class '" . ClassWithConstructorArgumentWithoutTypeHint::class . "' doesn't have a type hint or has one that doesn't specify a class." );
-
- $this->sut->add_with_auto_arguments( ClassWithConstructorArgumentWithoutTypeHint::class );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should throw an exception if the passed class has a constructor argument with a scalar type hint.
- */
- public function test_add_with_auto_arguments_throws_on_constructor_argument_with_scalar_type_hint() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "AbstractServiceProvider::add_with_auto_arguments: constructor argument 'scalar_argument_without_default_value' of class '" . ClassWithScalarConstructorArgument::class . "' doesn't have a type hint or has one that doesn't specify a class." );
-
- $this->sut->add_with_auto_arguments( ClassWithScalarConstructorArgument::class );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should properly register the supplied class when no concrete is passed.
- *
- * @testWith [true, 1]
- * [false, 2]
- *
- * @param bool $shared Whether to register the test class as shared or not.
- * @param int $expected_constructions_count Expected number of times that the test class will have been instantiated.
- */
- public function test_add_with_auto_arguments_works_as_expected_with_no_concrete( bool $shared, int $expected_constructions_count ) {
- ClassWithDependencies::$instances_count = 0;
-
- $this->container->share( DependencyClass::class );
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, null, $shared );
-
- $this->container->get( ClassWithDependencies::class );
- $resolved = $this->container->get( ClassWithDependencies::class );
-
- // A new instance is created for each resolution or not, depending on $shared.
- $this->assertEquals( $expected_constructions_count, ClassWithDependencies::$instances_count );
-
- // Arguments with default values are honored.
- $this->assertEquals( ClassWithDependencies::SOME_NUMBER, $resolved->some_number );
-
- // Constructor arguments are filled as expected.
- $this->assertSame( $this->container->get( DependencyClass::class ), $resolved->dependency_class );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should properly register the supplied class when a concrete representing a class name is passed.
- */
- public function test_add_with_auto_arguments_works_as_expected_when_concrete_is_class_name() {
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, DependencyClass::class );
-
- $resolved = $this->container->get( ClassWithDependencies::class );
-
- $this->assertInstanceOf( DependencyClass::class, $resolved );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should properly register the supplied class when a concrete that is an object is passed.
- */
- public function test_add_with_auto_arguments_works_as_expected_when_concrete_is_object() {
- $object = new DependencyClass();
-
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, $object );
-
- $resolved = $this->container->get( ClassWithDependencies::class );
-
- $this->assertSame( $object, $resolved );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should properly register the supplied class when a concrete that is a closure is passed.
- */
- public function test_add_with_auto_arguments_works_as_expected_when_concrete_is_a_closure() {
- $this->container->share( DependencyClass::class );
- $callable = function( DependencyClass $dependency ) {
- return new ClassWithDependencies( $dependency );
- };
-
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, $callable );
-
- $resolved = $this->container->get( ClassWithDependencies::class );
-
- $this->assertInstanceOf( ClassWithDependencies::class, $resolved );
- }
-
- /**
- * @testdox 'add_with_auto_arguments' should properly register the supplied class when a concrete that is a function name is passed.
- */
- public function test_add_with_auto_arguments_works_as_expected_when_concrete_is_a_function_name() {
- $this->container->share( DependencyClass::class );
-
- $this->sut->add_with_auto_arguments( ClassWithDependencies::class, __NAMESPACE__ . '\get_new_dependency_class' );
-
- $resolved = $this->container->get( ClassWithDependencies::class );
-
- $this->assertInstanceOf( ClassWithDependencies::class, $resolved );
- }
-}
-
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php
deleted file mode 100644
index 6f62858af3a..00000000000
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php
+++ /dev/null
@@ -1,20 +0,0 @@
-dependency_class = $dependency_class;
- $this->some_number = $some_number;
- }
-}
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php
deleted file mode 100644
index 4e432a93a1e..00000000000
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-sut = new ExtendedContainer();
- }
-
- /**
- * @testdox 'add' should throw an exception when trying to register a class not in the WooCommerce root namespace.
- */
- public function test_add_throws_when_trying_to_register_class_in_forbidden_namespace() {
- $external_class = \League\Container\Container::class;
-
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "Can't use the container to register '" . $external_class . "', only objects in the Automattic\WooCommerce namespace are allowed for registration." );
-
- $this->sut->add( $external_class );
- }
-
- /**
- * @testdox 'add' should allow registering classes in the WooCommerce root namespace.
- */
- public function test_add_allows_registering_classes_in_woocommerce_root_namespace() {
- $instance = new DependencyClass();
- $this->sut->add( DependencyClass::class, $instance, true );
- $resolved = $this->sut->get( DependencyClass::class );
-
- $this->assertSame( $instance, $resolved );
- }
-
- /**
- * @testdox 'replace' should throw an exception when trying to replace a class that has not been previously registered.
- */
- public function test_replace_throws_if_class_has_not_been_registered() {
- $this->expectException( ContainerException::class );
- $this->expectExceptionMessage( "ExtendedContainer::replace: The container doesn't have '" . DependencyClass::class . "' registered, please use 'add' instead of 'replace'." );
-
- $this->sut->replace( DependencyClass::class, null );
- }
-
- /**
- * @testdox 'replace' should allow to replace existing registrations.
- */
- public function test_replace_allows_replacing_existing_registrations() {
- $instance_1 = new DependencyClass();
- $instance_2 = new DependencyClass();
-
- $this->sut->add( DependencyClass::class, $instance_1, true );
- $this->assertSame( $instance_1, $this->sut->get( DependencyClass::class ) );
-
- $this->sut->replace( DependencyClass::class, $instance_2, true );
- $this->assertSame( $instance_2, $this->sut->get( DependencyClass::class ) );
- }
-
- /**
- * @testdox 'reset_all_resolved' should discard cached resolutions for classes registered as 'shared'.
- */
- public function test_reset_all_resolved_discards_cached_shared_resolutions() {
- $this->sut->add( DependencyClass::class );
- $this->sut->add( ClassWithDependencies::class, null, true )->addArgument( DependencyClass::class );
- ClassWithDependencies::$instances_count = 0;
-
- $this->sut->get( ClassWithDependencies::class );
- $this->assertEquals( 1, ClassWithDependencies::$instances_count );
- $this->sut->get( ClassWithDependencies::class );
- $this->assertEquals( 1, ClassWithDependencies::$instances_count );
-
- $this->sut->reset_all_resolved();
-
- $this->sut->get( ClassWithDependencies::class );
- $this->assertEquals( 2, ClassWithDependencies::$instances_count );
- $this->sut->get( ClassWithDependencies::class );
- $this->assertEquals( 2, ClassWithDependencies::$instances_count );
- }
-}
diff --git a/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php b/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php
deleted file mode 100644
index 2f1985c095d..00000000000
--- a/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-add( ClassThatDependsOnLegacyCode::class )->addArgument( LegacyProxy::class );
- $this->sut = $container->get( ClassThatDependsOnLegacyCode::class );
- }
-
- /**
- * Legacy proxy's 'call_function' can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["call_legacy_function_using_injected_proxy"]
- * ["call_legacy_function_using_woocommerce_class"]
- */
- public function test_call_function_can_be_invoked_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $this->assertEquals( 255, $this->sut->$method_to_use( 'hexdec', 'FF' ) );
- }
-
- /**
- * Function mocks can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["call_legacy_function_using_injected_proxy"]
- * ["call_legacy_function_using_woocommerce_class"]
- */
- public function test_function_mocks_can_be_used_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $this->register_legacy_proxy_function_mocks(
- array(
- 'hexdec' => function( $hex_string ) {
- return "Mocked hexdec for $hex_string";
- },
- )
- );
- $this->assertEquals( 'Mocked hexdec for FF', $this->sut->$method_to_use( 'hexdec', 'FF' ) );
- }
-
- /**
- * Legacy proxy's 'call_static' can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["call_static_method_using_injected_proxy"]
- * ["call_static_method_using_woocommerce_class"]
- */
- public function test_call_static_can_be_invoked_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $result = $this->sut->$method_to_use( DependencyClass::class, 'concat', 'foo', 'bar', 'fizz' );
- $this->assertEquals( 'Parts: foo, bar, fizz', $result );
- }
-
- /**
- * Static method mocks can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["call_static_method_using_injected_proxy"]
- * ["call_static_method_using_woocommerce_class"]
- */
- public function test_static_mocks_can_be_used_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $this->register_legacy_proxy_static_mocks(
- array(
- DependencyClass::class => array(
- 'concat' => function( ...$parts ) {
- return "I'm returning concat of these parts: " . join( ' ', $parts );
- },
- ),
- )
- );
-
- $expected = "I'm returning concat of these parts: foo bar fizz";
- $result = $this->sut->$method_to_use( DependencyClass::class, 'concat', 'foo', 'bar', 'fizz' );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * Legacy proxy's 'get_instance_of' can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["get_instance_of_using_injected_proxy"]
- * ["get_instance_of_using_woocommerce_class"]
- */
- public function test_get_instance_of_can_be_used_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $instance = $this->sut->$method_to_use( \WC_Queue_Interface::class, 34 );
- $this->assertInstanceOf( \WC_Action_Queue::class, $instance );
- }
-
- /**
- * Legacy object mocks can be used from both an injected LegacyProxy and from 'WC()->call_function'
- *
- * @param string $method_to_use Method in the tested class to use.
- *
- * @testWith ["get_instance_of_using_injected_proxy"]
- * ["get_instance_of_using_woocommerce_class"]
- */
- public function test_class_mocks_can_be_used_via_injected_legacy_proxy_and_woocommerce_object( $method_to_use ) {
- $mock = new \stdClass();
- $this->register_legacy_proxy_class_mocks( array( \WC_Query::class => $mock ) );
- $this->assertSame( $mock, $this->sut->$method_to_use( \WC_Query::class ) );
- }
-}
diff --git a/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php b/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php
deleted file mode 100644
index d9c18a65d6b..00000000000
--- a/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php
+++ /dev/null
@@ -1,103 +0,0 @@
-legacy_proxy = $legacy_proxy;
- }
-
- /**
- * Use proxy's 'call_function' from the injected proxy.
- *
- * @param string $function Function to call.
- * @param mixed ...$parameters Parameters to pass to the function.
- *
- * @return mixed The result from the function.
- */
- public function call_legacy_function_using_injected_proxy( $function, ...$parameters ) {
- return $this->legacy_proxy->call_function( $function, ...$parameters );
- }
-
- /**
- * Use proxy's 'call_function' using 'WC()->call_function'.
- *
- * @param string $function Function to call.
- * @param mixed ...$parameters Parameters to pass to the function.
- *
- * @return mixed The result from the function.
- */
- public function call_legacy_function_using_woocommerce_class( $function, ...$parameters ) {
- return WC()->call_function( $function, ...$parameters );
- }
-
- /**
- * Use proxy's 'call_static' from the injected proxy.
- *
- * @param string $class_name Class containing the static method to call.
- * @param string $method_name Static method to call.
- * @param mixed ...$parameters Parameters to pass to the method.
- *
- * @return mixed The result from the method.
- */
- public function call_static_method_using_injected_proxy( $class_name, $method_name, ...$parameters ) {
- return $this->legacy_proxy->call_static( $class_name, $method_name, ...$parameters );
- }
-
- /**
- * Use proxy's 'call_static' using 'WC()->call_function'.
- *
- * @param string $class_name Class containing the static method to call.
- * @param string $method_name Static method to call.
- * @param mixed ...$parameters Parameters to pass to the method.
- *
- * @return mixed The result from the method.
- */
- public function call_static_method_using_woocommerce_class( $class_name, $method_name, ...$parameters ) {
- return WC()->call_static( $class_name, $method_name, ...$parameters );
- }
-
- /**
- * Use proxy's 'get_instance_of' from the injected proxy.
- *
- * @param string $class_name The name of the class to get an instance of.
- * @param mixed ...$args Extra arguments for 'get_instance_of'.
- *
- * @return object The instance obtained.
- */
- public function get_instance_of_using_injected_proxy( string $class_name, ...$args ) {
- return $this->legacy_proxy->get_instance_of( $class_name, ...$args );
- }
-
- /**
- * Use proxy's 'get_instance_of' using 'WC()->call_function'.
- *
- * @param string $class_name The name of the class to get an instance of.
- * @param mixed ...$args Extra arguments for 'get_instance_of'.
- *
- * @return object The instance obtained.
- */
- public function get_instance_of_using_woocommerce_class( string $class_name, ...$args ) {
- return WC()->get_instance_of( $class_name, ...$args );
- }
-}
diff --git a/tests/php/src/Proxies/LegacyProxyTest.php b/tests/php/src/Proxies/LegacyProxyTest.php
deleted file mode 100644
index bc90f4f7fc2..00000000000
--- a/tests/php/src/Proxies/LegacyProxyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-sut = new LegacyProxy();
- }
-
- /**
- * @testdox 'get_instance_of' throws an exception when trying to use it to get an instance of a namespaced class.
- */
- public function test_get_instance_of_throws_when_trying_to_get_a_namespaced_class() {
- $this->expectException( \Exception::class );
- $this->expectExceptionMessage( 'The LegacyProxy class is not intended for getting instances of classes in the src directory, please use constructor injection or the instance of \Psr\Container\ContainerInterface for that.' );
-
- $this->sut->get_instance_of( DependencyClass::class );
- }
-
- /**
- * @testdox 'get_instance_of' can be used to get an instance of a class by using its constructor and passing constructor arguments.
- */
- public function test_get_instance_of_can_be_used_to_get_a_non_namespaced_class_with_constructor_parameters() {
- $instance = $this->sut->get_instance_of( \WC_Data_Exception::class, 1234, 'Error!', 432 );
- $this->assertInstanceOf( \WC_Data_Exception::class, $instance );
- $this->assertEquals( 1234, $instance->getErrorCode() );
- $this->assertEquals( 'Error!', $instance->getMessage() );
- $this->assertEquals( 432, $instance->getCode() );
- }
-
- /**
- * @testdox 'get_instance_of' uses the 'instance' static method in classes that implement it, passing the supplied arguments.
- */
- public function test_get_instance_of_class_with_instance_method_gets_an_instance_of_the_appropriate_class() {
- // ClassWithSingleton is in the root namespace and thus can't be autoloaded.
- require_once dirname( __DIR__ ) . '/Internal/DependencyManagement/ExampleClasses/ClassWithSingleton.php';
-
- $instance = $this->sut->get_instance_of( \ClassWithSingleton::class, 'foo', 'bar' );
- $this->assertSame( \ClassWithSingleton::$instance, $instance );
- $this->assertEquals( array( 'foo', 'bar' ), \ClassWithSingleton::$instance_args );
- }
-
- /**
- * @testdox 'get_instance_of' can be used to get an instance of a class implementing WC_Queue_Interface.
- */
- public function test_get_instance_of_wc_queue_interface_gets_an_instance_of_the_appropriate_class() {
- $instance = $this->sut->get_instance_of( \WC_Queue_Interface::class, 34 );
- $this->assertInstanceOf( \WC_Action_Queue::class, $instance );
- }
-
- /**
- * @testdox 'call_function' can be used to invoke any standalone function.
- */
- public function test_call_function_can_be_used_to_invoke_functions() {
- $result = $this->sut->call_function( 'substr', 'foo bar fizz', 4, 3 );
- $this->assertEquals( 'bar', $result );
- }
-
- /**
- * @testdox 'call_static' can be used to invoke any public static class method.
- */
- public function test_call_static_can_be_used_to_invoke_public_static_methods() {
- $result = $this->sut->call_static( DependencyClass::class, 'concat', 'foo', 'bar', 'fizz' );
- $this->assertEquals( 'Parts: foo, bar, fizz', $result );
- }
-}
diff --git a/tests/php/src/Proxies/MockableLegacyProxyTest.php b/tests/php/src/Proxies/MockableLegacyProxyTest.php
deleted file mode 100644
index 579f514a7bc..00000000000
--- a/tests/php/src/Proxies/MockableLegacyProxyTest.php
+++ /dev/null
@@ -1,226 +0,0 @@
-sut = new MockableLegacyProxy();
- }
-
- /**
- * @testdox 'get_instance_of' works as in LegacyProxy if no class mocks are registered.
- */
- public function test_get_instance_of_works_as_regular_legacy_proxy_if_no_mock_registered() {
- $instance = $this->sut->get_instance_of( \WC_Data_Exception::class, 1234, 'Error!', 432 );
- $this->assertInstanceOf( \WC_Data_Exception::class, $instance );
- $this->assertEquals( 1234, $instance->getErrorCode() );
- $this->assertEquals( 'Error!', $instance->getMessage() );
- $this->assertEquals( 432, $instance->getCode() );
- }
-
- /**
- * The data provider for test_register_class_mocks_throws_if_invalid_parameters_supplied.
- *
- * @return array[]
- */
- public function data_provider_for_test_register_class_mocks_throws_if_invalid_parameters_supplied() {
- return array(
- array( 1234, new \stdClass() ),
- array( 'SomeClassName', 1234 ),
- );
- }
-
- /**
- * @testdox 'register_class_mocks' throws an exception if an invalid parameter is supplied (not an array of class name => object or factory callback).
- *
- * @dataProvider data_provider_for_test_register_class_mocks_throws_if_invalid_parameters_supplied
- *
- * @param string $class_name The name of the class to mock.
- * @param object $mock The mock.
- */
- public function test_register_class_mocks_throws_if_invalid_parameters_supplied( $class_name, $mock ) {
- $this->expectException( \Exception::class );
- $this->expectExceptionMessage( 'MockableLegacyProxy::register_class_mocks: $mocks must be an associative array of class_name => object or factory callback.' );
-
- $this->sut->register_class_mocks( array( $class_name => $mock ) );
- }
-
- /**
- * @testdox 'register_class_mocks' can be used to return class mocks by passing fixed mock instances.
- */
- public function test_register_class_mocks_can_be_used_so_that_get_instance_of_returns_a_fixed_instance_mock() {
- $mock = new \stdClass();
- $this->sut->register_class_mocks( array( \WC_Query::class => $mock ) );
- $this->assertSame( $mock, $this->sut->get_instance_of( \WC_Query::class ) );
- }
-
- /**
- * @testdox 'register_class_mocks' can be used to return class mocks by passing mock factory callbacks.
- */
- public function test_register_class_mocks_can_be_used_so_that_get_instance_of_uses_a_factory_function_to_return_the_instance() {
- $mock_factory = function( $code, $message, $http_status_code = 400, $data = array() ) {
- return "$code, $message, $http_status_code";
- };
- $this->sut->register_class_mocks( array( \WC_Data_Exception::class => $mock_factory ) );
- $this->assertEquals( '1234, Error!, 432', $this->sut->get_instance_of( \WC_Data_Exception::class, 1234, 'Error!', 432 ) );
- }
-
- /**
- * @testdox 'call_function' works as in LegacyProxy if no function mocks are registered.
- */
- public function test_call_function_works_as_regular_legacy_proxy_if_no_mocks_registered() {
- $result = $this->sut->call_function( 'substr', 'foo bar fizz', 4, 3 );
- $this->assertEquals( 'bar', $result );
- }
-
- /**
- * The data provider for test_register_function_mocks_throws_if_invalid_parameters_supplied.
- *
- * @return array[]
- */
- public function data_provider_for_test_register_function_mocks_throws_if_invalid_parameters_supplied() {
- return array(
- array( 1234, function() {} ),
- array( 'SomeClassName', 1234 ),
- );
- }
-
- /**
- * @testdox 'register_function_mocks' throws an exception if an invalid parameter is supplied (not an array of function name => mock function).
- *
- * @dataProvider data_provider_for_test_register_function_mocks_throws_if_invalid_parameters_supplied
- *
- * @param string $function_name The name of the function to mock.
- * @param callable $mock The mock.
- */
- public function test_register_function_mocks_throws_if_invalid_parameters_supplied( $function_name, $mock ) {
- $this->expectException( \Exception::class );
- $this->expectExceptionMessage( 'MockableLegacyProxy::register_function_mocks: The supplied mocks array must have function names as keys and function replacement callbacks as values.' );
-
- $this->sut->register_function_mocks( array( $function_name => $mock ) );
- }
-
- /**
- * @testdox 'register_function_mocks' can be used to register mocks for any function.
- */
- public function test_register_function_mocks_can_be_used_so_that_call_function_calls_mock_functions() {
- $this->sut->register_function_mocks(
- array(
- 'substr' => function( $string, $start, $length ) {
- return "I'm returning substr of '$string' from $start with length $length";
- },
- )
- );
-
- $expected = "I'm returning substr of 'foo bar fizz' from 4 with length 3";
- $result = $this->sut->call_function( 'substr', 'foo bar fizz', 4, 3 );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * @testdox 'call_static' works as in LegacyProxy if no static method mocks are registered.
- */
- public function test_call_static_works_as_regular_legacy_proxy_if_no_mocks_registered() {
- $result = $this->sut->call_static( DependencyClass::class, 'concat', 'foo', 'bar', 'fizz' );
- $this->assertEquals( 'Parts: foo, bar, fizz', $result );
- }
-
- /**
- * The data provider for test_register_static_mocks_throws_if_invalid_parameters_supplied.
- *
- * @return array[]
- */
- public function data_provider_for_test_register_static_mocks_throws_if_invalid_parameters_supplied() {
- return array(
- array( 1234, array( 'some_method' => function(){} ) ),
- array( 'SomeClassName', 1234 ),
- array( 'SomeClassName', array( 1234 => function(){} ) ),
- array( 'SomeClassName', array( 'the_method' => 1234 ) ),
- );
- }
-
- /**
- * @testdox
- *
- * @dataProvider data_provider_for_test_register_function_mocks_throws_if_invalid_parameters_supplied
- *
- * @param string $class_name The name of the class whose static methods we want to mock.
- * @param array $mocks The mocks.
- */
- public function test_register_static_mocks_throws_if_invalid_parameters_supplied( $class_name, $mocks ) {
- $this->expectException( \Exception::class );
- $this->expectExceptionMessage( 'MockableLegacyProxy::register_static_mocks: $mocks must be an associative array of class name => associative array of method name => callable.' );
-
- $this->sut->register_static_mocks( array( $class_name => $mocks ) );
- }
-
- /**
- * @testdox 'register_static_mocks' can be used to register mocks for any static method.
- */
- public function test_register_static_mocks_can_be_used_so_that_call_function_calls_mock_functions() {
- $this->sut->register_static_mocks(
- array(
- DependencyClass::class => array(
- 'concat' => function( ...$parts ) {
- return "I'm returning concat of these parts: " . join( ' ', $parts );
- },
- ),
- )
- );
-
- $expected = "I'm returning concat of these parts: foo bar fizz";
- $result = $this->sut->call_static( DependencyClass::class, 'concat', 'foo', 'bar', 'fizz' );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * @testdox 'reset' can be used to revert the instance to its original state, in which nothing is mocked.
- */
- public function test_reset_can_be_used_to_unregister_all_mocks() {
- $this->sut->register_class_mocks( array( \WC_Query::class => new \stdClass() ) );
-
- $this->sut->register_function_mocks(
- array(
- 'substr' => function( $string, $start, $length ) {
- return null;
- },
- )
- );
-
- $this->sut->register_static_mocks(
- array(
- DependencyClass::class => array(
- 'concat' => function( ...$parts ) {
- return null;
- },
- ),
- )
- );
-
- $this->sut->reset();
-
- $this->test_call_function_works_as_regular_legacy_proxy_if_no_mocks_registered();
- $this->test_call_static_works_as_regular_legacy_proxy_if_no_mocks_registered();
- $this->test_call_static_works_as_regular_legacy_proxy_if_no_mocks_registered();
- }
-}
diff --git a/tests/php/src/Utilities/StringUtilTest.php b/tests/php/src/Utilities/StringUtilTest.php
new file mode 100644
index 00000000000..255c371c247
--- /dev/null
+++ b/tests/php/src/Utilities/StringUtilTest.php
@@ -0,0 +1,51 @@
+assertTrue( StringUtil::starts_with( 'test', 'te' ) );
+ $this->assertTrue( StringUtil::starts_with( ' foo bar', ' foo' ) );
+ $this->assertFalse( StringUtil::starts_with( 'test', 'st' ) );
+ $this->assertFalse( StringUtil::starts_with( ' foo bar', ' bar' ) );
+
+ $this->assertTrue( StringUtil::starts_with( 'TEST', 'te', false ) );
+ $this->assertTrue( StringUtil::starts_with( ' FOO BAR', ' foo', false ) );
+ $this->assertFalse( StringUtil::starts_with( 'TEST', 'st', false ) );
+ $this->assertFalse( StringUtil::starts_with( ' FOO BAR', ' bar', false ) );
+
+ $this->assertTrue( StringUtil::starts_with( 'test', 'TE', false ) );
+ $this->assertTrue( StringUtil::starts_with( ' foo bar', ' FOO', false ) );
+ $this->assertFalse( StringUtil::starts_with( 'test', 'ST', false ) );
+ $this->assertFalse( StringUtil::starts_with( ' foo bar', ' BAR', false ) );
+ }
+
+ /**
+ * @testdox `ends_with` should check whether one string ends with another.
+ */
+ public function test_ends_with() {
+ $this->assertFalse( StringUtil::ends_with( 'test', 'te' ) );
+ $this->assertFalse( StringUtil::ends_with( ' foo bar', ' foo' ) );
+ $this->assertTrue( StringUtil::ends_with( 'test', 'st' ) );
+ $this->assertTrue( StringUtil::ends_with( ' foo bar', ' bar' ) );
+
+ $this->assertFalse( StringUtil::ends_with( 'TEST', 'te', false ) );
+ $this->assertFalse( StringUtil::ends_with( ' FOO BAR', ' foo', false ) );
+ $this->assertTrue( StringUtil::ends_with( 'TEST', 'st', false ) );
+ $this->assertTrue( StringUtil::ends_with( ' FOO BAR', ' bar', false ) );
+
+ $this->assertFalse( StringUtil::ends_with( 'test', 'TE', false ) );
+ $this->assertFalse( StringUtil::ends_with( ' foo bar', ' FOO', false ) );
+ $this->assertTrue( StringUtil::ends_with( 'test', 'ST', false ) );
+ $this->assertTrue( StringUtil::ends_with( ' foo bar', ' BAR', false ) );
+ }
+}
diff --git a/woocommerce.php b/woocommerce.php
index 9ece15531c7..480e8d5f69a 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -3,7 +3,7 @@
* Plugin Name: WooCommerce
* Plugin URI: https://woocommerce.com/
* Description: An eCommerce toolkit that helps you sell anything. Beautifully.
- * Version: 4.5.0-dev
+ * Version: 4.5.0-rc.1
* Author: Automattic
* Author URI: https://woocommerce.com
* Text Domain: woocommerce