From 746f9f39fac2f0c8b9412dd05019e807152aaa8d Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Wed, 10 Apr 2024 16:53:09 +0100 Subject: [PATCH] Update test cases New braintree tag was added that is valid on older versions --- .../functional/expected_output/magentom24-nodb.out.txt | 6 +++++- .../functional/expected_output/magentom24-show-info.out.txt | 6 +++++- dev/phpunit/functional/expected_output/magentom24.out.txt | 6 +++++- .../expected_output/magentom24nodb-threeway-diff.out.txt | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt index 2243bc1..65e7835 100644 --- a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt @@ -3,11 +3,15 @@ +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | queue_poison_pill | | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | sales_order | +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order |\n +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order_grid |\n | WARN | DB schema changed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | customer_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module-to-be-removed/src/module/etc/db_schema.xml | catalog_category_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | wishlist | | WARN | DB schema target changed | vendor/magento/module-customer/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (customer_entity) | | WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (sales_order) | +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order) |\n +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order_grid) |\n | WARN | DB schema target changed | vendor/magento/module-wishlist/etc/db_schema.xml | app/code/Ampersand/Test/etc/db_schema.xml (wishlist_item) | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | app/design/frontend/Ampersand/theme/Magento_Customer/templates/account/dashboard/info.phtml | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Customer/templates/account/dashboard/info.phtml | @@ -63,7 +67,7 @@ | WARN | Redundant Override | vendor/magento/theme-frontend-blank/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml | | WARN | Redundant Override | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 61 +WARN count: 65 INFO count: 395 (to view re-run this tool with --show-info) IGNORE count: 7 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt b/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt index 94db0e1..2c70e8c 100644 --- a/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt @@ -3,11 +3,15 @@ +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | queue_poison_pill | | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | sales_order | +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order |\n +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order_grid |\n | WARN | DB schema changed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | customer_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module-to-be-removed/src/module/etc/db_schema.xml | catalog_category_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | wishlist | | WARN | DB schema target changed | vendor/magento/module-customer/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (customer_entity) | | WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (sales_order) | +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order) |\n +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order_grid) |\n | WARN | DB schema target changed | vendor/magento/module-wishlist/etc/db_schema.xml | app/code/Ampersand/Test/etc/db_schema.xml (wishlist_item) | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | app/design/frontend/Ampersand/theme/Magento_Customer/templates/account/dashboard/info.phtml | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Customer/templates/account/dashboard/info.phtml | @@ -465,7 +469,7 @@ | IGNR | Override (phtml/js/html) | vendor/magento/module-vault/view/frontend/web/js/view/payment/method-renderer/vault.js | app/design/frontend/Ampersand/theme/Magento_Vault/web/js/view/payment/method-renderer/vault.js | | IGNR | Preference | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndIgnore.php | Ampersand\Test\Model\ToPreferenceAndIgnore | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 61 +WARN count: 65 INFO count: 395 IGNORE count: 7 For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24.out.txt b/dev/phpunit/functional/expected_output/magentom24.out.txt index 244ea28..e01a32e 100644 --- a/dev/phpunit/functional/expected_output/magentom24.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24.out.txt @@ -3,11 +3,15 @@ +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | queue_poison_pill | | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | sales_order | +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order |\n +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order_grid |\n | WARN | DB schema changed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | customer_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module-to-be-removed/src/module/etc/db_schema.xml | catalog_category_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | wishlist | | WARN | DB schema target changed | vendor/magento/module-customer/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (customer_entity) | | WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (sales_order) | +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order) |\n +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order_grid) |\n | WARN | DB schema target changed | vendor/magento/module-wishlist/etc/db_schema.xml | app/code/Ampersand/Test/etc/db_schema.xml (wishlist_item) | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | app/design/frontend/Ampersand/theme/Magento_Customer/templates/account/dashboard/info.phtml | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Customer/templates/account/dashboard/info.phtml | @@ -61,7 +65,7 @@ | WARN | Redundant Override | vendor/magento/theme-frontend-blank/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml | | WARN | Redundant Override | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 59 +WARN count: 63 INFO count: 395 (to view re-run this tool with --show-info) IGNORE count: 7 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt b/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt index a2d62b8..a12d36f 100644 --- a/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt @@ -3,11 +3,15 @@ +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | queue_poison_pill | | WARN | DB schema added | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | sales_order | +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order |\n +| WARN | DB schema added | vendor/paypal/module-braintree-core/etc/db_schema.xml | sales_order_grid |\n | WARN | DB schema changed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | customer_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module-to-be-removed/src/module/etc/db_schema.xml | catalog_category_entity | | WARN | DB schema removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml | wishlist | | WARN | DB schema target changed | vendor/magento/module-customer/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (customer_entity) | | WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/module/etc/db_schema.xml (sales_order) | +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order) |\n +| WARN | DB schema target changed | vendor/magento/module-sales/etc/db_schema.xml | vendor/paypal/module-braintree-core/etc/db_schema.xml (sales_order_grid) |\n | WARN | DB schema target changed | vendor/magento/module-wishlist/etc/db_schema.xml | app/code/Ampersand/Test/etc/db_schema.xml (wishlist_item) | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | app/design/frontend/Ampersand/theme/Magento_Customer/templates/account/dashboard/info.phtml | | WARN | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml | vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Customer/templates/account/dashboard/info.phtml | @@ -110,7 +114,7 @@ phpstorm diff vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.h phpstorm diff vendor/magento/theme-frontend-luma/etc/view.xml vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml vendor_orig/magento/theme-frontend-luma/etc/view.xml phpstorm diff vendor/magento/theme-frontend-luma/etc/view.xml vendor/ampersand/upgrade-patch-helper-test-module/src/theme/etc/view.xml vendor_orig/magento/theme-frontend-luma/etc/view.xml phpstorm diff vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js vendor_orig/paypal/module-braintree-core/view/base/web/js/form-builder.js -WARN count: 61 +WARN count: 65 INFO count: 395 (to view re-run this tool with --show-info) IGNORE count: 7 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file