B2B-2606: Graphql Parser called at least 3 times per request

 - Fixing issue where mftf edit terms & conditions tests don't cleanup data if test fails prematurely

Author: dhaecker

app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/AdminTermsConditionsFillTermEditFormActionGroup.xml

@@ -11,9 +11,10 @@
     <actionGroup name="AdminTermsConditionsFillTermEditFormActionGroup">
         <arguments>
             <argument name="term"/>
+            <argument name="termName" type="string"/>
         </arguments>
 
-        <fillField selector="{{AdminNewTermFormSection.conditionName}}" userInput="{{term.name}}" stepKey="fillFieldConditionName"/>
+        <fillField selector="{{AdminNewTermFormSection.conditionName}}" userInput="{{termName}}" stepKey="fillFieldConditionName"/>
         <selectOption selector="{{AdminNewTermFormSection.isActive}}" userInput="{{term.isActive}}" stepKey="selectOptionIsActive"/>
         <selectOption selector="{{AdminNewTermFormSection.isHtml}}" userInput="{{term.isHtml}}" stepKey="selectOptionIsHtml"/>
         <selectOption selector="{{AdminNewTermFormSection.mode}}" userInput="{{term.mode}}" stepKey="selectOptionMode"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveHtmlTermEntityTest.xml

@@ -44,6 +44,7 @@
         <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="activeHtmlTerm"/>
+            <argument name="termName" value="{{activeHtmlTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
 

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveTextTermEntityTest.xml

@@ -27,6 +27,7 @@
 
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="activeTextTerm"/>
+            <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AssertAdminTermsConditionsInGridActionGroup" stepKey="assertTermInGrid">
             <argument name="termName" value="{{activeTextTerm.name}}"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateDisabledTextTermEntityTest.xml

@@ -43,6 +43,7 @@
         <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="disabledTextTerm"/>
+            <argument name="termName" value="{{disabledTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
 

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateEnabledTextTermOnMultishippingEntityTest.xml

@@ -52,6 +52,7 @@
         <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="activeTextTerm"/>
+            <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
 

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminDeleteActiveTextTermEntityTest.xml

@@ -28,6 +28,7 @@
             <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
             <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="createTerm">
                 <argument name="term" value="activeTextTerm"/>
+                <argument name="termName" value="{{activeTextTerm.name}}"/>
             </actionGroup>
             <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
         </before>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminUpdateDisabledHtmlTermEntityTest.xml

@@ -33,7 +33,7 @@
 
             <actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
             <actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
-                <argument name="termName" value="{{activeTextTerm.name}}"/>
+                <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
             </actionGroup>
             <actionGroup ref="AdminTermsConditionsDeleteTermByNameActionGroup" stepKey="deleteOpenedTerm"/>
 
@@ -43,6 +43,7 @@
         <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="disabledHtmlTerm"/>
+            <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
 
@@ -52,12 +53,13 @@
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillUpdateTerm">
             <argument name="term" value="activeTextTerm"/>
+            <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveUpdateTerm"/>
 
         <actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openNewTermsGrid"/>
         <actionGroup ref="AssertAdminTermsConditionsInGridActionGroup" stepKey="assertTermInGrid">
-            <argument name="termName" value="{{activeTextTerm.name}}"/>
+            <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
         </actionGroup>
 
         <openNewTab stepKey="openStorefrontTab"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminUpdateDisabledTextTermEntityTest.xml

@@ -22,21 +22,23 @@
 
         <after>
             <actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
-                <argument name="termName" value="{{activeHtmlTerm.name}}"/>
+                <argument name="termName" value="{{disabledTextTerm.name}}"/>
             </actionGroup>
         </after>
 
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="disabledTextTerm"/>
+            <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsEditTermByNameActionGroup" stepKey="openUpdateTerm">
             <argument name="termName" value="{{disabledTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillUpdateTerm">
             <argument name="term" value="activeHtmlTerm"/>
+            <argument name="termName" value="{{disabledTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AssertAdminTermsConditionsInGridActionGroup" stepKey="assertTermInGrid">
-            <argument name="termName" value="{{activeHtmlTerm.name}}"/>
+            <argument name="termName" value="{{disabledTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AssertStorefrontTermInCheckoutActionGroup" stepKey="assertTermInCheckout">
             <argument name="termCheckboxText" value="{{activeHtmlTerm.checkboxText}}"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminUpdateEnabledTextTermEntityTest.xml

@@ -22,21 +22,23 @@
         </annotations>
         <after>
             <actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
-                <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
+                <argument name="termName" value="{{activeTextTerm.name}}"/>
             </actionGroup>
         </after>
 
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
             <argument name="term" value="activeTextTerm"/>
+            <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsEditTermByNameActionGroup" stepKey="openUpdateTerm">
             <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillUpdateTerm">
             <argument name="term" value="disabledHtmlTerm"/>
+            <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AssertAdminTermsConditionsInGridActionGroup" stepKey="assertTermInGrid">
-            <argument name="termName" value="{{disabledHtmlTerm.name}}"/>
+            <argument name="termName" value="{{activeTextTerm.name}}"/>
         </actionGroup>
         <actionGroup ref="AssertStorefrontTermAbsentInCheckoutActionGroup" stepKey="assertTermInCheckout">
             <argument name="termCheckboxText" value="{{disabledHtmlTerm.checkboxText}}"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StoreFrontManualTermsAndConditionsTest.xml

@@ -38,6 +38,7 @@
             <!-- Fill the Required Details-->
             <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
                 <argument name="term" value="newHtmlTerm"/>
+                <argument name="termName" value="{{newHtmlTerm.name}}"/>
             </actionGroup>
             <grabTextFrom selector="{{AdminNewTermFormSection.conditionName}}" stepKey="conditionName"/>
             <!-- Save Details-->