Skip to content

Commit 81e3240

Browse files
fascinosumfascinosum
authored
Merge pull request #5648 from magento-tsg/2.4-develop-php74-pr36
[TSG][PHP7.4] Fixes for 2.4 (pr36) (2.4-develop-php74)
2 parents 431a535 + 13b97dc commit 81e3240

File tree

6 files changed

+21
-30
lines changed

6 files changed

+21
-30
lines changed

‎app/code/Magento/Catalog/etc/di.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -672,14 +672,6 @@
672672
<item name="store" xsi:type="string">Magento\Store\Model\StoreScopeProvider</item>
673673
</item>
674674
</item>
675-
<item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
676-
<item name="entityTableName" xsi:type="string">catalog_category_entity</item>
677-
<item name="eavEntityType" xsi:type="string">catalog_category</item>
678-
<item name="identifierField" xsi:type="string">entity_id</item>
679-
<item name="entityContext" xsi:type="array">
680-
<item name="store" xsi:type="string">Magento\Store\Model\StoreScopeProvider</item>
681-
</item>
682-
</item>
683675
<item name="Magento\Catalog\Api\Data\CategoryLinkInterface" xsi:type="array">
684676
<item name="entityTableName" xsi:type="string">catalog_category_product</item>
685677
<item name="identifierField" xsi:type="string">entity_id</item>
@@ -847,11 +839,6 @@
847839
<item name="store" xsi:type="string">Magento\Store\Model\DefaultStoreScopeProvider</item>
848840
</item>
849841
</item>
850-
<item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
851-
<item name="entityContext" xsi:type="array">
852-
<item name="store" xsi:type="string">Magento\Store\Model\DefaultStoreScopeProvider</item>
853-
</item>
854-
</item>
855842
</argument>
856843
</arguments>
857844
</virtualType>
@@ -878,10 +865,6 @@
878865
<arguments>
879866
<argument name="extensionActions" xsi:type="array">
880867
<item name="eav" xsi:type="array">
881-
<item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
882-
<item name="create" xsi:type="string">Magento\Catalog\Model\ResourceModel\CreateHandler</item>
883-
<item name="update" xsi:type="string">Magento\Catalog\Model\ResourceModel\UpdateHandler</item>
884-
</item>
885868
<item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="array">
886869
<item name="create" xsi:type="string">Magento\Catalog\Model\ResourceModel\CreateHandler</item>
887870
<item name="update" xsi:type="string">Magento\Catalog\Model\ResourceModel\UpdateHandler</item>
@@ -903,7 +886,6 @@
903886
<arguments>
904887
<argument name="hydrators" xsi:type="array">
905888
<item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
906-
<item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
907889
<item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Catalog\Model\Product\Hydrator</item>
908890
</argument>
909891
</arguments>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,29 @@
154154
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickToAddProductToOrder"/>
155155
<waitForPageLoad stepKey="waitForNewOrderPageLoad"/>
156156
<see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
157+
158+
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderThirdTime">
159+
<argument name="customer" value="$createCustomer$"/>
160+
</actionGroup>
161+
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addThirdChildProductToOrder">
162+
<argument name="product" value="$createConfigChildProduct3$"/>
163+
<argument name="productQty" value="1"/>
164+
</actionGroup>
165+
<actionGroup ref="AssertAdminItemOrderedErrorNotVisibleActionGroup" stepKey="assertNoticeAbsent">
166+
<argument name="productName" value="$createConfigChildProduct3.name$"/>
167+
<argument name="messageType" value="notice"/>
168+
</actionGroup>
169+
<actionGroup ref="AssertAdminItemOrderedErrorNotVisibleActionGroup" stepKey="assertErrorAbsent">
170+
<argument name="productName" value="$createConfigChildProduct3.name$"/>
171+
<argument name="messageType" value="error"/>
172+
</actionGroup>
157173
<!-- Select shipping method -->
158174
<comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
159175
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
160176
<waitForPageLoad stepKey="waitForShippingMethods"/>
161177
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
162178
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
163179
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
164-
<waitForPageLoad stepKey="waitForError"/>
165-
<!-- Check that error remains -->
166-
<actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
167-
<argument name="productName" value="$createConfigChildProduct2.name$"/>
168-
<argument name="messageType" value="error"/>
169-
<argument name="message" value="This product is out of stock."/>
170-
</actionGroup>
180+
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="checkOrderSuccessfullyCreated"/>
171181
</test>
172182
</tests>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AddSimpleProductToOrderActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
2626
<scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
2727
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
28-
<wait time="5" stepKey="waitForOptionsToLoad"/>
28+
<waitForLoadingMaskToDisappear stepKey="waitForOptionsToLoad"/>
2929
</actionGroup>
3030
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorNotVisibleActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<argument name="message" defaultValue="The requested qty is not available" type="string"/>
1818
</arguments>
1919
<dontSee userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.productMessage(productName, messageType)}}" stepKey="assertItemErrorNotVisible"/>
20+
<dontSee userInput="{{message}}" selector="{{AdminOrderFormMessagesSection.messageByType(messageType)}}" stepKey="assertOrderErrorNotVisible"/>
2021
</actionGroup>
2122
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormMessagesSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AdminOrderFormMessagesSection">
1212
<element name="success" type="text" selector="#order-message div.message-success"/>
1313
<element name="error" type="text" selector="#order-message div.message-error"/>
14+
<element name="messageByType" type="text" selector="#order-message div.message-{{messageType}}" parameterized="true"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
<argument name="productQty" value="1"/>
7171
</actionGroup>
7272
<!-- Check that error remains -->
73-
<actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
74-
<argument name="productName" value="$simpleProduct.name$"/>
75-
<argument name="messageType" value="error"/>
76-
</actionGroup>
73+
<see userInput="The requested qty is not available" stepKey="assertProductErrorRemains"/>
7774
</test>
7875
</tests>

0 commit comments

Comments
 (0)