Merge pull request magento#2763 from magento-pangolin/RE-develop-pr

[pangolin] Weekly RE-develop functional tests

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SecondaryGridActionGroup.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+ <!-- Action group to delete an item given that items name -->
+ <!-- Must already be on the admin page containing the grid -->
+ <actionGroup name="deleteEntitySecondaryGrid">
+ <arguments>
+ <argument name="name" type="string"/>
+ <argument name="searchInput" type="string"/>
+ </arguments>
+
+ <!-- search for the name -->
+ <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
+ <fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
+ <click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>
+ <click stepKey="clickResult" selector="{{AdminSecondaryGridSection.firstRow}}"/>
+ <waitForPageLoad stepKey="waitForTaxRateLoad"/>
+
+ <!-- delete the rule -->
+ <click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
+ <click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
+ <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="deleted"/>
+ </actionGroup>
+</actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminSecondaryGridSection.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+ <section name="AdminSecondaryGridSection">
+ <element name="resetFilters" type="button" selector="[title='Reset Filter']"/>
+ <element name="taxIdentifierSearch" type="input" selector=".col-code .admin__control-text"/>
+ <element name="searchButton" type="input" selector=".admin__filter-actions [title='Search']"/>
+ <element name="firstRow" type="block" selector="tr[data-role='row']"/>
+ </section>
+</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml

@@ -11,6 +11,6 @@
  <actionGroup name="AdminClearFiltersActionGroup">
  <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
  <waitForPageLoad stepKey="WaitForPageToLoad"/>
- <conditionalClick selector="{{AdminProductCatalog.clearFilters}}" dependentSelector="{{AdminProductCatalog.clearFilters}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+ <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
  </actionGroup>
 </actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml

@@ -10,11 +10,10 @@
  xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
  <actionGroup name="BundleProductFilter">
  <!--Setting filter-->
- <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPage"/>
- <waitForPageLoad stepKey="WaitForPageToLoadFully"/>
- <click selector="{{AdminProductCatalog.clickOnFilter}}" stepKey="ClickOnFilter"/>
- <click selector="{{AdminProductCatalog.clickOnTypeDropDown}}" stepKey="ClickOnTypeDropDown"/>
- <click selector="{{AdminProductCatalog.clickOnBundleOption}}" stepKey="ClickOnBundleOption"/>
- <click selector="{{AdminProductCatalog.clickOnApplyFilters}}" stepKey="ClickOnApplyFilters"/>
+ <!--Prereq: go to admin product catalog page-->
+ <click selector="{{AdminProductFiltersSection.filter}}" stepKey="ClickOnFilter"/>
+ <click selector="{{AdminProductFiltersSection.typeDropDown}}" stepKey="ClickOnTypeDropDown"/>
+ <click selector="{{AdminProductFiltersSection.bundleOption}}" stepKey="ClickOnBundleOption"/>
+ <click selector="{{AdminProductFiltersSection.applyFilters}}" stepKey="ClickOnApplyFilters"/>
  </actionGroup>
 </actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/CreateBundleProductActionGroup.xml

@@ -9,6 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
  <actionGroup name="CreateBasicBundleProduct">
+ <!--Prereq: Go to bundle product creation page-->
  <!--Product name and SKU-->
  <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
  <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml

@@ -9,6 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
  <actionGroup name="AncillaryPrepBundleProduct">
+ <!--Prereq: go to bundle product creation page-->
  <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
  <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
 
@@ -20,11 +21,6 @@
  <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
  </actionGroup>
 
- <!--Enable/Disable Product Toggle-->
- <actionGroup name="EnableDisableProduct">
- <click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
- </actionGroup>
-
  <!--Edit existing product by searching in product catalog-->
  <actionGroup name="FindProductToEdit">
  <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml

@@ -26,6 +26,9 @@
  <data key="default_quantity2">20</data>
  <data key="set">4</data>
  <data key="type">bundle</data>
+ <data key="fixedPrice">10</data>
+ <data key="fixedPriceFormatted">$10.00</data>
+ <data key="defaultAttribute">Default</data>
  </entity>
  <entity name="ApiBundleProduct" type="product2">
  <data key="name" unique="suffix">Api Bundle Product</data>

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

@@ -38,6 +38,10 @@
  <element name="contentDropDownIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
  <element name="longDescription" type="input" selector="#product_form_description"/>
  <element name="shortDescription" type="input" selector="#product_form_short_description"/>
+ <!--BundleOptinsDropDown-->
+ <element name="bundleOptionsDropDown" type="button" selector="div[data-index='bundle-items']" timeout="30"/>
+ <!--AddingAnOption-->
+ <element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
  <!--SEODropdownTab-->
  <element name="seoDropdown" type="button" selector="//div[@data-index='search-engine-optimization']"/>
  <element name="seoDependent" type="button" selector="//div[@data-index='search-engine-optimization']//div[contains(@class, '_show')]"/>
@@ -50,5 +54,11 @@
  <!--ClickOnFirstProductInCatalog-->
  <element name="firstCatalogProduct" type="button" selector="//table[@class='data-grid data-grid-draggable']/tbody/tr[@class='data-row']/td[4]"/>
  <element name="bundledItems" type="block" selector="[data-index=bundle-items]"/>
+ <element name="dynamicPrice" type="button" selector="//div[@data-index='price_type']//div[@data-role='switcher']" timeout="30"/>
+ <element name="priceField" type="input" selector="//div[@data-index='price']//input"/>
+ <element name="listedBundleItem" type="text" selector="//tr[@data-repeat-index='0']//div"/>
+ <element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
+ <!--FirstProductOption-->
+ <element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
  </section>
 </sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/BundleStorefrontSection.xml

@@ -18,5 +18,7 @@
  <element name="shortDescriptionText" type="text" selector="//div[@class='product attribute overview']" timeout="30"/>
  <!--NameOfProductOnProductPage-->
  <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
+ <!--PageNotFoundErrorMessage-->
+ <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
  </section>
 </sections>

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

@@ -14,5 +14,9 @@
  <element name="addToCartConfigured" type="button" selector="#product-addtocart-button" timeout="30"/>
  <element name="updateCart" type="button" selector="#product-updatecart-button" timeout="30"/>
  <element name="configuredPrice" type="block" selector=".price-configured_price .price"/>
+ <element name="fixedPricing" type="text" selector="//div[@class='price-box price-final_price']//span[@id]//..//span[contains(text(),'{{var1}}')]" parameterized="true"/>
+ <element name="customizeProduct" type="button" selector="//*[@id='bundle-slide']"/>
+ <element name="customizableBundleItemOption" type="text" selector="//div[@class='field choice'][1]//input[@type='checkbox']"/>
+ <element name="customizableBundleItemOption2" type="text" selector="//div[@class='field choice'][2]//input[@type='checkbox']"/>
  </section>
 </sections>