Chore: resolve merge conflicts#87
Merged
mage-os-ci merged 236 commits intomage-os:2.4-develop-upstreamfrom Feb 15, 2024
Merged
Conversation
feat: add workflow that automatically pulls upstream
ci: run magento coding standard for pull requests
Add inputs to mage-os/github-actions/coding-standard-baseline
…on-tests-workflow
…orkflow Add full integration tests workflow
* ACPT-1551 Modularity of ReloadProcessor::reloadApplicationState * ACP2E-2267: The requested qty is not available message issues -addressed static * ACPT-1625 * ACP2E-2127: Date filter is not working in admin grid. - Fixed the CR comments. * ACP2E-2404: [Magento Cloud] Bug of product custom option validation in product view page * ACP2E-2303: Shipping prices do not include tax in the Shipping Method - Fixed the issue and added the test coverage. * ACPT-1625 Co-authored-by: Andrii Dimov <andimov@gmail.com> * ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response * ACPT-1625 Co-authored-by: Andrii Dimov <andimov@gmail.com> * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * ACP2E-2127: Date filter is not working in admin grid. - Added the different solution. * ACP2E-2303: Shipping prices do not include tax in the Shipping Method - Added the test coverage. * AC-2917::Migration from extjs library for pages catalog/category/tree.phtml in Magento_Catalog Module - Implemented category tree AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Implemented Category move, edit and other functionalities AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Static Test Failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Code review comment fixes AC-2917::Bugfix reported in AC-10090 AC-2917::Fixed some irregularities in category tree * ACP2E-2267: The requested qty is not available message issues - probing solution * ACP2E-2267: The requested qty is not available message issues - addressed static * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * ACP2E-2495: Promocode is not getting released for payment failed with order cancel * ACP2E-2267: The requested qty is not available message issues - addressed static * AC-9713:Upgrade Less Library(fix issue for grunt less:luma) * ACP2E-2127: Date filter is not working in admin grid. - Fixed the workaround solution. * ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned when attributes change Magento\Framework\GraphQl\Config and Magento\Framework\Search\Request both use only the default cache tags (MAGE & CONFIG). Because both of those configurations have data that comes from the current attributes, when attributes change, they need to be invalidated/cleaned. Therefore, they need to have the EAV tag added to them. * ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned when attributes change Magento\Framework\GraphQl\Config and Magento\Framework\Search\Request both use only the default cache tags (MAGE & CONFIG). Because both of those configurations have data that comes from the current attributes, when attributes change, they need to be invalidated/cleaned. Therefore, they need to have the EAV tag added to them. * ACP2E-2267: The requested qty is not available message issues - implemented different solution * ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response * ACP2E-2495: Promocode is not getting released for payment failed with order cancel * ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response * ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response * ACPT-1679: Skip failing WebApi GraphQL tests fixing in ACPT-1660 * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * AC-9713:Upgrade Less Library(fix static test failures) * AC-9653::UPS SOAP and REST support in 2.4.7-beta3-code review fixes on copyright text update * ACP2E-2127: Date filter is not working in admin grid. - Fixed the different workaround solution. * ACP2E-2127: Date filter is not working in admin grid. - Fixed the different workaround solution. * ACP2E-2127: Date filter is not working in admin grid. - Fixed the different workaround solution. * ACP2E-2127: Date filter is not working in admin grid. - Removed the Timezone.php file. * Migration from extjs to jstree minor corrections * ACP2E-2520: Once Cart Become Virtual Cart after removing physical products it still returns shipping method and address in Cart Quote Graphql response * ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(Image) * ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name) * ACPT-1660: Fix WebApi GraphQL tests on Application Server Adding _resetState to Magento/Framework/App/Cache/State because it caches result from config, and config can change. * ACPT-1669 Fixing static test failures related to virtual type which isn't a real class. * ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState * AC-9653::UPS SOAP and REST support in 2.4.7-beta3-SVC Approval fixes for tracking_url * ACP2E-2127: Date filter is not working in admin grid. - Added the test coverage. * ACPT-1660: Fix WebApi GraphQL tests on Application Server * Modifying MediaGalleryTest to be compatible with Redis backend * Revert "ACPT-1679: Skip failing WebApi GraphQL tests" This reverts commit ee2f6b4. * ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState * ACPT-1660: Fix WebApi GraphQL tests on Application Server Adding _resetState to GraphQlResolverCache/Model/Resolver/Result/ValueProcessor * ACPT-1660: Fix WebApi GraphQL tests on Application Server * Adding _resetState() to Product/Price/Provider to workaround bug that is mutable state in service class * ACP2E-2127: Date filter is not working in admin grid. - Addressed the CR comments. * Fix ShowTest * ACPT-1687: Move State Comparator/Collector into proper place * ACP2E-2412: Custom Address Attribute not rendering as per sort order * ACP2E-2127: Date filter is not working in admin grid. - Fixed the CR comments. * ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder * ACP2E-2127: Date filter is not working in admin grid. - Fixed the CR comments. * ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder * ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState * Use @codingStandardsIgnoreLine for long URLs * Fix types * ACP2E-2459: Exception during multiple address checkout when admin user using "Login as Customer" functionality * ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState * ACPT-1688: Fix Static Tests failures on Application-Server branch * ACPT-1688: Fix Static Tests failures on Application-Server branch 2 * ACPT-1689: Fix Integration Tests failures on Application-Server branch * ACPT-1696: Fix SVC test failures on Application-Server branch * ACPT-1688: Fix Static Tests failures on Application-Server branch; -Remove dependency of library classes on non-library classes * ACPT-1688: Fix Static Tests failures on Application-Server branch * ACPT-1688: Fix Static Tests failures on Application-Server branch * ACPT-1688: Fix Static Tests failures on Application-Server branch Final * ACPT-1688: Fix Static Tests failures * ACPT-1697: Move state-*-list.php files back to dev from lib * ACPT-1697: Move state-*-list.php files back to dev from lib * ACPT-1688: Fix Static Tests failures on Application-Server branch * LYNX-289: Add property caching for customer_group_excluded_website * LYNX-289: Add property caching for customer_group_excluded_website * LYNX-289: Remove obsolete SOAP test; CR changes * LYNX-289: CR changes * ACPT-1688: Fix Static Tests failures on Application-Server branch 2 * ACPT-1688: Fix Static Tests failures on Application-Server branch 3 * ACPT-1688: Fix Static Tests failures on Application-Server branch 4 * GraphQlCheckoutMutationsStateTest & GraphQlCustomerMutationsTest: skipping tests that need to be fixed later * ACPT-1688: Fix Static Tests failures on Application-Server branch 5 * ACPT-1688: Fix Metric Types * LYNX-290: Bulk quote_shipping_rate delete (mage-os#174) * ACPT-1226: GraphQlStateTest improvements and other fixes; -Fix integration test failure * ACPT-1689: Fix Integration Tests failures * Resolve merge conflict in CONTRIBUTING.md (mage-os#66) --------- Co-authored-by: aplapana <aplapana@adobe.com> Co-authored-by: Aakash Kumar <aakashk@adobe.com> Co-authored-by: Anna Bukatar <abukatar@magento.com> Co-authored-by: Arularasan <glo02433@adobe.com> Co-authored-by: Sarmistha <sarmistha@BLR1-LMC-N71241.local> Co-authored-by: Andrii Dimov <andimov@gmail.com> Co-authored-by: Olga Moyseyenko <moyseyen@adobe.com> Co-authored-by: Oleksandr Iegorov <oiegorov@adobe.com> Co-authored-by: Banvari Lal <glo60612@adobe.com> Co-authored-by: Atul-glo35265 <glo35265@adobe.com> Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com> Co-authored-by: Jacob Brown <jacob@gnu.org> Co-authored-by: Dmytro Horytskyi <dhorytskyi@magento.com> Co-authored-by: Saurabh Kumar <glo17680@adobe.com> Co-authored-by: Roman Flowers <flowers@adobe.com> Co-authored-by: glo5363 <glo05363@adobe.com> Co-authored-by: Lavi Jain <87003041+glo05363@users.noreply.github.com> Co-authored-by: Nishant Rana <glo04412@adobe.com> Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com> Co-authored-by: Dmytro Shevtsov <shevtsov@adobe.com> Co-authored-by: arnsaha <arnsaha@adobe.com> Co-authored-by: Dima Shevtsov <12731225+dshevtsov@users.noreply.github.com> Co-authored-by: yaroslavgoncharuk <goncharu@adobe.com> Co-authored-by: Alex Kolesnyk <kolesnyk@adobe.com> Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com> Co-authored-by: lakshmana49 <107415484+lakshmana49@users.noreply.github.com> Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com> Co-authored-by: Rafal Janicki <rjanicki@adobe.com> Co-authored-by: Rajesh Kumar <glo71317@adobe.com> Co-authored-by: Stanislav Idolov <sidolov@adobe.com> Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com> Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local> Co-authored-by: Sergio Vera <svera@adobe.com> Co-authored-by: Vinai Kopp <Vinai@users.noreply.github.com>
Upstream Merge Conflict (2.4-develop)
* Fix \Magento\Paypal\Model\Express\CheckoutTest - dbIsolation missing
* Fix tests Magento\CatalogImportExport\Model\Import\ProductTest\ProductStockTest::testProductStockStatusShouldBeUpdatedOnSchedule
Zend_Db_Exception: Table "catalog_category_product_index_store0_replica" does not exist
Partially reverting fix from Vinai:
`Create category-product index table for store 0 (mage-os#47)
This fixes a regression introduced by pull request
https://github.com/mage-os/mageos-magento2/pull/25`
* Fix failing tests with error `undefined key 'product_id`' from app/code/Magento/CatalogInventory/Model/StockManagement.php:110
Test: dev/tests/integration/testsuite/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/DownloadableTest.php
* Fix failed tests: \Magento\Wishlist\Controller\Index\AddTest
Failed due to visibility filter in whishlist collection. Products were not added to root category and not reindexed. So visibility filter ued to exclude them from wishlist items collection: app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php:390
* Decrease test-cases - use php 8.2 only for testing purposes
Include and use changed workflow to have more unitary tests executions
* Mark tests as incomplete as actual fix is in: mage-os/mageos-magento-zend-db#1
Error that was fixed:
Unable to revert fixture: Magento/Framework/Backup/_files/trigger.php
#0 /var/www/html/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php(42): Magento\Framework\Backup\DbTest->testBackupAndRollbackIncludesCustomTriggers()
...
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set mage-os#4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set mage-os#1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
ImagickException: unable to read font `' @ error/annotate.c/RenderFreetype/1636
* Fix integration tests error:
Magento\Dhl\Model\CarrierTest::testRequestToShip with data set #0 ('GB', 'EU', 'US')
Failed asserting that two DOM documents are equal.
- <SoftwareName>Magento</SoftwareName>
+ <SoftwareName>Mage-OS</SoftwareName>
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set mage-os#1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set mage-os#1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set mage-os#4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064
* Revert "feat(catalog): faster category product count (mage-os#25)"
This reverts commit f01535b.
* Revert "Create category-product index table for store 0 (mage-os#47)"
This reverts commit 7be2613.
* Add optional param to run tests over specific directory only.
* Fix failed tests: \Magento\Version\Controller\Index\IndexTest
Update package name to mage-os
* Fix integration tests (most likely caused by incorrect merge conflict resolving):
error msg:
1) Magento\Catalog\Block\Adminhtml\Category\Checkboxes\TreeTest::testGetTreeJson
Error: Call to a member function getConnectionName() on null
/var/www/html/lib/internal/Magento/Framework/App/ResourceConnection.php:110
/var/www/html/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php:570
...
ref: https://github.com/vpodorozh/mageos-magento2/actions/runs/7472531139/job/20334972566#step:6:39
* Fix failed integration tests in \Magento\Customer
* Revert "Fix failed integration tests in \Magento\Customer"
* Update full-integration-tests.yaml
---------
Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description (*)
Resolve merge conflicts in automatically opened PR #86
Contribution checklist (*)