diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index ca2520c621a3a..5979526457cf7 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -11,8 +11,29 @@
*/
namespace Magento\Eav\Model\Entity\Attribute\Frontend;
+use Magento\Framework\App\CacheInterface;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Eav\Model\Cache\Type as CacheType;
+use Magento\Eav\Model\Entity\Attribute;
+
abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\Frontend\FrontendInterface
{
+ /**
+ * @var CacheInterface
+ */
+ private $cache;
+
+ /**
+ * @var StoreResolverInterface
+ */
+ private $storeResolver;
+
+ /**
+ * @var array
+ */
+ private $cacheTags;
+
/**
* Reference to the attribute instance
*
@@ -27,11 +48,24 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
/**
* @param \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory
+ * @param CacheInterface $cache
+ * @param StoreResolverInterface $storeResolver
+ * @param array $cacheTags
* @codeCoverageIgnore
*/
- public function __construct(\Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory)
- {
+ public function __construct(
+ \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory,
+ CacheInterface $cache = null,
+ StoreResolverInterface $storeResolver = null,
+ array $cacheTags = [
+ CacheType::CACHE_TAG,
+ Attribute::CACHE_TAG,
+ ]
+ ) {
$this->_attrBooleanFactory = $attrBooleanFactory;
+ $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
+ $this->storeResolver = $storeResolver ?: ObjectManager::getInstance()->get(StoreResolverInterface::class);
+ $this->cacheTags = $cacheTags;
}
/**
@@ -216,7 +250,21 @@ public function getConfigField($fieldName)
*/
public function getSelectOptions()
{
- return $this->getAttribute()->getSource()->getAllOptions();
+ $cacheKey = 'attribute-navigation-option-' .
+ $this->getAttribute()->getAttributeCode() . '-' .
+ $this->storeResolver->getCurrentStoreId();
+ $optionString = $this->cache->load($cacheKey);
+ if (false === $optionString) {
+ $options = $this->getAttribute()->getSource()->getAllOptions();
+ $this->cache->save(
+ json_encode($options),
+ $cacheKey,
+ $this->cacheTags
+ );
+ } else {
+ $options = json_decode($optionString, true);
+ }
+ return $options;
}
/**
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/RadiobuttonElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/RadiobuttonElement.php
new file mode 100644
index 0000000000000..35b2f175248c1
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/RadiobuttonElement.php
@@ -0,0 +1,55 @@
+eventManager->dispatchEvent(['get_value'], [$this->getAbsoluteSelector()]);
+ return $this->find($this->selectedLabelSelector)->getText();
+ }
+
+ /**
+ * Select radio button based on label value.
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setValue($value)
+ {
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $radioButtonLabel = $this->find(sprintf($this->labelSelector, $value), Locator::SELECTOR_XPATH);
+ if (!$this->isSelected()) {
+ $radioButtonLabel->click();
+ }
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
index 2547fc063b61c..d4e8f511e8aaa 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
@@ -26,7 +26,7 @@
- No
- Authorization
- test_type:3rd_party_test severity:S0
+ test_type:3rd_party_test, severity:S0
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
index de4380b1c4009..72485c28b3ff6 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
@@ -8,26 +8,31 @@
+ stable:no
search shows admin preview
Some search term
+ stable:no
search with 2 sign return no results
:)
+ to_maintain:yes
search product by sku
orderInjectable::default::product::sku
+ stable:no
search existed customer
customer::johndoe_unique::lastname
+ stable:no
search order (by order id)
orderInjectable::default::id
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
index 05bb801fd9d5e..d9db0d829920f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
@@ -97,6 +97,7 @@
+ stable:no
Create fixed bundle with all types options
bundle-product-%isolation%
BundleProduct %isolation%
@@ -187,6 +188,7 @@
+ to_maintain:yes
Create dynamic bundle with special price
bundle-product-%isolation%
Bundle Dynamic %isolation%
@@ -236,6 +238,7 @@
+ MAGETWO-60789: API wrong custom attributes order
Create fixed product with checkout first option
bundle-product-%isolation%
Bundle Fixed %isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
index 66917983cfe2d..f8e56ae71922c 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
bundleProduct::bundle_dynamic_product
Yes
@@ -15,6 +16,7 @@
+ to_maintain:yes
bundleProduct::bundle_fixed_product
No
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index 284b0d73f313f..1170ef0e2b7b6 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
bundleProduct::default
0
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
index bc0cf3bef8c98..8d086230c14d0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
@@ -36,5 +36,5 @@ class ProductGrid extends Grid
*
* @var string
*/
- protected $selectItem = 'tbody tr .col-in_category';
+ protected $selectItem = 'tbody tr .col-in_category input';
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index 846c7bd79da60..b5463ef44a2af 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -16,6 +16,7 @@
+ to_maintain:yes
Create root category with all fields
addRootCategory
Yes
@@ -56,6 +57,7 @@
+ to_maintain:yes
Create not anchor subcategory specifying all fields
addSubcategory
default_category
@@ -90,6 +92,7 @@
+ to_maintain:yes
Create anchor subcategory with all fields
addSubcategory
default_category
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
index 6abfee194d7ae..2ed97cfd61834 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
@@ -21,6 +21,7 @@
+ to_maintain:yes
default_category
Yes
No
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
index e723ba9edee39..63d6b4ccc987d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
@@ -8,6 +8,7 @@
+ stable:no
catalogProductSimple::simple_for_composite_products
No
@@ -15,6 +16,7 @@
+ stable:no
catalogProductSimple::simple_for_composite_products,bundleProduct::bundle_dynamic_product
No
@@ -28,6 +30,7 @@
+ stable:no
catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_with_qty_1,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product
Yes
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
index 1781bed80a227..5d78c019ac0dc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
@@ -8,6 +8,7 @@
+ stable:no
compare_products
catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
index 10254e21ca1ed..8bd0f98b54bcc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -312,6 +312,7 @@
+ MAGETWO-60789: API wrong custom attributes order
Create product wit suite of custom options
simple-product-%isolation%
Simple Product %isolation%
@@ -394,6 +395,7 @@
+ stable:no
yes
default_subcategory
simple%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
index 6b7acba357367..f44c0e40628aa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
@@ -17,7 +17,7 @@
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, stable:no
virtual-product-%isolation%
VirtualProduct %isolation%
virtual_sku_%isolation%
@@ -71,6 +71,7 @@
+ MAGETWO-60789: API wrong custom attributes order
Create product with custom options suite and import options
virtual-product-%isolation%
VirtualProduct %isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml
index d3854b14b60c7..48a6d7158b91c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.xml
@@ -8,6 +8,7 @@
+ stable:no
catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product
1
No
@@ -15,6 +16,7 @@
+ stable:no
catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product
6
Yes
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
index 06f81bc67d229..958dd88034b15 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
@@ -8,6 +8,7 @@
+ stable:no
simple
configurableProduct::default
@@ -44,6 +45,7 @@
+ stable:no
virtual
configurableProduct::not_virtual_for_type_switching
@@ -56,6 +58,7 @@
+ to_maintain:yes
virtual
downloadableProduct::default
@@ -71,6 +74,7 @@
+ to_maintain:yes
downloadable
configurableProduct::not_virtual_for_type_switching
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
index e67e3018640fe..0217098169b15 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
catalogProductSimple::default
configurableProduct::default
-
@@ -48,6 +49,7 @@
+ to_maintain:yes
catalogProductVirtual::default
configurableProduct::not_virtual_for_type_switching
-
@@ -60,6 +62,7 @@
+ stable:no
catalogProductVirtual::default
downloadableProduct::default
-
@@ -71,6 +74,7 @@
+ stable:no
downloadableProduct::default
catalogProductSimple::default
-
@@ -78,6 +82,7 @@
+ stable:no
downloadableProduct::default
configurableProduct::not_virtual_for_type_switching
-
@@ -97,6 +102,7 @@
+ stable:no
catalogProductSimple::default
downloadableProduct::default
-
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
index b7a04751373ff..d4ec414088f28 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
@@ -72,6 +72,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
Update stock to Out of Stock
product_with_category
Test simple product %isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
index 486e9e1a8467c..cf788511c82d4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
@@ -47,6 +47,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
VirtualProduct %isolation%
virtual_sku_%isolation%
185.00
@@ -67,6 +68,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
virtual_product_%isolation%
virtual_sku_%isolation%
99.99
@@ -82,6 +84,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
VirtualProduct %isolation%
virtual_sku_%isolation%
5.00
@@ -116,6 +119,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
VirtualProduct %isolation%
virtual_sku_%isolation%
99.99
@@ -133,6 +137,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
virtual_product_%isolation%
virtual_sku_%isolation%
5.00
@@ -168,6 +173,7 @@
+ MAGETWO-62229: There is no Price on product page when product is out of stock
VirtualProduct %isolation%
virtual_sku_%isolation%
99.99
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
index c8785d8006fdf..47be67b7aee5a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
AttributeSet%isolation%
default
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
index 76c6f3ef9d098..e7ad621a70b02 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
custom_attribute_set
Text_Field_Admin_%isolation%
Text Field
@@ -19,6 +20,7 @@
+ to_maintain:yes
custom_attribute_set
Text_Field_Admin_%isolation%
Text Area
@@ -42,6 +44,7 @@
+ to_maintain:yes
custom_attribute_set
Date_Admin_%isolation%
Date
@@ -65,6 +68,7 @@
+ to_maintain:yes
custom_attribute_set
Yes/No_Admin_%isolation%
Yes/No
@@ -81,6 +85,7 @@
+ to_maintain:yes
custom_attribute_set
Multiple_Select_Admin_%isolation%
Multiple Select
@@ -148,6 +153,7 @@
+ to_maintain:yes
custom_attribute_set
Price_Admin_%isolation%
Price
@@ -169,6 +175,7 @@
+ to_maintain:yes
custom_attribute_set
Fixed_Product_Tax_Admin_%isolation%
Fixed Product Tax
@@ -179,6 +186,7 @@
+ to_maintain:yes
custom_attribute_set
Text_Field_Admin_%isolation%
Text Field
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
index f180c8dfea87b..6bdc08be84d8d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
AttributeSetEdit1%isolation%
Custom-group%isolation%
custom_attribute_set
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
index 63c058ca9419b..e1aa47036697e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
custom_attribute_set
attribute_type_text_field
Text_Field_%isolation%
@@ -28,6 +29,7 @@
+ to_maintain:yes
custom_attribute_set
attribute_type_dropdown
Dropdown_%isolation%
@@ -53,6 +55,7 @@
+ to_maintain:yes
custom_attribute_set
tax_class_id
Yes
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml
index 56fe0a1859cb8..f835f90410b1f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml
@@ -23,6 +23,7 @@
+ stable:no
catalog_price_rule_priority_0
catalog_price_rule_priority_1_stop_further_rules
catalog_price_rule_priority_2
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
index 1fbb3a6df8556..ef8919d3c6a50 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml
@@ -8,11 +8,13 @@
+ to_maintain:yes
catalogProductSimple::name
-
+ to_maintain:yes
catalogProductSimple::sku
1
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
index b4e31061ef9ee..de86d6424e05c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
bundleProduct::bundle_dynamic_product
210
@@ -17,6 +18,7 @@
+ to_maintain:yes
bundleProduct::bundle_fixed_product
761
@@ -26,6 +28,7 @@
+ to_maintain:yes
catalogProductSimple::with_two_custom_option
345
@@ -44,6 +47,7 @@
+ to_maintain:yes
configurableProduct::default
135
@@ -62,6 +66,7 @@
+ to_maintain:yes
groupedProduct::three_simple_products
1950
@@ -71,6 +76,7 @@
+ to_maintain:yes
catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product
2922.43
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index 44b5343a2a826..de80cf421d82e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
delete Simple
catalogProductSimple::default, catalogProductVirtual::default
0
@@ -15,6 +16,7 @@
+ stable:no
delete Simple
catalogProductSimple::default
0
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
index c3209a55753b8..661fae2495748 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
@@ -36,6 +36,7 @@
+ stable:no
catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
index 8fb76a954a364..51ca07377d5fa 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
catalogProductVirtual::default
active_sales_rule_for_all_groups
customer_UK_1_default_billing_address
@@ -26,6 +27,7 @@
+ to_maintain:yes
catalogProductSimple::default
active_sales_rule_for_all_groups
default
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
index be7b65dc1f972..bedef6d62a8f3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -8,14 +8,14 @@
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, stable:no
catalogProductSimple::with_two_custom_option
simple_update_mini_shopping_cart
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, stable:no
configurableProduct::default
configurable_update_mini_shopping_cart
@@ -24,7 +24,7 @@
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, stable:no
bundleProduct::bundle_fixed_product
bundle_update_mini_shopping_cart
@@ -33,7 +33,7 @@
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, stable:no
downloadableProduct::with_two_separately_links
downloadable_update_mini_shopping_cart
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
index b6ceb5e904066..5808e949334c3 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
@@ -19,6 +19,7 @@
+ to_maintain:yes
block_%isolation%
identifier_%isolation%
default
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
index 445839d881527..96860dc6c80eb 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
@@ -20,6 +20,7 @@
+ to_maintain:yes
cmsPage
Yes
NewCmsPage%isolation%
@@ -30,6 +31,7 @@
+ to_maintain:yes
cmsPage
Yes
NewCmsPage%isolation%
@@ -44,6 +46,7 @@
+ to_maintain:yes
cmsPage
NewCmsPage%isolation%
identifier-%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml
index 1671afe19bfbd..c271ec485a86f 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml
index 095b9477fcb2b..f43a2f219ce2a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
default
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
index 76666ce28627c..cf101cde54916 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Verify cms page grid sorting
- ID
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.xml
index db34c2408c570..f38525785f634 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.xml
@@ -18,6 +18,7 @@
+ to_maintain:yes
block_updated_%isolation%
identifier_updated_%isolation%
default
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
index b8bd173277b80..2f46e7dd3adc3 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
@@ -32,6 +32,7 @@
+ to_maintain:yes
configurable-product-%isolation%
two_options
configurable_two_options
@@ -53,6 +54,7 @@
+ to_maintain:yes
configurable-product-%isolation%
two_options_with_assigned_product_special_price
configurable_two_new_options_with_special_price
@@ -74,6 +76,7 @@
+ to_maintain:yes
configurable-product-%isolation%
two_options_with_assigned_product
configurable_two_options_with_assigned_product
@@ -94,6 +97,7 @@
+ to_maintain:yes
configurable-product-%isolation%
two_options_with_fixed_price
Configurable Product %isolation%
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
index dfafe661d68ce..c0339786ba321 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
configurableProduct::default
Yes
@@ -15,6 +16,7 @@
+ to_maintain:yes
configurableProduct::with_one_option
Yes
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index 6928a10aaed0c..8f67f620d87b7 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
@@ -8,6 +8,7 @@
+ stable:no
configurableProduct::default
0
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml
index 479873e2c97b2..8448c339c422a 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
config_currency_symbols_usd_and_uah
UAH
No
@@ -17,6 +18,7 @@
+ stable:no
config_currency_symbols_usd_and_uah
UAH
No
@@ -26,6 +28,7 @@
+ stable:no
config_currency_symbols_usd_and_uah
UAH
No
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml
index 02a1853b6caab..d77c44813b784 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
config_currency_symbols_usd_and_uah
currency_symbols_uah
UAH
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
index 8ae175e563722..79c3a7ba66696 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
@@ -19,6 +19,7 @@
+ to_maintain:yes
save
Wholesale
M
@@ -92,6 +93,7 @@
+ to_maintain:yes
saveAndContinue
Main Website
customer_group_retail_customer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml
index 5788d2b425207..0e59a033c65ab 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml
@@ -8,6 +8,7 @@
+ stable:no
default
US_address_default_billing,US_address_NY_default_no
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
index 02a7042163b18..9640e19950b95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Verify customer page grid sorting
- ID
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml
index 582c7cfae04eb..1dbba06a5cb98 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
default
3
2
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
index 28580e5c80870..8b220239b1fec 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
default
Wholesale
%isolation%Prefix_
@@ -44,6 +45,7 @@
+ to_maintain:yes
default
Retailer
%isolation%Prefix_
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
index 3f691294876ff..7cb04b688c209 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
@@ -42,6 +42,7 @@
+ to_maintain:yes
Create product with default sets samples and links
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
@@ -80,6 +81,7 @@
+ to_maintain:yes
Create product without category
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
@@ -152,6 +154,7 @@
+ MAGETWO-60789: API wrong custom attributes order
Create product with import custom options
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
@@ -175,6 +178,7 @@
+ to_maintain:yes
Create product with three links
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
@@ -198,6 +202,7 @@
+ to_maintain:yes
Create product with three links without description
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
index 64fc05f39031f..644f7630fa7e2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
downloadableProduct::default
Yes
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index 42934edaaf58e..b68e5ed9068bf 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
@@ -8,6 +8,7 @@
+ stable:no
downloadableProduct::default
0
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
index cefe14ca75399..7cc1ca558ac5f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
downloadableProduct::default
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml
index 69549fdf72ecc..c069bced0d5d1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/TaxCalculationTest.xml
@@ -8,6 +8,7 @@
+ stable:no
total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax
downloadableProduct::with_two_separately_links_special_price_and_category
active_sales_rule_for_all_groups_no_coupon
@@ -53,6 +54,7 @@
+ to_maintain:yes
total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax
downloadableProduct::with_two_separately_links_custom_options_and_category
catalog_price_rule_all_groups
@@ -77,6 +79,7 @@
+ to_maintain:yes
total_cat_incl_ship_excl_before_disc_on_excl
downloadableProduct::with_two_separately_links_custom_options_and_category
catalog_price_rule_all_groups
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml
index a846eb909c04a..ba32a5194504c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
55
@@ -29,6 +30,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
100
@@ -45,6 +47,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
9999
@@ -61,6 +64,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
48
@@ -78,6 +82,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
54
@@ -101,6 +106,7 @@
+ to_maintain:yes
DownloadableProduct_%isolation%
DownloadableProduct_%isolation%
43
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
index c630b519b8339..c2fb7b47c581f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
groupedProduct::default
Yes
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
index c39d3207918fa..6a7be0de93f5b 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
groupedProduct::default
0
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
index e31b3ad914ac5..29bb7a82c452d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -13,7 +13,7 @@
[value="user"]
- checkbox
+ radiobutton
[name="key"]
@@ -24,12 +24,12 @@
[ng-model*="front"]
- checkbox
+ radiobutton
[type="checkbox"][ng-model*="admin"]
- checkbox
+ radiobutton
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
index bb5ddb7e837bb..cdfc018346b56 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
@@ -7,17 +7,15 @@
-->
-
- Install with custom admin path.
+
default
custom
-
- Install with custom encryption key and changed currency and locale.
+
default
- Yes
+ I want to use my own encryption key
123123qa
German (Germany)
Euro (EUR)
@@ -28,33 +26,29 @@
-
- Install with table prefix.
+
default
pref_
Chinese (China)
-
- Install with enabled url rewrites.
+
default
Yes
-
- Install with enabled secure urls.
+
default
- Yes
- Yes
+ Use HTTPS for Magento Storefront
+ Use HTTPS for Magento Admin
-
- Install with default values.
+
default
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml
index 8c57b9dd47f03..2666efaebea07 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
default
Preview
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
index 77e5b27d3956b..8ed89784b497d 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
default
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
index 61d9e9591b1e4..2561145d429ab 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml
index be21c4a32e515..b2d9e976e6e11 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.xml
@@ -8,6 +8,7 @@
+ stable:no
product_with_video_youtube
youtube_api_key,play_if_base
@@ -15,6 +16,7 @@
+ stable:no
product_with_video_vimeo
play_if_base
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
index 7ff8ff0ac415d..e3922e303d571 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
@@ -8,6 +8,7 @@
+ stable:no
product_with_video_youtube
simple_product_with_category_%isolation%
https://vimeo.com/16342611
@@ -22,6 +23,7 @@
+ to_maintain:yes
product_with_video_vimeo
simple_product_with_category_%isolation%
Edit Test
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml
index bffbab6d1a666..cdede7ef17c30 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml
@@ -30,6 +30,7 @@
+ stable:no
No
default
name_upd_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.xml
index f1dafd4b1311a..d0767370a1e98 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.xml
@@ -18,6 +18,7 @@
+ stable:no
default,virtual_product
m/d/Y -1 month
m/d/Y +1 month
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml
index 80258d8511b47..d7cfc3df5e16a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
low_stock_product
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.xml
index 09fd26e405904..501b8e846b90e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
with_coupon
Order Created
Year
@@ -19,6 +20,7 @@
+ stable:no
with_coupon
Order Created
Month
@@ -31,6 +33,7 @@
+ stable:no
with_coupon
Order Updated
Day
@@ -43,6 +46,7 @@
+ stable:no
with_coupon
Order Updated
Day
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
index a7213b7226f00..7fbf15a96a0df 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.xml
@@ -22,6 +22,7 @@
+ stable:no
invoice
custom_rule
default
@@ -37,6 +38,7 @@
+ stable:no
invoice,shipment
custom_rule
default
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml
index c10d655753906..dec9361aa2116 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
View products on front and verify they all reflected in Year report.
1, 1
catalogProductSimple::default, catalogProductVirtual::default
@@ -18,6 +19,7 @@
+ to_maintain:yes
View products on front and verify they all reflected in Month report.
1, 1
downloadableProduct::default, bundleProduct::bundle_dynamic_product
@@ -28,6 +30,7 @@
+ to_maintain:yes
View products on front and verify they all reflected in Day report.
1, 1
configurableProduct::default, groupedProduct::default
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml
index 9b9274451cdca..58ff6f3f47974 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
catalogProductSimple::default
Approved
Main Website/Main Website Store/Default Store View
@@ -21,6 +22,7 @@
+ to_maintain:yes
catalogProductSimple::default
Pending
Main Website/Main Website Store/Default Store View
@@ -34,6 +36,7 @@
+ to_maintain:yes
catalogProductSimple::default
Not Approved
Main Website/Main Website Store/Default Store View
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml
index 8a21975e3feff..12c73140cccff 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Guest
name_%isolation%
title_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml
index de49c26be070c..0830ae20769f7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Approved
name_upd_%isolation%
title_upd_%isolation%
@@ -17,6 +18,7 @@
+ to_maintain:yes
Not Approved
name_upd_%isolation%
title_upd_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml
index 71053c360327a..9005f788c0ee3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
3
Approved
Main Website/Main Website Store/Default Store View
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml
index e1e22ed984961..72c11a01c9a0e 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
review_for_simple_product_with_rating
name_upd_%isolation%
title_upd_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
index 8a22da096766c..f817918ae2993 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
@@ -9,14 +9,14 @@
/**
* Invoices grid on order view page.
*/
-class Grid extends \Magento\Backend\Test\Block\Widget\Grid
+class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
{
/**
* Locator value for link in action column.
*
* @var string
*/
- protected $editLink = '[data-column="increment_id"]';
+ protected $editLink = '.action-menu-item[href*="view"]';
/**
* Locator for invoice ids
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
index 7c4eb0ddc4aef..81213ca4d078e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
@@ -36,13 +36,13 @@ public function processAssert(
$orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
$salesOrderView->getOrderForm()->openTab('invoices');
/** @var Grid $grid */
- $grid = $salesOrderView->getOrderForm()->getTab('invoices')->getGridBlock();
+ $grid = $salesOrderView->getOrderInvoiceGrid();
$amount = $order->getPrice();
foreach ($ids['invoiceIds'] as $key => $invoiceId) {
$filter = [
'id' => $invoiceId,
- 'amount_from' => $amount[$key]['grand_invoice_total'],
- 'amount_to' => $amount[$key]['grand_invoice_total'],
+ 'grand_total_from' => $amount[$key]['grand_invoice_total'],
+ 'grand_total_to' => $amount[$key]['grand_invoice_total'],
];
$grid->search($filter);
$filter['amount_from'] = number_format($amount[$key]['grand_invoice_total'], 2);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
index 5ee818ef1eb7e..ff05e0cae4501 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml
@@ -16,5 +16,6 @@
+
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
index ce41c96ddf9ee..18be3914847a3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
@@ -29,6 +29,7 @@
+ stable:no
Create order with virtual product for registered UK customer using Check/Money Order payment method
catalogProductVirtual::default
default
@@ -69,6 +70,7 @@
+ stable:no
Create order with virtual product for registered UK customer using Bank Transfer payment method
catalogProductVirtual::default
default
@@ -89,6 +91,7 @@
+ to_maintain:yes
Create order with simple product for registered US customer using Fixed shipping method and Purchase Order payment method
catalogProductSimple::default
default
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
index 4b47c6215f08e..77d8e1d7aaeff 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridFullTextSearchTest.xml
@@ -8,6 +8,7 @@
+ stable:no
Verify sales order grid full text search
- -
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
index ff6da3d0888fc..01e22e9656cea 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
@@ -8,6 +8,7 @@
+ stable:no
Verify sales order grid storting
- -
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
index 431b57bee4725..8b50877c3ea34 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.xml
@@ -12,6 +12,7 @@
+ to_maintain:yes
configurableProduct::configurable_with_qty_1,configurableProduct::configurable_with_qty_1
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
index f8b249091081d..3e4e5b871e4bf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
@@ -12,6 +12,7 @@
+ to_maintain:yes
configurableProduct::configurable_with_qty_1,configurableProduct::configurable_with_qty_1
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
index 3437813dd358a..580c071dc887d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.xml
@@ -8,10 +8,12 @@
+ to_maintain:yes
configurableProduct::default
+ to_maintain:yes
bundleProduct::bundle_fixed_product
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml
index 1dc365549bf47..316a0f8b5e99d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
- johndoe_with_addresses
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml
index d551ac869304a..16ac68dd80e29 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Reorder placed order (update products, billing address).
two_simple_product
active_sales_rule_with_fixed_price_discount_coupon
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index f622ea40656eb..8ac9ed17fbab0 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
@@ -43,6 +43,7 @@
+ to_maintain:yes
active_sales_rule_row_total
active_sales_total_items
simple_for_salesrule_1
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index 1609a6e4f00f3..2fed474f73d6a 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -88,6 +88,7 @@
+ stable:no
United States
California
95814
@@ -202,6 +203,7 @@
+ to_maintain:yes
United States
California
95814
@@ -231,6 +233,7 @@
+ to_maintain:yes
Cart Price Rule9 %isolation%
Cart Price Rule Description %isolation%
Yes
@@ -299,6 +302,7 @@
+ to_maintain:yes
United States
California
95814
@@ -351,6 +355,7 @@
+ stable:no
Cart Price Rule14 %isolation%
Cart Price Rule Description %isolation%
Yes
@@ -375,6 +380,7 @@
+ stable:no
Cart Price Rule15 %isolation%
Cart Price Rule Description %isolation%
Yes
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
index 85037845b8a96..b37169a029c0b 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.xml
@@ -18,6 +18,7 @@
+ stable:no
inactive_sales_rule
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml
index 1996ef81c6e17..69590fbc7237e 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.xml
@@ -13,7 +13,7 @@
incorrect password
123123^a
123123^a
- 6
+ 7
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
index 3cce53517b701..bf8af69cf62ac 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
customer_max_login_failures_number
default
incorrect password
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
index fe5b3c368e919..44b73e9c8e20b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
@@ -19,6 +19,7 @@
+ to_maintain:yes
TaxIdentifier%isolation%
US-CA-Rate_1
US-NY-Rate_1
@@ -33,6 +34,7 @@
+ stable:no
Creating tax rule with new tax classes and tax rate
TaxIdentifier%isolation%
default
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml
index 8e8cff94af96a..69248b4b6fa30 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Simple product tier price with sales rule, customer tax equals store tax and catalog price including tax
shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax
catalogProductSimple::simple_with_tier_price_and_category
@@ -37,6 +38,7 @@
+ to_maintain:yes
Simple product special price with sales rule, customer tax less than store tax and catalog price including tax
shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax
catalogProductSimple::product_with_special_price_and_category
@@ -66,6 +68,7 @@
+ to_maintain:yes
Simple product tier price with sales rule, customer tax less than store tax and catalog price including tax
shipping_tax_class_taxable_goods, unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax
catalogProductSimple::simple_with_tier_price_and_category
@@ -95,6 +98,7 @@
+ to_maintain:yes
Simple product special price with sales rule, customer tax equals store tax and catalog price excluding tax
shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax
catalogProductSimple::product_with_special_price_and_category
@@ -124,6 +128,7 @@
+ to_maintain:yes
Simple product tier price with sales rule, customer tax greater than store tax and catalog price excluding tax
shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax
catalogProductSimple::simple_with_tier_price_and_category
@@ -153,6 +158,7 @@
+ to_maintain:yes
Simple product special price with sales rule, customer tax greater than store tax and catalog price excluding tax
shipping_tax_class_taxable_goods, unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax
catalogProductSimple::product_with_special_price_and_category
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.xml
index a65d47ed51776..0ac4b3e37c080 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.xml
@@ -8,11 +8,13 @@
+ stable:no
with_one_custom_option_and_category
cross_border_enabled_price_incl_tax, display_excluding_including_tax
+ stable:no
product_with_category
cart_rule
cross_border_enabled_price_incl_tax, display_excluding_including_tax
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
index 8e810f52f5968..6824b6379e1b3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
@@ -44,6 +44,7 @@
+ stable:no
withZipRange
TaxIdentifier%isolation%
No
@@ -67,6 +68,7 @@
+ stable:no
withZipRange
TaxIdentifier%isolation%
No
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
index 0d8e9a315a3a4..585fcb297bedb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml
@@ -8,6 +8,7 @@
+ stable:no
tax_rule_default
New Tax Rule name%isolation%
default
@@ -21,6 +22,7 @@
+ stable:no
tax_rule_with_custom_tax_classes
withZipRange
retail_customer
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
index 50b97e1b286c4..4af3f965e1adf 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -102,6 +102,7 @@ class DataGrid extends Grid
*/
protected $rowById = ".//tr[td//input[@data-action='select-row' and @value='%s']]";
+ // @codingStandardsIgnoreStart
/**
* Column header number.
*
@@ -114,7 +115,7 @@ class DataGrid extends Grid
*
* @var string
*/
- protected $cellByHeader = "//td[%s+1]";
+ private $cellByHeader = "//td[count(//th[span[.='%s']][not(ancestor::*[@class='sticky-header'])]/preceding-sibling::th)+1]";
// @codingStandardsIgnoreStart
/**
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
index a318637a57278..d0f302f41e39c 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
@@ -8,6 +8,7 @@
+ to_maintain:yes
Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl
with_custom_option_and_fpt
@@ -28,6 +29,7 @@
+ to_maintain:yes
Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax
with_custom_option_and_fpt
@@ -50,6 +52,7 @@
+ stable:no
Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax
with_special_price_and_fpt
@@ -72,6 +75,7 @@
+ stable:no
Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl
with_special_price_and_fpt
@@ -92,6 +96,7 @@
+ to_maintain:yes
Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl
with_custom_option_and_fpt
@@ -112,6 +117,7 @@
+ stable:no
Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax
with_custom_option_and_fpt
@@ -148,6 +154,7 @@
+ stable:no
Check taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl
with_special_price_and_fpt
@@ -204,6 +211,7 @@
+ to_maintain:yes
Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl
with_custom_option_and_fpt
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index c09fe1aa80309..984c27a854e61 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -123,14 +123,12 @@ public function getOptions()
$viewDetails = $this->_rootElement->find($this->viewDetails);
if ($viewDetails->isVisible()) {
$this->_rootElement->find($this->footer, Locator::SELECTOR_XPATH)->click();
- $viewDetails->click();
+ $viewDetails->hover();
$labels = $this->_rootElement->getElements($this->optionLabel);
$values = $this->_rootElement->getElements($this->optionValue);
$data = [];
foreach ($labels as $key => $label) {
- if (!$label->isVisible()) {
- $viewDetails->click();
- }
+ $viewDetails->hover();
$data[] = [
'title' => $label->getText(),
'value' => str_replace('$', '', $values[$key]->getText()),
@@ -164,6 +162,18 @@ public function hoverProductBlock()
$this->_rootElement->find($this->price)->hover();
}
+ /**
+ * Returns product price
+ *
+ * @param string $currency
+ * @return string
+ */
+ public function getPrice($currency = '$')
+ {
+ $price = $this->_rootElement->find($this->price)->getText();
+ return str_replace($currency, '', $price);
+ }
+
/**
* Get Wish List data for the Product.
*
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
index 479a5338d5e3f..07d7c7f4e5b38 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
@@ -44,6 +44,7 @@
+ to_maintain:yes
bundleProduct::bundle_fixed_product
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
index bf1f96faa6ef1..673593f31c824 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
@@ -8,12 +8,14 @@
+ to_maintain:yes
catalogProductSimple::product_100_dollar
2
+ to_maintain:yes
catalogProductVirtual::product_50_dollar
1
@@ -26,6 +28,7 @@
+ stable:no
groupedProduct::three_simple_products
-
@@ -38,18 +41,21 @@
+ to_maintain:yes
configurableProduct::default
3
+ to_maintain:yes
bundleProduct::bundle_dynamic_product
2
+ to_maintain:yes
bundleProduct::bundle_fixed_product
2
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
index 2fde2f65d687b..167b1ba5bdd1d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
@@ -8,6 +8,7 @@
+ stable:no
catalogProductSimple::with_two_custom_option
@@ -18,6 +19,7 @@
+ to_maintain:yes
bundleProduct::bundle_dynamic_product
@@ -28,6 +30,7 @@
+ stable:no
groupedProduct::three_simple_products
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
index 254466c48d1ef..751c8f82a117c 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
@@ -8,6 +8,7 @@
+ stable:no
catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar
- 1
@@ -60,6 +61,7 @@
+ stable:no
groupedProduct::three_simple_products
- 1
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
index 7ebae64c0e80b..03ba3f1c9c7d7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
@@ -20,6 +20,7 @@
+ stable:no
downloadableProduct::with_two_separately_links
@@ -27,7 +28,7 @@
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, to_maintain:yes
configurableProduct::default
@@ -35,6 +36,7 @@
+ stable:no
bundleProduct::bundle_dynamic_product
@@ -42,6 +44,7 @@
+ to_maintain:yes
bundleProduct::bundle_fixed_product
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
new file mode 100644
index 0000000000000..2f8bc8fa4fdc5
--- /dev/null
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+