Skip to content

Commit 1827c4e

Browse files
author
Dmytro Aponasenko
committed
MTA-1602: Sync qmt repository with mainline - Sprint 6
1 parent 413d494 commit 1827c4e

File tree

8 files changed

+35
-25
lines changed

8 files changed

+35
-25
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class CreateProductAttributeEntityFromProductPageTest extends Scenario
5454
*/
5555
public function __prepare(FixtureFactory $fixtureFactory)
5656
{
57+
$this->markTestIncomplete('Bug: MTA-1616');
5758
$product = $fixtureFactory->createByCode(
5859
'catalogProductSimple',
5960
['dataSet' => 'product_with_category_with_anchor']
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
"description";"product/data/url_key";"product/data/configurable_attributes_data/preset";"product/data/checkout_data/preset";"product/data/name";"product/data/sku";"product/data/tax_class_id";"product/data/price/value";"product/data/special_price";"product/data/category_ids/new_category";"product/data/category_ids/presets";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/is_in_stock";"product/data/affected_attribute_set";"constraint";""
2-
"Create product with category and two new options";"configurable-product-%isolation%";"two_new_options";"two_new_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately";""
3-
"Create product with two options";"configurable-product-%isolation%";"two_options";"two_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";""
4-
"Create product with special price";"configurable-product-%isolation%";"two_new_options";"two_new_options_with_special_price";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"10";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertProductSpecialPriceOnProductPage";""
5-
"Create product with assigned products to options";"configurable-product-%isolation%";"two_options_with_assigned_product";"two_options_with_assigned_product";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";""
6-
"MAGETWO-12620: Create Configurable Product and Assign it to Category";"configurable-product-%isolation%";"two_options_with_fixed_price";"-";"Configurable Product %isolation%";"configurable_sku_%isolation%";"Taxable Goods";"10";"-";"-";"default_subcategory";"-";"-";"1";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertConfigurableProductPage";""
7-
"MAGETWO-13361: Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)";"-";"two_searchable_options";"-";"Configurable Product %isolation%";"-";"-";"100";"-";"no";"default_subcategory";"-";"-";"-";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage";"test_type:acceptance_test"
1+
"description";"product/data/url_key";"product/data/configurable_attributes_data/preset";"product/data/checkout_data/preset";"product/data/name";"product/data/sku";"product/data/tax_class_id";"product/data/price/value";"product/data/special_price";"product/data/category_ids/new_category";"product/data/category_ids/presets";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/is_in_stock";"product/data/affected_attribute_set";"constraint";"tag";"issue"
2+
"Create product with category and two new options";"configurable-product-%isolation%";"two_new_options";"two_new_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately";"Bug: MTA-1616"
3+
"Create product with two options";"configurable-product-%isolation%";"two_options";"two_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";"";""
4+
"Create product with special price";"configurable-product-%isolation%";"two_new_options";"two_new_options_with_special_price";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"10";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertProductSpecialPriceOnProductPage";"";"Bug: MTA-1616"
5+
"Create product with assigned products to options";"configurable-product-%isolation%";"two_options_with_assigned_product";"two_options_with_assigned_product";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";"";""
6+
"MAGETWO-12620: Create Configurable Product and Assign it to Category";"configurable-product-%isolation%";"two_options_with_fixed_price";"-";"Configurable Product %isolation%";"configurable_sku_%isolation%";"Taxable Goods";"10";"-";"-";"default_subcategory";"-";"-";"1";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertConfigurableProductPage";"";""
7+
"MAGETWO-13361: Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)";"-";"two_searchable_options";"-";"Configurable Product %isolation%";"-";"-";"100";"-";"no";"default_subcategory";"-";"-";"-";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage";"test_type:acceptance_test";""
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"description";"attributeTypeAction";"product";"updatedProduct/data/url_key";"updatedProduct/data/configurable_attributes_data/preset";"updatedProduct/data/checkout_data/preset";"updatedProduct/data/checkout_data/cartItem/price";"updatedProduct/data/name";"updatedProduct/data/sku";"updatedProduct/data/price/value";"updatedProduct/data/category_ids/presets";"updatedProduct/data/short_description";"updatedProduct/data/description";"updatedProduct/data/weight";"updatedProduct/data/quantity_and_stock_status/is_in_stock";"updatedProduct/data/affected_attribute_set";"constraint"
2-
"Add new option to existed Attribute";"addOptions";"configurableProduct::default";"configurable-product-%isolation%";"one_new_options";"two_attributes";"153";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately"
3-
"Add new variations";"";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options";"three_attributes";"154";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart"
4-
"Delete one attribute and add another";"deleteLast";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options";"two_attributes";"112";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertProductInCategory, assertProductInStock, assertConfigurableProductInCart, assertConfigurableAttributesAbsentOnProductPage"
5-
"Delete attribute and add another with products qty = 0";"deleteAll";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options_with_zero_products";"two_attributes";"";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableAttributesBlockIsAbsentOnProductPage, assertProductOutOfStock"
6-
"MAGETWO-12840: Edit Configurable Product";"addOptions";"configurableProduct::two_options_with_fixed_price";"configurable-product-%isolation%";"one_new_options";"-";"-";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertConfigurableProductPage"
1+
"description";"attributeTypeAction";"product";"updatedProduct/data/url_key";"updatedProduct/data/configurable_attributes_data/preset";"updatedProduct/data/checkout_data/preset";"updatedProduct/data/checkout_data/cartItem/price";"updatedProduct/data/name";"updatedProduct/data/sku";"updatedProduct/data/price/value";"updatedProduct/data/category_ids/presets";"updatedProduct/data/short_description";"updatedProduct/data/description";"updatedProduct/data/weight";"updatedProduct/data/quantity_and_stock_status/is_in_stock";"updatedProduct/data/affected_attribute_set";"constraint";"issue"
2+
"Add new option to existed Attribute";"addOptions";"configurableProduct::default";"configurable-product-%isolation%";"one_new_options";"two_attributes";"153";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately";""
3+
"Add new variations";"";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options";"three_attributes";"154";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";"Bug: MTA-1616"
4+
"Delete one attribute and add another";"deleteLast";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options";"two_attributes";"112";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertProductInCategory, assertProductInStock, assertConfigurableProductInCart, assertConfigurableAttributesAbsentOnProductPage";"Bug: MTA-1616"
5+
"Delete attribute and add another with products qty = 0";"deleteAll";"configurableProduct::default";"configurable-product-%isolation%";"two_new_options_with_zero_products";"two_attributes";"";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableAttributesBlockIsAbsentOnProductPage, assertProductOutOfStock";""
6+
"MAGETWO-12840: Edit Configurable Product";"addOptions";"configurableProduct::two_options_with_fixed_price";"configurable-product-%isolation%";"one_new_options";"-";"-";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertConfigurableProductPage";""

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductVirtual::default,catalogProductVirtual::product_50_dollar";"defaultVirtualProduct";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertGroupedProductForm"
44
"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::default";"defaultSimpleProduct_without_qty";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertGroupedProductsDefaultQty, assertGroupedProductForm"
55
"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct_with_specialPrice";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertSpecialPriceOnGroupedProductPage"
6-
"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"Out of Stock";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock"
6+
"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"Out of Stock";"-";"-";"-";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertProductOutOfStock"

dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ class CreateProductReviewBackendEntityTest extends Injectable
8080
*/
8181
protected $review;
8282

83+
/**
84+
* Skip test due to a Magento bug.
85+
*
86+
* @return void
87+
*/
88+
public function __prepare()
89+
{
90+
$this->markTestIncomplete('Bug: MAGETWO-33912');
91+
}
92+
8393
/**
8494
* Inject pages into test
8595
*

dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
9-
<storage class="Magento\Weee\Test\Repositoy\ConfigData">
9+
<storage class="Magento\Core\Test\Repository\ConfigData">
1010
<dataset name="default_tax_configuration">
1111
<field path="tax/weee/enable" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
1212
<field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>

dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
use Magento\Mtf\TestCase\Injectable;
1515

1616
/**
17-
* Test CreateTaxWithFptTest.
18-
*
1917
* Test Flow:
2018
*
2119
* Preconditions:
@@ -71,6 +69,7 @@ class CreateTaxWithFptTest extends Injectable
7169
public function __prepare(
7270
FixtureFactory $fixtureFactory
7371
) {
72+
$this->markTestIncomplete("Epic: MAGETWO-30073. FPC issue.");
7473
$this->fixtureFactory = $fixtureFactory;
7574
$customer = $fixtureFactory->createByCode('customer', ['dataSet' => 'johndoe_with_addresses']);
7675
$customer->persist();
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
"product";"constraint"
2-
"catalogProductSimple::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist"
3-
"catalogProductVirtual::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist"
4-
"downloadableProduct::with_two_separately_links";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist"
5-
"groupedProduct::three_simple_products";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist"
6-
"configurableProduct::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist"
7-
"bundleProduct::bundle_dynamic_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist"
8-
"bundleProduct::bundle_fixed_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist"
1+
"product";"constraint";"issue"
2+
"catalogProductSimple::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist";""
3+
"catalogProductVirtual::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist";""
4+
"downloadableProduct::with_two_separately_links";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist";""
5+
"groupedProduct::three_simple_products";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist";""
6+
"configurableProduct::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist";""
7+
"bundleProduct::bundle_dynamic_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist";"Bug: MAGETWO-33952"
8+
"bundleProduct::bundle_fixed_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist";"Bug: MAGETWO-33952"

0 commit comments

Comments
 (0)