AC-9030::Fedex API Upgrade - Fix for the Functional Test Failure

Author: Atul-glo35265

app/code/Magento/Fedex/Test/Mftf/Section/AdminShippingMethodFedExSection.xml

@@ -13,13 +13,12 @@
         <element name="carriersFedExActive" type="input" selector="#carriers_fedex_active_inherit"/>
         <element name="carriersFedExTitle" type="input" selector="#carriers_fedex_title_inherit"/>
         <element name="carriersFedExAccountId" type="input" selector="#carriers_fedex_account"/>
-        <element name="carriersFedExMeterNumber" type="input" selector="#carriers_fedex_meter_number"/>
-        <element name="carriersFedExKey" type="input" selector="#carriers_fedex_key"/>
-        <element name="carriersFedExPassword" type="input" selector="#carriers_fedex_password"/>
+        <element name="carriersFedExApiKey" type="input" selector="#carriers_fedex_api_key"/>
+        <element name="carriersFedExSecretKey" type="input" selector="#carriers_fedex_secret_key"/>
         <element name="carriersFedExSandboxMode" type="input" selector="#carriers_fedex_sandbox_mode_inherit"/>
         <element name="carriersFedExShipmentRequestType" type="input" selector="#carriers_fedex_shipment_requesttype_inherit"/>
         <element name="carriersFedExPackaging" type="input" selector="#carriers_fedex_packaging_inherit"/>
-        <element name="carriersFedExDropoff" type="input" selector="#carriers_fedex_dropoff_inherit"/>
+        <element name="carriersFedExPickupType" type="input" selector="#carriers_fedex_pickup_type"/>
         <element name="carriersFedExUnitOfMeasure" type="input" selector="#carriers_fedex_unit_of_measure_inherit"/>
         <element name="carriersFedExMaxPackageWeight" type="input" selector="#carriers_fedex_max_package_weight_inherit"/>
         <element name="carriersFedExHandlingType" type="input" selector="#carriers_fedex_handling_type_inherit"/>

app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml

@@ -29,20 +29,15 @@
 			<actualResult type="const">$grabFedExAccountIdDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExMeterNumber}}" userInput="disabled" stepKey="grabFedExMeterNumberDisabled"/>
-        <assertEquals stepKey="assertFedExMeterNumberDisabled">
-			<actualResult type="const">$grabFedExMeterNumberDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExApiKey}}" userInput="disabled" stepKey="grabFedExApiKeyDisabled"/>
+        <assertEquals stepKey="assertFedExApiKeyDisabled">
+            <actualResult type="const">$grabFedExApiKeyDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExKey}}" userInput="disabled" stepKey="grabFedExKeyDisabled"/>
-        <assertEquals stepKey="assertFedExKeyDisabled">
-			<actualResult type="const">$grabFedExKeyDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
-        </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPassword}}" userInput="disabled" stepKey="grabFedExPasswordDisabled"/>
-        <assertEquals stepKey="assertFedExPasswordDisabled">
-			<actualResult type="const">$grabFedExPasswordDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSecretKey}}" userInput="disabled" stepKey="grabFedExSecretKeyDisabled"/>
+        <assertEquals stepKey="assertFedExSecretKeyDisabled">
+            <actualResult type="const">$grabFedExSecretKeyDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
         <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSandboxMode}}" userInput="disabled" stepKey="grabFedExSandboxDisabled"/>
         <assertEquals stepKey="assertFedExSandboxDisabled">
@@ -59,10 +54,10 @@
 			<actualResult type="const">$grabFedExPackagingDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExDropoff}}" userInput="disabled" stepKey="grabFedExDropoffDisabled"/>
-        <assertEquals stepKey="assertFedExDropoffDisabled">
-			<actualResult type="const">$grabFedExDropoffDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPickupType}}" userInput="disabled" stepKey="grabFedExPickupTypeDisabled"/>
+        <assertEquals stepKey="assertFedExPickupTypeDisabled">
+            <actualResult type="const">$grabFedExPickupTypeDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
         <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExUnitOfMeasure}}" userInput="disabled" stepKey="grabFedExUnitOfMeasureDisabled"/>
         <assertEquals stepKey="assertFedExUnitOfMeasureDisabled">

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

@@ -217,7 +217,6 @@ protected function setUp(): void
             ->getMock();
 
         $this->carrier = $this->getMockBuilder(Carrier::class)
-            ->setMethods(['_createSoapClient'])
             ->setConstructorArgs(
                 [
                     'scopeConfig' => $this->scope,