Skip to content

Commit 819a3a3

Browse files
ClendeninClendenin
committed
MC-223: Admin should be able to add/edit bundle items when creating/editing a bundle product
1 parent acb24d3 commit 819a3a3

File tree

3 files changed

+60
-2
lines changed

3 files changed

+60
-2
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<element name="shortDescription" type="input" selector="#product_form_short_description"/>
4141
<!--BundleOptinsDropDown-->
4242
<element name="bundleOptionsDropDown" type="button" selector="div[data-index='bundle-items']" timeout="30"/>
43+
<!--AddingAnOption-->
44+
<element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
4345
<!--SEODropdownTab-->
4446
<element name="seoDropdown" type="button" selector="//div[@data-index='search-engine-optimization']"/>
4547
<element name="seoDependent" type="button" selector="//div[@data-index='search-engine-optimization']//div[contains(@class, '_show')]"/>
@@ -55,5 +57,8 @@
5557
<element name="dynamicPrice" type="button" selector="//div[@data-index='price_type']//div[@data-role='switcher']" timeout="30"/>
5658
<element name="priceField" type="input" selector="//div[@data-index='price']//input"/>
5759
<element name="listedBundleItem" type="text" selector="//tr[@data-repeat-index='0']//div"/>
60+
<element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
61+
<!--FirstProductOption-->
62+
<element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
5863
</section>
5964
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/StorefrontBundledSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<element name="fixedPricing" type="text" selector="//div[@class='price-box price-final_price']//span[@id]//..//span[contains(text(),'{{var1}}')]" parameterized="true"/>
1818
<element name="customizeProduct" type="button" selector="//*[@id='bundle-slide']"/>
1919
<element name="customizableBundleItemOption" type="text" selector="//div[@class='field choice'][1]//input[@type='checkbox']"/>
20+
<element name="customizableBundleItemOption2" type="text" selector="//div[@class='field choice'][2]//input[@type='checkbox']"/>
2021
</section>
2122
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@
2121
<before>
2222
<!--Creating data-->
2323
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
24+
<createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
2425
<createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
2526
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
27+
<createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
2628
<!--Admin login-->
2729
<actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
2830
</before>
2931
<after>
3032
<!--Deleting data-->
3133
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
34+
<deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
3235
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3336
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
37+
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
3438
<!--Logging out-->
3539
<actionGroup ref="logout" stepKey="logout"/>
3640
</after>
@@ -48,11 +52,11 @@
4852
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
4953
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
5054
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
51-
<argument name="product" value="$$simpleProduct1$$"/>
55+
<argument name="product" value="$$simpleProduct0$$"/>
5256
</actionGroup>
5357
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
5458
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
55-
<argument name="product" value="$$simpleProduct2$$"/>
59+
<argument name="product" value="$$simpleProduct1$$"/>
5660
</actionGroup>
5761
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
5862
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
@@ -80,5 +84,53 @@
8084
<click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonToCustomize"/>
8185
<waitForPageLoad stepKey="waitCustomizationDropDown"/>
8286
<seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption}}" stepKey="seeBundleItem"/>
87+
88+
<!--Add another bundle option with 2 items-->
89+
<!--Go to bundle product creation page-->
90+
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
91+
<waitForPageLoad stepKey="WaitForPageToLoad"/>
92+
<conditionalClick selector="{{AdminProductCatalog.filtersClear}}" dependentSelector="{{AdminProductCatalog.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
93+
<waitForPageLoad stepKey="WaitForClear"/>
94+
<actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
95+
<argument name="product" value="BundleProduct"/>
96+
</actionGroup>
97+
<click selector="{{AdminProductFormBundleSection.addOptions}}" stepKey="clickOnBundleProductToEdit"/>
98+
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItemsToEdit"/>
99+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
100+
<pauseExecution stepKey="pause"/>
101+
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" stepKey="waitForBundleOptionsToAppear"/>
102+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillNewestOptionTitle"/>
103+
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('1')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectNewInputType"/>
104+
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToNewBundle"/>
105+
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToNewOption"/>
106+
<waitForPageLoad stepKey="waitForPageLoadAfterNewBundleProducts"/>
107+
<actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions">
108+
<argument name="product" value="$$simpleProduct2$$"/>
109+
</actionGroup>
110+
<checkOption selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']" stepKey="selectNewFirstGridRow"/>
111+
<actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions2">
112+
<argument name="product" value="$$simpleProduct3$$"/>
113+
</actionGroup>
114+
<checkOption selector="{{AdminProductFormBundleSection.firstProductOption}}" stepKey="selectNewFirstGridRow2"/>
115+
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddNewSelectedBundleProducts"/>
116+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '2')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty1"/>
117+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
118+
119+
<!--Save the product-->
120+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
121+
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
122+
123+
<!--Checking on admin side-->
124+
<scrollToTopOfPage stepKey="scrollAgain"/>
125+
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenNewSectionBundleItems2"/>
126+
<seeElement selector="{{AdminProductFormBundleSection.listedBundleItem2}}" stepKey="LookingForNewBundleItemPresence"/>
127+
128+
<!--Checking on customer side-->
129+
<amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
130+
<waitForPageLoad stepKey="waitForBundleProductPageToLoadAgain"/>
131+
<seeElement selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="LookingForAbilityToAddBothOptions"/>
132+
<click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonAgainToCustomize"/>
133+
<waitForPageLoad stepKey="waitForBothCustomizationDropDown"/>
134+
<seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption2}}" stepKey="seeBundleItems"/>
83135
</test>
84136
</tests>

0 commit comments

Comments
 (0)