Skip to content

Commit

Permalink
Merge pull request magento#4866 from magento-arcticfoxes/2.3-develop-pr
Browse files Browse the repository at this point in the history 
[arcticfoxes] Bugs and Stories
  • Loading branch information
@joanhe
joanhe authored Oct 12, 2019
2 parents e023220 + c26791c commit c60cf10
Show file tree
Hide file tree
Showing 105 changed files with 2,635 additions and 68 deletions.
14 changes: 14 additions & 0 deletions app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,20 @@
<requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
<requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
</entity>
<entity name="ApiBundleProductUnderscoredSku" type="product2">
<data key="name" unique="suffix">Api Bundle Product</data>
<data key="sku" unique="suffix">api_bundle_product</data>
<data key="type_id">bundle</data>
<data key="attribute_set_id">4</data>
<data key="visibility">4</data>
<data key="status">1</data>
<data key="urlKey" unique="suffix">api-bundle-product</data>
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
<requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
<requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
<requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
<requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
</entity>
<entity name="ApiBundleProductPriceViewRange" type="product2">
<data key="name" unique="suffix">Api Bundle Product</data>
<data key="sku" unique="suffix">api-bundle-product</data>
Expand Down
175 changes: 174 additions & 1 deletion app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,47 @@
<severity value="MAJOR"/>
<testCaseId value="MC-139"/>
<group value="Bundle"/>
<group value="SearchEngineElasticsearch"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple1"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple2"/>
</createData>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</before>
<after>
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
</after>
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
</test>
<test name="AdvanceCatalogSearchBundleByNameMysqlTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
<annotations>
<features value="Bundle"/>
<stories value="Advanced Catalog Product Search for all product types"/>
<title value="Guest customer should be able to advance search Bundle product with product name using the MySQL search engine"/>
<description value="Guest customer should be able to advance search Bundle product with product name using the MySQL search engine"/>
<severity value="MAJOR"/>
<testCaseId value="MC-20472"/>
<group value="Bundle"/>
<group value="SearchEngineMysql"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
Expand Down Expand Up @@ -56,7 +97,7 @@
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="ApiBundleProductUnderscoredSku" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
Expand Down Expand Up @@ -87,6 +128,47 @@
<severity value="MAJOR"/>
<testCaseId value="MC-242"/>
<group value="Bundle"/>
<group value="SearchEngineElasticsearch"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple1"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple2"/>
</createData>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</before>
<after>
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
</after>
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
</test>
<test name="AdvanceCatalogSearchBundleByDescriptionMysqlTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
<annotations>
<features value="Bundle"/>
<stories value="Advanced Catalog Product Search for all product types"/>
<title value="Guest customer should be able to advance search Bundle product with product description using the MySQL search engine"/>
<description value="Guest customer should be able to advance search Bundle product with product description using the MySQL search engine"/>
<severity value="MAJOR"/>
<testCaseId value="MC-20473"/>
<group value="Bundle"/>
<group value="SearchEngineMysql"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
Expand Down Expand Up @@ -122,6 +204,47 @@
<severity value="MAJOR"/>
<testCaseId value="MC-250"/>
<group value="Bundle"/>
<group value="SearchEngineElasticsearch"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple1"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple2"/>
</createData>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</before>
<after>
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
</after>
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
</test>
<test name="AdvanceCatalogSearchBundleByShortDescriptionMysqlTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
<annotations>
<features value="Bundle"/>
<stories value="Advanced Catalog Product Search for all product types"/>
<title value="Guest customer should be able to advance search Bundle product with product short description using the MySQL search engine"/>
<description value="Guest customer should be able to advance search Bundle product with product short description using the MySQL search engine"/>
<severity value="MAJOR"/>
<testCaseId value="MC-20474"/>
<group value="Bundle"/>
<group value="SearchEngineMysql"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
Expand Down Expand Up @@ -157,6 +280,56 @@
<severity value="MAJOR"/>
<testCaseId value="MC-251"/>
<group value="Bundle"/>
<group value="SearchEngineElasticsearch"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple1"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple2"/>
</createData>
<getData entity="GetProduct" stepKey="arg1">
<requiredEntity createDataKey="product"/>
</getData>
<getData entity="GetProduct" stepKey="arg2">
<requiredEntity createDataKey="simple1"/>
</getData>
<getData entity="GetProduct" stepKey="arg3">
<requiredEntity createDataKey="simple2"/>
</getData>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</before>
<after>
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
</after>
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
</test>
<test name="AdvanceCatalogSearchBundleByPriceMysqlTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
<annotations>
<features value="Bundle"/>
<stories value="Advanced Catalog Product Search for all product types"/>
<title value="Guest customer should be able to advance search Bundle product with product price using the MySQL search engine"/>
<description value="Guest customer should be able to advance search Bundle product with product price the MySQL search engine"/>
<severity value="MAJOR"/>
<testCaseId value="MC-20475"/>
<group value="Bundle"/>
<group value="SearchEngineMysql"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
Expand Down
47 changes: 47 additions & 0 deletions ...Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?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="StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
<annotations>
<features value="Bundle"/>
<stories value="Advanced Catalog Product Search for all product types "/>
<title value="Guest customer should be able to advance search Bundle product with product sku that contains hyphen"/>
<description value="Guest customer should be able to advance search Bundle product with product sku that contains hyphen"/>
<severity value="MAJOR"/>
<testCaseId value="MC-20359"/>
<group value="Bundle"/>
<group value="SearchEngineMysql"/>
</annotations>
<before>
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
<createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
<createData entity="ApiBundleProduct" stepKey="product"/>
<createData entity="DropDownBundleOption" stepKey="bundleOption">
<requiredEntity createDataKey="product"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple1"/>
</createData>
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
<requiredEntity createDataKey="product"/>
<requiredEntity createDataKey="bundleOption"/>
<requiredEntity createDataKey="simple2"/>
</createData>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</before>
<after>
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
</after>
</test>
</tests>
16 changes: 16 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,20 @@
<data key="attribute_code">is_anchor</data>
<data key="value">0</data>
</entity>
<entity name="ProductDescriptionAdvancedSearchABC" type="custom_attribute">
<data key="attribute_code">description</data>
<data key="value">&lt;p&gt;adc_Full&lt;/p&gt;</data>
</entity>
<entity name="ProductShortDescriptionAdvancedSearch" type="custom_attribute">
<data key="attribute_code">short_description</data>
<data key="value">&lt;p&gt;abc_short&lt;/p&gt;</data>
</entity>
<entity name="ProductDescriptionAdvancedSearchADC123" type="custom_attribute">
<data key="attribute_code">description</data>
<data key="value">&lt;p&gt;dfj_full&lt;/p&gt;</data>
</entity>
<entity name="ProductShortDescriptionAdvancedSearchADC123" type="custom_attribute">
<data key="attribute_code">short_description</data>
<data key="value">&lt;p&gt;dfj_short&lt;/p&gt;</data>
</entity>
</entities>
Loading

0 comments on commit c60cf10

Please sign in to comment.