Skip to content

Commit 4aa8195

Browse files
AnnaAPakAnnaAPak
committed
Merge 2.4-develop
1 parent 3734856 commit 4aa8195

File tree

1 file changed

+0
-81
lines changed

1 file changed

+0
-81
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,11 @@
7777
<expectedResult type="string">50</expectedResult>
7878
<actualResult type="string">$grabbedSecondBundleOptionQuantity</actualResult>
7979
</assertEquals>
80-
<<<<<<< HEAD
81-
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillProductDefaultQty1">
82-
<argument name="optionIndex" value="0"/>
83-
<argument name="productIndex" value="0"/>
84-
<argument name="qty" value="{{BundleProduct.defaultQuantity}}"/>
85-
</actionGroup>
86-
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillProductDefaultQty2">
87-
<argument name="optionIndex" value="0"/>
88-
<argument name="productIndex" value="1"/>
89-
<argument name="qty" value="{{BundleProduct.defaultQuantity}}"/>
90-
</actionGroup>
91-
=======
9280

9381
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductDefaultQty1"/>
9482
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductDefaultQty2"/>
9583

9684
<!--Fill out ancillary data on bundle product-->
97-
>>>>>>> 2.4-develop
9885
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts">
9986
<argument name="bundleProduct" value="BundleProduct"/>
10087
</actionGroup>
@@ -105,17 +92,6 @@
10592

10693
<scrollToTopOfPage stepKey="scroll"/>
10794
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>
108-
<<<<<<< HEAD
109-
<seeElement stepKey="LookingForBundleItemPresence" selector="{{AdminProductFormBundleSection.listedBundleItem}}"/>
110-
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="GoToProductPage">
111-
<argument name="productUrlKey" value="{{BundleProduct.urlKey}}"/>
112-
</actionGroup>
113-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductPageToLoad"/>
114-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="LookingForAbilityToAddOptions"/>
115-
116-
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickButtonToCustomize"/>
117-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitCustomizationDropDown"/>
118-
=======
11995
<seeElement selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="LookingForBundleItemPresence"/>
12096

12197
<!--Checking on customer side-->
@@ -126,44 +102,14 @@
126102
<seeElement selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="LookingForAbilityToAddOptions"/>
127103
<click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonToCustomize"/>
128104
<waitForPageLoad stepKey="waitCustomizationDropDown"/>
129-
>>>>>>> 2.4-develop
130105
<seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption}}" stepKey="seeBundleItem"/>
131106

132107
<actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
133-
<<<<<<< HEAD
134-
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
135-
=======
136108
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
137-
>>>>>>> 2.4-develop
138109
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="WaitForClear"/>
139110
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
140111
<argument name="product" value="BundleProduct"/>
141112
</actionGroup>
142-
<<<<<<< HEAD
143-
<actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="clickOnBundleProductToEdit"/>
144-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItemsToEdit"/>
145-
<actionGroup ref="AdminClickAddOptionOnBundleProductEditPageActionGroup" stepKey="clickAddOption"/>
146-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleOptionsToAppear"/>
147-
<actionGroup ref="AdminFillBundleOptionTitleActionGroup" stepKey="fillNewestOptionTitle">
148-
<argument name="optionTitle" value="{{BundleProduct.optionTitle1}}_new"/>
149-
<argument name="index" value="1"/>
150-
</actionGroup>
151-
<actionGroup ref="AdminFillBundleOptionTypeActionGroup" stepKey="selectNewInputType">
152-
<argument name="optionIndex" value="1"/>
153-
</actionGroup>
154-
<actionGroup ref="AdminClickAddProductToOptionByOptionIndexActionGroup" stepKey="clickAddProductsToNewOption">
155-
<argument name="optionIndex" value="2"/>
156-
</actionGroup>
157-
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions">
158-
<argument name="product" value="$$simpleProduct2$$"/>
159-
</actionGroup>
160-
<actionGroup ref="AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup" stepKey="selectNewFirstGridRow"/>
161-
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions2">
162-
<argument name="product" value="$$simpleProduct3$$"/>
163-
</actionGroup>
164-
<actionGroup ref="AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup" stepKey="selectNewFirstGridRow2"/>
165-
<actionGroup ref="AdminClickAddSelectedProductsOnAddProductsToOptionPanelActionGroup" stepKey="clickAddNewSelectedBundleProducts"/>
166-
=======
167113
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOnBundleProductToEdit">
168114
<argument name="product" value="BundleProduct"/>
169115
</actionGroup>
@@ -187,7 +133,6 @@
187133
</actionGroup>
188134

189135
<!-- Check that existing Bundle Options do not loose user input quantity values -->
190-
>>>>>>> 2.4-develop
191136
<grabValueFrom selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" stepKey="grabbedFirstBundleOptionQuantityAfterUserInput"/>
192137
<assertEquals stepKey="assertFirstBundleOptionDefaultQuantityAfterUserInput">
193138
<expectedResult type="string">50</expectedResult>
@@ -198,31 +143,6 @@
198143
<expectedResult type="string">50</expectedResult>
199144
<actualResult type="string">$grabbedSecondBundleOptionQuantityAfterUserInput</actualResult>
200145
</assertEquals>
201-
<<<<<<< HEAD
202-
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillNewProductDefaultQty1">
203-
<argument name="optionIndex" value="1"/>
204-
<argument name="productIndex" value="0"/>
205-
<argument name="qty" value="{{BundleProduct.defaultQuantity}}"/>
206-
</actionGroup>
207-
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillNewProductDefaultQty2">
208-
<argument name="optionIndex" value="1"/>
209-
<argument name="productIndex" value="1"/>
210-
<argument name="qty" value="{{BundleProduct.defaultQuantity}}"/>
211-
</actionGroup>
212-
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
213-
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
214-
<scrollToTopOfPage stepKey="scrollAgain"/>
215-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenNewSectionBundleItems2"/>
216-
<see userInput="$$simpleProduct2.sku$$" selector="{{AdminProductFormBundleSection.bundleItem}}" stepKey="LookingForNewBundleItemPresence"/>
217-
218-
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="GoToProductPageAgain">
219-
<argument name="productUrlKey" value="{{BundleProduct.urlKey}}"/>
220-
</actionGroup>
221-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductPageToLoadAgain"/>
222-
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="LookingForAbilityToAddBothOptions"/>
223-
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickButtonAgainToCustomize"/>
224-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBothCustomizationDropDown"/>
225-
=======
226146
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillNewProductDefaultQty1"/>
227147
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillNewProductDefaultQty2"/>
228148
<!--Save the product-->
@@ -244,7 +164,6 @@
244164
<seeElement selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="LookingForAbilityToAddBothOptions"/>
245165
<click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonAgainToCustomize"/>
246166
<waitForPageLoad stepKey="waitForBothCustomizationDropDown"/>
247-
>>>>>>> 2.4-develop
248167
<seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption2}}" stepKey="seeBundleItems"/>
249168
</test>
250169
</tests>

0 commit comments

Comments
 (0)