🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

magento-engcom-team · web-flow · commit 390505a93555 · 2020-09-21T07:35:08.000-05:00
Accepted Community Pull Requests: - #30030: [MFTF] Create StorefrontClickRefundTabCustomerOrderViewActionGroup (by @Usik2203) - #28117: RequireJS resolver sometimes fails to detect blocked resources (by @ishakhsuvarov) Fixed GitHub Issues: - #30032: [Issue] [MFTF] Create StorefrontClickRefundTabCustomerOrderViewActionGroup (reported by @m2-assistant[bot]) has been fixed in #30030 by @Usik2203 in 2.4-develop branch Related commits: 1. 996bdaf 2. 772886e 3. 173356c - #28116: RequireJS resolver sometimes fails to detect blocked resources (reported by @ishakhsuvarov) has been fixed in #28117 by @ishakhsuvarov in 2.4-develop branch Related commits: 1. 303bd64 2. bfdde51 3. c1f132b 4. 8602bef 5. 375b129
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontClickRefundTabCustomerOrderViewActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontClickRefundTabCustomerOrderViewActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontClickRefundTabCustomerOrderViewActionGroup">
+        <annotations>
+            <description>Click "Refund" tab for customer order view.</description>
+        </annotations>
+
+        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefundTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -133,8 +133,7 @@
         <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
         <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
         <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-        <waitForPageLoad stepKey="waitRefundsLoad"/>
+        <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
         <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
@@ -127,8 +127,7 @@
         <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
         <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
         <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-        <waitForPageLoad stepKey="waitRefundsLoad"/>
+        <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
         <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="110.00" stepKey="seeGrandTotal"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
@@ -120,8 +120,7 @@
         <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
         <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
         <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-        <waitForPageLoad stepKey="waitRefundsLoad"/>
+        <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
         <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -119,8 +119,7 @@
         <scrollTo selector="{{StorefrontCustomerResentOrdersSection.blockResentOrders}}" stepKey="scrollToResent"/>
         <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
         <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{StorefrontCustomerOrderSection.tabRefund}}" stepKey="clickRefund"/>
-        <waitForPageLoad stepKey="waitRefundsLoad"/>
+        <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
         <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
     </test>
diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
@@ -37,6 +37,16 @@ define([
         return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
     }
 
+    /**
+     * Checks if provided module had path fallback triggered.
+     *
+     * @param {Object} module - Module to be checked.
+     * @return {Boolean}
+     */
+    function isPathFallback(module) {
+        return registry[module.id] && registry[module.id].events.error;
+    }
+
     /**
      * Checks if provided module has unresolved dependencies.
      *
@@ -48,7 +58,8 @@ define([
             return false;
         }
 
-        return module.depCount > _.filter(module.depMaps, isRejected).length;
+        return module.depCount >
+            _.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,16 @@ define([`
`37`	`37`	`return registry[module.id] && (registry[module.id].inited \|\| registry[module.id].error);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ /**`
	`41`	`+ * Checks if provided module had path fallback triggered.`
	`42`	`+ *`
	`43`	`+ * @param {Object} module - Module to be checked.`
	`44`	`+ * @return {Boolean}`
	`45`	`+ */`
	`46`	`+ function isPathFallback(module) {`
	`47`	`+ return registry[module.id] && registry[module.id].events.error;`
	`48`	`+ }`
	`49`	`+`
`40`	`50`	`/**`
`41`	`51`	`* Checks if provided module has unresolved dependencies.`
`42`	`52`	`*`
`@@ -48,7 +58,8 @@ define([`
`48`	`58`	`return false;`
`49`	`59`	`}`
`50`	`60`
`51`		`- return module.depCount > _.filter(module.depMaps, isRejected).length;`
	`61`	`+ return module.depCount >`
	`62`	`+ _.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length;`
`52`	`63`	`}`
`53`	`64`
`54`	`65`	`/**`