diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 94fcff39fbd20..47dff6cb17c85 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -260,7 +260,7 @@
1
100
0
- EavStockItem
+ EavStock100
CustomAttributeCategoryIds
@@ -516,6 +516,7 @@
9,000.00
999
In Stock
+ Catalog, Search
virtual-product
IN STOCK
virtual
@@ -536,10 +537,54 @@
9,000.00
999
Out of Stock
+ Catalog, Search
virtual-product
OUT OF STOCK
virtual
+
+ VirtualProduct
+ virtual_sku
+ 10.00
+ 999
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 120.00
+ None
+ 999
+ In Stock
+ IN STOCK
+ Search
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 99.99
+ None
+ 999
+ In Stock
+ IN STOCK
+ Catalog
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 99.99
+ Taxable Goods
+ Out of Stock
+ OUT OF STOCK
+ Search
+ virtual-product
+ virtual
+
Testp
testsku
@@ -579,4 +624,76 @@
magento3
jpg
+
+ VirtualProduct
+ virtual_sku
+ 99.99
+ None
+ 999
+ In Stock
+ IN STOCK
+ Catalog
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 5.00
+ None
+ Out of Stock
+ OUT OF STOCK
+ Catalog
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 120.00
+ Taxable Goods
+ 999
+ In Stock
+ IN STOCK
+ Catalog, Search
+ virtual-product
+ 45.00
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 99.99
+ None
+ Out of Stock
+ OUT OF STOCK
+ Catalog, Search
+ virtual-product
+ 45.00
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 145.00
+ Taxable Goods
+ 999
+ In Stock
+ IN STOCK
+ Catalog, Search
+ virtual-product
+ virtual
+
+
+ VirtualProduct
+ virtual_sku
+ 185.00
+ None
+ 999
+ Out of Stock
+ OUT OF STOCK
+ Catalog, Search
+ virtual-product
+ virtual
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index cedcbe8cd3fec..7fd0c65a2f753 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -21,6 +21,8 @@
second_store_view
+ All Websites [USD]
+ ALL GROUPS
90.00
2
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index cbe4dee76b93b..fc78c25ec49fa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -41,9 +41,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 1cf91b8dcf682..43345c69e6c04 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 03566be55ad2f..845b7070e46cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -29,5 +29,6 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..9bdc93e61e499
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ As low as ${{tierPriceOnVirtualProduct.price}}
+ tierPriceTextOnCategoryPage
+
+
+
+
+
+
+
+
+
+
+
+ Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%
+ tierPriceText
+
+
+ {{updateVirtualProductRegularPrice.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductRegularPrice.price}}
+ productPriceAmount
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
new file mode 100644
index 0000000000000..d67d5b36109e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -0,0 +1,249 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductRegularPriceInStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductRegularPriceInStock.price}}
+ productPriceAmount
+
+
+
+
+
+
+
+
+
+ allCustomOptionLabels
+ [{{virtualProductCustomizableOption1.title}} + ${{virtualProductCustomizableOption1.option_0_price}}, {{virtualProductCustomizableOption2.title}} + ${{virtualProductCustomizableOption2.option_0_price}}, {{virtualProductCustomizableOption3.title}}, {{virtualProductCustomizableOption4.title}}]
+
+
+
+
+ grabFourthOptions
+ ['-- Please Select --', {{virtualProductCustomizableOption4.option_0_title}} +$12.01, {{virtualProductCustomizableOption4.option_1_title}} +$20.02]
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..a2a4f65860254
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductRegularPrice5OutOfStock.price}}
+ productPriceAmount
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..e64022b311614
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductRegularPrice5OutOfStock.price}}
+ productPriceAmount
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
new file mode 100644
index 0000000000000..aa3184994daff
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductRegularPrice99OutOfStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductRegularPrice99OutOfStock.price}}
+ productPriceAmount
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..9b6a56d6f81d8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${{updateVirtualProductSpecialPrice.special_price}}
+ specialPriceAmount
+
+
+
+
+ ${{updateVirtualProductSpecialPrice.price}}
+ oldPriceAmount
+
+
+
+
+ {{updateVirtualProductSpecialPrice.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..920a0a494bae5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductSpecialPriceOutOfStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductSpecialPriceOutOfStock.price}}
+ productPriceAmount
+
+
+
+
+ ${{updateVirtualProductSpecialPriceOutOfStock.special_price}}
+ specialPriceAmount
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..d4ec5e410d9ff
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductTierPriceInStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductTierPriceInStock.price}}
+ productPriceAmount
+
+
+
+ Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 38%
+ tierPriceText
+
+
+
+
+
+
+
+
+
+
+
+
+ As low as ${{tierPriceOnVirtualProduct.price}}
+ tierPriceTextOnStorefrontPage
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..717d710b4a288
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualProductWithTierPriceInStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualProductWithTierPriceInStock.price}}
+ productPriceAmount
+
+
+
+
+ Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%
+ tierPriceText
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..703a4e24cdca9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectedCategories
+ [$$categoryEntity.name$$]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{updateVirtualTierPriceOutOfStock.storefrontStatus}}
+ productStockAvailableStatus
+
+
+
+ ${{updateVirtualTierPriceOutOfStock.price}}
+ productPriceAmount
+
+
+
+
+ Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 51%
+ tierPriceText
+
+
+
+
+
+
+
+
+
+
+
+