Skip to content

Commit

Permalink
Merge pull request #80 from magento-pangolin/MC-4389
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomreece
tomreece committed Jan 28, 2019
2 parents 5cc0b08 + 0126afd commit ee3bb63
Show file tree
Hide file tree
Showing 15 changed files with 1,604 additions and 6 deletions.
119 changes: 118 additions & 1 deletion app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
<data key="status">1</data>
<data key="quantity">100</data>
<data key="weight">0</data>
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
</entity>
<entity name="productWithDescription" type="product">
Expand Down Expand Up @@ -516,6 +516,7 @@
<data key="price">9,000.00</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="type_id">virtual</data>
Expand All @@ -536,10 +537,54 @@
<data key="price">9,000.00</data>
<data key="quantity">999</data>
<data key="status">Out of Stock</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="storefrontStatus">OUT OF STOCK</data>
<data key="type_id">virtual</data>
</entity>
<entity name="virtualProductAssignToCategory" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">10.00</data>
<data key="quantity">999</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductRegularPriceInStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">120.00</data>
<data key="productTaxClass">None</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="visibility">Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductWithTierPriceInStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">99.99</data>
<data key="productTaxClass">None</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="visibility">Catalog</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductRegularPrice99OutOfStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">99.99</data>
<data key="productTaxClass">Taxable Goods</data>
<data key="status">Out of Stock</data>
<data key="storefrontStatus">OUT OF STOCK</data>
<data key="visibility">Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="defaultSimpleProduct" type="product">
<data key="name" unique="suffix">Testp</data>
<data key="sku" unique="suffix">testsku</data>
Expand Down Expand Up @@ -579,4 +624,76 @@
<data key="filename">magento3</data>
<data key="file_extension">jpg</data>
</entity>
<entity name="updateVirtualProductRegularPrice" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">99.99</data>
<data key="productTaxClass">None</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="visibility">Catalog</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductRegularPrice5OutOfStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">5.00</data>
<data key="productTaxClass">None</data>
<data key="status">Out of Stock</data>
<data key="storefrontStatus">OUT OF STOCK</data>
<data key="visibility">Catalog</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductSpecialPrice" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">120.00</data>
<data key="productTaxClass">Taxable Goods</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="special_price">45.00</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductSpecialPriceOutOfStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">99.99</data>
<data key="productTaxClass">None</data>
<data key="status">Out of Stock</data>
<data key="storefrontStatus">OUT OF STOCK</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="special_price">45.00</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualProductTierPriceInStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">145.00</data>
<data key="productTaxClass">Taxable Goods</data>
<data key="quantity">999</data>
<data key="status">In Stock</data>
<data key="storefrontStatus">IN STOCK</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
<entity name="updateVirtualTierPriceOutOfStock" type="product">
<data key="name" unique="suffix">VirtualProduct</data>
<data key="sku" unique="suffix">virtual_sku</data>
<data key="price">185.00</data>
<data key="productTaxClass">None</data>
<data key="quantity">999</data>
<data key="status">Out of Stock</data>
<data key="storefrontStatus">OUT OF STOCK</data>
<data key="visibility">Catalog, Search</data>
<data key="urlKey" unique="suffix">virtual-product</data>
<data key="type_id">virtual</data>
</entity>
</entities>
2 changes: 2 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<data key="code">second_store_view</data>
</entity>
<entity name="tierPriceOnVirtualProduct" type="data">
<data key="website">All Websites [USD]</data>
<data key="customer_group">ALL GROUPS</data>
<data key="price">90.00</data>
<data key="qty">2</data>
</entity>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" timeout="30"/>
<element name="valueTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='title']//input" />
<element name="valuePrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='price']//input" />
<element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
<element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
<element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
<element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
<element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
<element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
<element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
<element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
</section>
</sections>
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
<element name="keywordSearch" type="input" selector="input#fulltext"/>
<element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
<element name="nthRow" type="block" selector=".data-row:nth-of-type({{var}})" parameterized="true"/>
<element name="nthRow" type="block" selector=".data-row:nth-of-type({{var}})" parameterized="true" timeout="30"/>
<element name="productCount" type="text" selector="#catalog_category_products-total-count"/>
<element name="productPerPage" type="select" selector="#catalog_category_products_page-limit"/>
</section>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
<element name="categoryImage" type="text" selector=".category-image"/>
<element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
<element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
<element name="asLowAs" type="input" selector="//*[@class='price-box price-final_price']/a/span[@class='price-container price-final_price tax weee']"/>
</section>
</sections>
Loading

0 comments on commit ee3bb63

Please sign in to comment.