Skip to content

Commit

Permalink
Merge pull request #8264 from magento-gl/bengals-mainline-deployment
Browse files Browse the repository at this point in the history
ACQE-4889: Bengals mainline deployment
  • Loading branch information
2 parents cfaeeae + cc3d7fc commit 827073a
Show file tree
Hide file tree
Showing 58 changed files with 2,174 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@
<element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
<element name="checkIfTabExpand" type="button" selector="#general_locale-head:not(.open)"/>
<element name="timeZoneDropdown" type="select" selector="//select[@id='general_locale_timezone']"/>
<element name="changeStoreConfigButton" type="button" selector="//button[@id='store-change-button']"/>
<element name="changeStoreConfigToSpecificWebsite" type="select" selector="//a[contains(text(),'{{var}}')]" parameterized="true"/>
<element name="changeWebsiteConfirmButton" type="button" selector="//button[@class='action-primary action-accept']/span"/>
</section>
</sections>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminDeleteCreatedColorSpecificAttributeActionGroup" >
<annotations>
<description>Delete the created new colors in color attribute</description>
</annotations>
<arguments>
<argument name="Color" type="string"/>
</arguments>
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
<fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="Color" stepKey="setAttributeCode"/>
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
<click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
<waitForPageLoad stepKey="waitForPageLoad2"/>
<click selector="{{AdminProductAttributeGridSection.deleteSpecificColorAttribute(Color)}}" stepKey="deleteColor"/>
<waitForPageLoad stepKey="waitForPageLoad3"/>
<click selector="{{AttributePropertiesSection.Save}}" stepKey="saveTheDeletedColor"/>
<see userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<element name="isSearchableColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_searchable')]"/>
<element name="isComparableColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_comparable')]"/>
<element name="addSelected" type="button" selector="//*[contains(text(),'Add Selected')]" timeout="30"/>
<element name="deleteSpecificColorAttribute" type="button" selector="//input[@value='{{var}}']/../..//button[@class='action- scalable delete delete-option']" parameterized="true"/>
</section>
</sections>

Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,9 @@
<element name="newAddedAttributeValue" type="text" selector="//option[contains(@data-title,'{{attributeValue}}')]" parameterized="true"/>
<element name="country_Of_Manufacture" type="select" selector="//td[contains(text(), 'country_of_manufacture')]"/>
<element name="textArea" type="text" selector="//textarea[@name='product[test_custom_attribute]']" timeout="30"/>
<element name="assignedSourcesQty" type="input" selector="//input[@name='sources[assigned_sources][0][quantity]']"/>
<element name="btnAdvancedInventory" type="button" selector="//button//span[text()='Advanced Inventory']/.."/>
<element name="saveCategory" type="button" selector="//button[@data-action='close-advanced-select']" timeout="30"/>
<element name="attributeRequiredInputField" type="select" selector="//select[contains(@name, 'product[{{attributeCode}}]')]" parameterized="true"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,9 @@
<element name="expandPriceLayeredNavigationButton" type="button" selector="//div[@class='filter-options-title'][text()='Price']"/>
<element name="seeLayeredNavigationFirstPriceRange" type="button" selector="//a//span[@class='price' and text()='${{minPrice}}']/..//span[@class='price' and text()='${{maxPrice}}']/..//span[@class='count' and text()=({{count}})]" parameterized="true"/>
<element name="seeLayeredNavigationSecondPriceRange" type="button" selector="//a//span[@class='price' and text()='${{minPrice2}}']/../..//a[text()='{{maxPrice2}}']/..//span[@class='count' and text()=({{count}})]" parameterized="true"/>
<element name="seeLayeredNavigationCategoryTextSwatch" type="text" selector="//div[@class='filter-options-title' and contains(text(),'TextSwatch')]"/>
<element name="seeLayeredNavigationCategoryVisualSwatch" type="text" selector="//div[@class='filter-options-title' and contains(text(),'attribute')]"/>
<element name="seeTextSwatchOption" type="text" selector="//div[@class='swatch-option text ' and contains(text(),'textSwatchOption1')]"/>
<element name="seeVisualSwatchOption" type="text" selector="//div[@class='swatch-option image ']/..//div[@data-option-label='visualSwatchOption2']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
<element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
<element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
<element name="productOptionSelectByColor" type="select" selector=".//option[text()='Choose an Option...']/../../select" />
<element name="asLowAs" type="input" selector="span[class='price-wrapper '] "/>
<element name="asLowAsLabel" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][1]"/>
<element name="asLowAsLabelAgain" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][2]"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<!-- Login as admin -->
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
<!-- remove the Filter From the page-->
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
<actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
<!--Create Category-->
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
Expand Down Expand Up @@ -99,11 +100,11 @@

<!--Click on Go Back button -->
<click selector="{{AdminProductFormActionSection.backButton}}" stepKey="clickBackToGridSimple"/>

<!--Clear filter if available -->
<conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="{{AdminGridFilterControls.clearAll}}" visible="true" stepKey="clearTheFiltersIfPresent"/>
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProductOnProductGridPage">
<argument name="product" value="SimpleProduct"/>
</actionGroup>

<!-- Select created attribute as an column -->
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdown"/>
<actionGroup ref="CheckAdminProductGridColumnOptionActionGroup" stepKey="checkCreatedAttributeColumn">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="StorefrontVerifyCategoryPageNotCachedTest">
<annotations>
<features value="Catalog"/>
<title value="Verify category page is not cached"/>
<stories value="Product Categories Indexer"/>
<description value="Verify that the category page is NOT cached for customers with different tax rates"/>
<severity value="AVERAGE"/>
<group value="Catalog"/>
<group value="indexer"/>
</annotations>
<before>
<!--Login to Admin Panel-->
<actionGroup ref="AdminLoginActionGroup" stepKey="logInAsAdmin"/>
<!-- Create tax rate for CA -->
<createData entity="US_CA_Rate_1" stepKey="createTaxRateCA"/>
<!-- Create tax rate for TX -->
<createData entity="ThirdTaxRateTexas" stepKey="createTaxRateTX"/>
<!-- Create Tax Rules -->
<actionGroup ref="AdminCreateTaxRuleActionGroup" stepKey="createTaxRule1">
<argument name="taxRate" value="$$createTaxRateCA$$"/>
<argument name="taxRule" value="SimpleTaxRule"/>
</actionGroup>
<actionGroup ref="AdminCreateTaxRuleActionGroup" stepKey="createTaxRule2">
<argument name="taxRate" value="$$createTaxRateTX$$"/>
<argument name="taxRule" value="SimpleTaxRule2"/>
</actionGroup>
<!--Create Customers-->
<createData entity="Simple_US_CA_Customer" stepKey="createCustomerCA"/>
<createData entity="Simple_US_Customer" stepKey="createCustomerTX"/>
<!--Create Category-->
<createData entity="_defaultCategory" stepKey="createCategory"/>
<!--Create Products-->
<createData entity="SimpleProduct" stepKey="simpleProduct">
<field key="price">100</field>
<requiredEntity createDataKey="createCategory"/>
</createData>
<createData entity="SimpleProduct" stepKey="simpleProduct2">
<field key="price">200</field>
<requiredEntity createDataKey="createCategory"/>
</createData>
<!--Display product price including and excluding tax in catalog-->
<magentoCLI command="config:set tax/display/type 3" stepKey="enableShowIncludingExcludingTax"/>
</before>
<after>
<magentoCLI command="config:set tax/display/type 0" stepKey="disableShowIncludingExcludingTax"/>
<!--Delete Products-->
<deleteData createDataKey="simpleProduct" stepKey="deleteProductOne"/>
<deleteData createDataKey="simpleProduct2" stepKey="deleteProductTwo"/>
<!--Delete Category-->
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
<!--Delete Tax Rules-->
<actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule1">
<argument name="taxRuleCode" value="{{SimpleTaxRule.code}}"/>
</actionGroup>
<actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule2">
<argument name="taxRuleCode" value="{{SimpleTaxRule2.code}}"/>
</actionGroup>
<!--Delete Tax Rates-->
<deleteData createDataKey="createTaxRateCA" stepKey="deleteTaxRate1"/>
<deleteData createDataKey="createTaxRateTX" stepKey="deleteTaxRate2"/>
<!--Delete Customers-->
<deleteData createDataKey="createCustomerCA" stepKey="deleteCustomer1"/>
<deleteData createDataKey="createCustomerTX" stepKey="deleteCustomer2"/>
<!--Logout Admin-->
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
</after>

<!-- Login as customer 1-->
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomer1Login">
<argument name="Customer" value="$$createCustomerCA$$"/>
</actionGroup>
<!-- Assert Customer Name -->
<actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="assertCustomerName">
<argument name="customerFullName" value="$$createCustomerCA.firstname$$ $$createCustomerCA.lastname$$" />
</actionGroup>
<!-- Navigate to category page -->
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage">
<argument name="category" value="$$createCategory$$"/>
</actionGroup>
<!-- Assert Product Prices -->
<actionGroup ref="StorefrontAssertProductPriceOnCategoryPageActionGroup" stepKey="seeProduct1TaxInclusivePriceCustomer1">
<argument name="productName" value="$$simpleProduct.name$$"/>
<argument name="productPrice" value="$108.25"/>
</actionGroup>
<actionGroup ref="StorefrontAssertProductPriceOnCategoryPageActionGroup" stepKey="seeProduct2TaxInclusivePriceCustomer1">
<argument name="productName" value="$$simpleProduct2.name$$"/>
<argument name="productPrice" value="$216.50"/>
</actionGroup>
<!--Add first product to compare list and cart -->
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openFirstProductPage">
<argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
</actionGroup>
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addFirstProductToCompare">
<argument name="productVar" value="$$simpleProduct$$"/>
</actionGroup>
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addFirstProductToCart"/>
<!--Add second product to compare list -->
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openSecondProductPage">
<argument name="productUrl" value="$$simpleProduct2.custom_attributes[url_key]$$"/>
</actionGroup>
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addSecondProductToCompare">
<argument name="productVar" value="$$simpleProduct2$$"/>
</actionGroup>
<!--Add second product to wishlist -->
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addSecondProductToWishlist">
<argument name="productVar" value="$$simpleProduct2$$"/>
</actionGroup>
<!-- Customer 1 logout -->
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customer1Logout"/>
<!-- Customer 2 login -->
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomer2Login">
<argument name="Customer" value="$$createCustomerTX$$"/>
</actionGroup>
<!-- Assert Wishlist is empty -->
<actionGroup ref="NavigateThroughCustomerTabsActionGroup" stepKey="navigateToWishlist">
<argument name="navigationItemName" value="My Wish List"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCustomerWishlistIsEmptyActionGroup" stepKey="assertNoItemsInWishlist"/>
<!-- Assert minicart is empty -->
<actionGroup ref="AssertMiniCartEmptyActionGroup" stepKey="assertMiniCartIsEmpty"/>
<!-- Navigate to category page -->
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage2">
<argument name="category" value="$$createCategory$$"/>
</actionGroup>
<!-- Assert Compare list is empty -->
<seeElement selector="{{StorefrontComparisonSidebarSection.NoItemsMessage}}" stepKey="assertCompareListIsEmpty"/>
<!-- Assert Product Prices -->
<actionGroup ref="StorefrontAssertProductPriceOnCategoryPageActionGroup" stepKey="seeProduct1TaxInclusivePriceCustomer2">
<argument name="productName" value="$$simpleProduct.name$$"/>
<argument name="productPrice" value="$120"/>
</actionGroup>
<actionGroup ref="StorefrontAssertProductPriceOnCategoryPageActionGroup" stepKey="seeProduct2TaxInclusivePriceCustomer2">
<argument name="productName" value="$$simpleProduct2.name$$"/>
<argument name="productPrice" value="$240"/>
</actionGroup>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@
<element name="maxiQtyAllowedInCartError" type="text" selector="[name='product[stock_data][max_sale_qty]'] + label.admin__field-error"/>
<element name="backorders" type="select" selector="//*[@name='product[stock_data][backorders]']"/>
<element name="useConfigSettingsForBackorders" type="checkbox" selector="//input[@name='product[stock_data][use_config_backorders]']"/>
<element name="checkConfigSettingsAdvancedInventory" type="checkbox" selector="//input[@name='product[stock_data][{{args}}]']/..//label[text()='Use Config Settings']/..//input[@type='checkbox']" parameterized="true"/>
<element name="selectManageStockOption" type="select" selector="//select[@name='product[stock_data][manage_stock]']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
<element name="printLink" type="button" selector=".print" timeout="30"/>
<element name="orderNumberWithoutLink" type="text" selector="//div[contains(@class, 'checkout-success')]//p/span"/>
<element name="orderLinkByOrderNumber" type="text" selector="//div[contains(@class,'success')]//a[contains(.,'{{orderNumber}}')]" parameterized="true" timeout="30"/>
<element name="purchaseOrderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > a span"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
<!--Remove Filter-->
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
<waitForPageLoad stepKey="waitForClearProductsGridFilters"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

<!-- Reindex invalidated indices after product attribute has been created/deleted -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
<element name="mainContent" type="text" selector="#maincontent"/>
<element name="footerTop" type="text" selector="footer.page-footer"/>
<element name="title" type="text" selector="//div[@class='breadcrumbs']//ul/li[@class='item cms_page']"/>
<element name="widgetContentApostrophe" type="text" selector="//div[@class='widget block block-cms-link']//span[contains(text(),'{{var}}')]" parameterized="true"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@
<element name="ChooserName" type="input" selector="input[name='chooser_name']"/>
<element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
<element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{filterName}}']" parameterized="true"/>
<element name="URLKeySelectPage" type="input" selector="//aside[@role='dialog']//input[@name='chooser_identifier']"/>
<element name="SearchButtonSelectPage" type="button" selector="//aside[@role='dialog']//button[@title='Search']"/>
<element name="SearchResultSelectPage" type="text" selector="//aside[@role='dialog']//td[contains(@class,'col-url col-chooser_identifier') and contains(text(),'{{var}}')]" parameterized="true"/>
</section>
</sections>
Loading

0 comments on commit 827073a

Please sign in to comment.