Reverting 36463

Author: engcom-Charlie

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectFlatRateShippingMethodActionGroup.xml

@@ -11,10 +11,9 @@
     <!-- Checkout select Flat Rate shipping method -->
     <actionGroup name="CheckoutSelectFlatRateShippingMethodActionGroup">
         <annotations>
-            <description>Waits for Shipping Section load. Clicks on the 'Flat Rate' Shipping Method on the Storefront Checkout page.</description>
+            <description>Clicks on the 'Flat Rate' Shipping Method on the Storefront Checkout page.</description>
         </annotations>
 
-        <waitForElementClickable selector="{{CheckoutShippingMethodsSection.shippingMethodFlatRate}}" stepKey="waitForFlatRateShippingMethod"/>
         <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" visible="true" stepKey="selectFlatRateShippingMethod"/>
         <waitForPageLoad stepKey="waitForLoadingMaskForNextButton"/>
     </actionGroup>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGuestCheckoutProceedToPaymentStepActionGroup.xml

@@ -10,10 +10,9 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontGuestCheckoutProceedToPaymentStepActionGroup">
         <annotations>
-            <description>Waits for Shipping Section load. Clicks next on Checkout Shipping step. Waits for Payment step</description>
+            <description>Clicks next on Checkout Shipping step. Waits for Payment step</description>
         </annotations>
 
-        <waitForElementClickable selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="waitForNextButtonClickable"/>
         <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded" after="clickNext"/>
         <seeCurrentUrlMatches regex="~/checkout/?#payment~" stepKey="assertCheckoutPaymentUrl"/>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectFirstShippingMethodActionGroup.xml

@@ -10,10 +10,9 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontSelectFirstShippingMethodActionGroup">
         <annotations>
-            <description>Waits for Shipping Section load. Select first shipping method.</description>
+            <description>Select first shipping method.</description>
         </annotations>
-        
-        <waitForElementClickable selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForShippingMethod"/>
+
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForMaskDisappear"/>
     </actionGroup>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithSameShippingAndBillingAddressEnabledCheckboxTest.xml

@@ -67,7 +67,6 @@
         <fillField selector="{{CheckoutShippingGuestInfoSection.regionInput}}" userInput="" stepKey="changeStateProvinceField"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="KW1 7NQ" stepKey="changeZipPostalCodeField"/>
         <!-- 8. Change shipping rate, select Free Shipping -->
-        <waitForElementClickable selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingShippingMethod"/>
         <checkOption selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="checkFreeShippingAsShippingMethod"/>
         <!-- 9. Fill other fields -->
         <actionGroup ref="StorefrontFillGuestShippingInfoActionGroup" stepKey="fillOtherFieldsInCheckoutShippingSection"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml

@@ -72,8 +72,6 @@ define([
                     cartCache.set('totals', quote.getTotals());
                 }
             }
-            // unset loader on shipping rates list
-            shippingService.isLoading(false);
         },
 
         /**

app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js

@@ -17,7 +17,6 @@ define([
     'mage/translate',
     'uiRegistry',
     'Magento_Checkout/js/model/shipping-address/form-popup-state',
-    'Magento_Checkout/js/model/shipping-service',
     'Magento_Checkout/js/model/quote'
 ], function (
     $,
@@ -29,8 +28,7 @@ define([
     defaultValidator,
     $t,
     uiRegistry,
-    formPopUpState,
-    shippingService
+    formPopUpState
 ) {
     'use strict';
 
@@ -148,8 +146,6 @@ define([
                     }, delay);
 
                     if (!formPopUpState.isVisible()) {
-                        // Prevent shipping methods showing none available whilst we resolve
-                        shippingService.isLoading(true);
                         clearTimeout(self.validateAddressTimeout);
                         self.validateAddressTimeout = setTimeout(function () {
                             self.validateFields();

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

@@ -82,7 +82,6 @@
         </actionGroup>
         <see selector="{{CheckoutShippingMethodsSection.shippingRatePriceByName('Fixed')}}" userInput="$5.00" stepKey="assertFlatRatedMethodPrice"/>
         <see selector="{{CheckoutShippingMethodsSection.shippingRatePriceByName('Table Rate')}}" userInput="$7.99" stepKey="assertTableRatedMethodPrice"/>
-        <waitForElementClickable selector="{{CheckoutShippingMethodsSection.shippingMethodFlatRate}}" stepKey="waitForFlatRateShippingMethod"/>
         <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatRateShippingMethod"/>
         <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="goToPaymentStep"/>
         <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCoupon">

app/code/Magento/Shipping/Test/Mftf/Test/StorefrontAssertShippingPricesPresentAfterApplyingCartRuleTest.xml

@@ -41,7 +41,6 @@ define([
             },
             'Magento_Checkout/js/model/shipping-service': {
                 setShippingRates: function () {},
-                isLoading: ko.observable(),
                 getShippingRates: function () {
                     return ko.observable(rates);
                 }