diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 4e36f1fa54f21..936c4b968af3b 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
{
"require": {
- "magento/mtf": "1.0.0-rc46",
+ "magento/mtf": "1.0.0-rc47",
"php": "~5.6.0|7.0.2|~7.0.6",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2"
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
index 4511840ccdb4f..048f92783b42d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
@@ -30,7 +30,6 @@ class ExpireAdminSessionTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
protected $systemConfigEdit;
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php
index f0dbb4fbc2a33..a75c3f94ccde7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php
@@ -22,14 +22,13 @@
* 3. Fill in data according dataset
* 4. Perform assertions
*
- * @group Search_Core_(MX)
+ * @group Search_Core
* @ZephyrId MAGETWO-28457
*/
class GlobalSearchEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
index 95e69835435c6..0c2cd138eb1c8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
@@ -25,7 +25,6 @@ class HttpsHeadersDisableTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
index 412329700ef65..5dca7fad04e1f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
@@ -25,7 +25,6 @@ class HttpsHeadersEnableTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
index 4973598ac5959..f75ea3ade05fc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
@@ -21,7 +21,6 @@ class NavigateMenuTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
index 007a6e04a42b0..6601bd44892c9 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
@@ -30,14 +30,13 @@
* 12. Find transaction for latest order.
* 13. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-48162
*/
class BraintreeSettlementReportTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
index 8bad13557c888..a0bf482705f55 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
@@ -25,14 +25,13 @@
* 8. Select payment method
* 12. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-39363
*/
class CheckoutWithBraintreePaypalCartTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
index d6723c71816f9..f0f0291b33e20 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
@@ -25,14 +25,13 @@
* 8. Select payment method
* 12. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-39359
*/
class CheckoutWithBraintreePaypalMinicartTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
index f45270012dd39..6554845d5ff81 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
@@ -17,14 +17,13 @@
* 3. Create credit memo.
* 4. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-48689, MAGETWO-48698
*/
class CreateOnlineCreditMemoBraintreePaypalTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
index 625c24866e31f..7048984886582 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
@@ -21,14 +21,13 @@
* 6. Open Invoices tab.
* 7. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-48614, MAGETWO-48615
*/
class InvoicePayPalBraintreeTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
index f8d9338b52834..32599aa090651 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
@@ -31,14 +31,13 @@
* 12. Click 'Submit' to place order.
* 13. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-46479
*/
class OnePageCheckoutWith3dSecureTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
index d6a4e4b51b1c6..9cf0e9c90c121 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
@@ -28,7 +28,7 @@
* 11. Click 'Proceed purchase' in popup.
* 12. Perform assertions.
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-47805
* @ZephyrId MAGETWO-47810
*/
@@ -36,7 +36,6 @@ class OnePageCheckoutWithBraintreePaypalTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
index 107918b973d86..f6813b74e40d7 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
@@ -35,14 +35,13 @@
* 15. Click *Delete* button on appeared pop up.
* 16. Perform assertions. *
*
- * @group Braintree_(CS)
+ * @group Braintree
* @ZephyrId MAGETWO-54838, MAGETWO-54843, MAGETWO-54844"
*/
class SaveUseDeleteVaultForPaypalBraintreeTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
index a0d850f07e977..13b8240d4c49e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
@@ -35,14 +35,13 @@
* 16. Click 'Submit' to place order.
* 17. Perform assertions.
*
- * @group One_Page_Checkout_(CS)
+ * @group One_Page_Checkout
* @ZephyrId MAGETWO-55310
*/
class UseVaultWith3dSecureOnCheckoutTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
index 8a24aed55cbe1..ac2c977f88b83 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
@@ -21,7 +21,7 @@
* 5. Save product
* 6. Verify created product
*
- * @group Bundle_Product_(CS)
+ * @group Bundle_Product
* @ZephyrId MAGETWO-24118
*/
class CreateBundleProductEntityTest extends Injectable
@@ -29,7 +29,6 @@ class CreateBundleProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
index ca7683fca93c7..bf17d216bcf9b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
@@ -26,14 +26,13 @@
* 5. Click "Save".
* 6. Perform asserts
*
- * @group Bundle_Product_(MX)
+ * @group Bundle_Product
* @ZephyrId MAGETWO-26195
*/
class UpdateBundleProductEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
index e648c84cf9afb..d458ffeb22475 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
@@ -22,14 +22,13 @@
* 5. Save category
* 6. Verify created category
*
- * @group Category_Management_(MX)
+ * @group Category_Management
* @ZephyrId MAGETWO-23411
*/
class CreateCategoryEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
index 36bcf1a438601..e7b613f43af59 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
@@ -25,14 +25,13 @@
* 4. Click "Delete" button.
* 5. Perform asserts.
*
- * @group Category_Management_(MX)
+ * @group Category_Management
* @ZephyrId MAGETWO-23303
*/
class DeleteCategoryEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
index b37aba462dcfb..ab8b03e8bfe15 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
@@ -27,14 +27,13 @@
* 5. Save
* 6. Perform asserts
*
- * @group Category_Management_(MX)
+ * @group Category_Management
* @ZephyrId MAGETWO-23290
*/
class UpdateCategoryEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
index ec87faa5f1155..131163311bcd2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
@@ -22,14 +22,13 @@
* 4. Navigate to compare page(click "compare product" link at the top of the page).
* 5. Perform all asserts.
*
- * @group Compare_Products_(MX)
+ * @group Compare_Products
* @ZephyrId MAGETWO-25843
*/
class AddCompareProductsTest extends AbstractCompareProductsTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
index 50819db0f1504..59f45bc004b82 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
@@ -20,14 +20,13 @@
* 2. Verify Cross-sell block on checkout page.
*
* @ZephyrId MAGETWO-12390
- * @group Cross-sells_(MX)
+ * @group Cross-sells
*/
class AddToCartCrossSellTest extends AbstractProductPromotedProductsTest
{
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.php
index 72a0b88ddf07e..ebc7360fe004b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.php
@@ -21,14 +21,13 @@
* 4. Click "Clear All" icon under the left menu tabs.
* 5. Perform assertions.
*
- * @group Compare_Products_(MX)
+ * @group Compare_Products
* @ZephyrId MAGETWO-25961
*/
class ClearAllCompareProductsTest extends AbstractCompareProductsTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
index 97b2a0715f7ca..c0cab5ef8e6b7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
@@ -21,7 +21,7 @@
* 5. Save Product.
* 6. Perform appropriate assertions.
*
- * @group Products_(CS)
+ * @group Products
* @ZephyrId MAGETWO-23414
*/
class CreateSimpleProductEntityTest extends Injectable
@@ -29,7 +29,6 @@ class CreateSimpleProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
index 86e45f9686ce1..290275ef4e872 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
@@ -23,7 +23,7 @@
* 5. Save product.
* 6. Verify created product.
*
- * @group Virtual_Product_(CS)
+ * @group Virtual_Product
* @ZephyrId MAGETWO-23417
*/
class CreateVirtualProductEntityTest extends Injectable
@@ -31,7 +31,6 @@ class CreateVirtualProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
index 70c1757b82db4..7026b757bb7de 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest.php
@@ -21,14 +21,13 @@
* 3. Click (X) icon near the $product from dataset.
* 4. Perform assertions.
*
- * @group Compare_Products_(MX)
+ * @group Compare_Products
* @ZephyrId MAGETWO-26161
*/
class DeleteCompareProductsTest extends AbstractCompareProductsTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.php
index bfc9e153a9e93..1a0c46b146faf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.php
@@ -23,14 +23,13 @@
* 5. Submit form.
* 6. Perform asserts.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-23272
*/
class DeleteProductEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
index dd0f5e221facb..bdf90b5df3bc5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
@@ -23,14 +23,13 @@
* 4. Click "Save & Duplicate".
* 5. Perform asserts.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-23294
*/
class DuplicateProductEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php
index 36c04d0bbbdf6..f7fd82e3342bf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php
@@ -28,14 +28,13 @@
* 9. Click on the "Save" button.
* 10. Perform asserts.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-21128
*/
class MassProductUpdateTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
index 53451339e075a..49fec0876e48f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
@@ -20,14 +20,13 @@
* 3. Verify checkout cart.
*
* @ZephyrId MAGETWO-12392
- * @group Related_Products_(MX)
+ * @group Related_Products
*/
class NavigateRelatedProductsTest extends AbstractProductPromotedProductsTest
{
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
index 53e3a57a2e8bc..37d8c9dc91d0c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
@@ -17,14 +17,13 @@
* 1. Navigate through up-sell products.
*
* @ZephyrId MAGETWO-12391
- * @group Up-sells_(MX)
+ * @group Up-sells
*/
class NavigateUpSellProductsTest extends AbstractProductPromotedProductsTest
{
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
index 5a97e8922ce77..c8189cd50ebf3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
@@ -22,14 +22,13 @@
* 5. Save
* 6. Perform all assertions
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-29398
*/
class ProductTypeSwitchingOnCreationTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index 55814088db481..7c134c2902c33 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -30,14 +30,13 @@
* 6. Save
* 7. Perform all assertions
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-29633
*/
class ProductTypeSwitchingOnUpdateTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
index d2730644dc6bf..f68ec539c62e0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
@@ -25,7 +25,7 @@
* 5. Click "Save".
* 6. Perform asserts.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-23544, MAGETWO-21125
*/
class UpdateSimpleProductEntityTest extends Injectable
@@ -33,7 +33,6 @@ class UpdateSimpleProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
index 43d44b577ab66..ddd788d7ee1c9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
@@ -30,14 +30,13 @@
* 5. Click "Save".
* 6. Perform asserts.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-26204
*/
class UpdateVirtualProductEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.php
index eff2ef2a6972b..a8c375ba2d849 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.php
@@ -14,14 +14,13 @@
* 1. Login to backend.
* 2. Navigate to PRODUCTS -> Catalog.
*
- * @group Products_(MX)
+ * @group Products
* @ZephyrId MAGETWO-37146
*/
class ValidateOrderOfProductTypeTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
index a20282f786a25..d3bd8f44adb74 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
@@ -25,14 +25,13 @@
* 6. Save new Attribute Set.
* 7. Verify created Attribute Set.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-25104
*/
class CreateAttributeSetEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
index e40006301ffff..0a85628c5e708 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
@@ -24,14 +24,13 @@
* 8. Save product.
* 7. Perform appropriate assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-30528
*/
class CreateProductAttributeEntityFromProductPageTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
index 034acb5918b41..22325ead5f5f7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
@@ -17,14 +17,13 @@
* 5. Save Product Attribute.
* 6. Perform appropriate assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-24767
*/
class CreateProductAttributeEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
index e8f20837bf384..11958cc2c1e87 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
@@ -24,14 +24,13 @@
* 5. Click on the "Delete Attribute" button.
* 6. Perform all assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-26011
*/
class DeleteAssignedToTemplateProductAttributeTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
index b71e751015db0..b097dc4681b16 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -27,14 +27,13 @@
* 4. Click 'Delete' button.
* 5. Perform all assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-25473
*/
class DeleteAttributeSetTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
index 0b0e078015a22..737a086dbb7e9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
@@ -23,14 +23,13 @@
* 5. Click on the "Delete Attribute" button.
* 6. Perform all assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-24998
*/
class DeleteProductAttributeEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
index e57a00a9d68ab..20fee003a576d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
@@ -20,14 +20,13 @@
* 4. Click on line with search results.
* 5. Perform assertion.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-24771
*/
class DeleteSystemProductAttributeTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
index 40c05f9f75a8d..baf9a238c6bc0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
@@ -28,14 +28,13 @@
* 5. Click on the "Delete Attribute" button.
* 6. Perform asserts.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-26652
*/
class DeleteUsedInConfigurableProductAttributeTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
index 37ebda4406c3c..af6b5747819cd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
@@ -29,14 +29,13 @@
* 7. Save Attribute Set.
* 8. Preform all assertions.
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-26251
*/
class UpdateAttributeSetTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
index e30bb6622af66..399b918078f22 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
@@ -28,14 +28,13 @@
* 5. Click 'Save Attribute' button
* 6. Perform all assertions
*
- * @group Product_Attributes_(MX)
+ * @group Product_Attributes
* @ZephyrId MAGETWO-23459
*/
class UpdateProductAttributeEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
index 1da500b386454..4a4c6a25321c8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
@@ -23,7 +23,7 @@
* 2. Create simple product.
* 3. Perform all assertions.
*
- * @group Catalog_Price_Rules_(MX)
+ * @group Catalog_Price_Rules
* @ZephyrId MAGETWO-24780
*/
class ApplyCatalogPriceRulesTest extends AbstractCatalogRuleEntityTest
@@ -31,7 +31,6 @@ class ApplyCatalogPriceRulesTest extends AbstractCatalogRuleEntityTest
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.php
index bbab44b01d514..f5efc258fbdbf 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.php
@@ -20,7 +20,7 @@
* 5. Save rule.
* 6. Perform appropriate assertions.
*
- * @group Catalog_Price_Rules_(MX)
+ * @group Catalog_Price_Rules
* @ZephyrId MAGETWO-24341
*/
class CreateCatalogPriceRuleEntityTest extends AbstractCatalogRuleEntityTest
@@ -28,7 +28,6 @@ class CreateCatalogPriceRuleEntityTest extends AbstractCatalogRuleEntityTest
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
index 89dd079aecdd5..a2d0ff9500d4c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click on the "Delete" button.
* 5. Perform all assertions.
*
- * @group Catalog_Price_Rules_(MX)
+ * @group Catalog_Price_Rules
* @ZephyrId MAGETWO-25211
*/
class DeleteCatalogPriceRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.php
index 2f04d13ca445e..8ca54baed577c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.php
@@ -25,14 +25,13 @@
* 6. Create simple product with category.
* 7. Perform all asserts.
*
- * @group Catalog_Price_Rules_(MX)
+ * @group Catalog_Price_Rules
* @ZephyrId MAGETWO-25187
*/
class UpdateCatalogPriceRuleEntityTest extends AbstractCatalogRuleEntityTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
index 90234c28627ce..a3e5a4ba850d4 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
@@ -23,14 +23,13 @@
* 4. Click "Search" button
* 5. Perform all asserts
*
- * @group Search_Frontend_(MX)
+ * @group Search_Frontend
* @ZephyrId MAGETWO-24729
*/
class AdvancedSearchEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
index a6853a8c4758d..f6ffd84c0b4e9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
@@ -23,14 +23,13 @@
* 7. Save the Search Term.
* 8. Perform all assertions.
*
- * @group Search_Terms_(MX)
+ * @group Search_Terms
* @ZephyrId MAGETWO-26165
*/
class CreateSearchTermEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
index d646ffc6c4aaf..ab5fb5f5bcd4d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
@@ -26,14 +26,13 @@
* 4. Click "Delete Search" button
* 5. Perform all assertions
*
- * @group Search_Terms_(MX)
+ * @group Search_Terms
* @ZephyrId MAGETWO-26491
*/
class DeleteSearchTermEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
index c64d5f5d72aef..5f41d187564f9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
@@ -27,14 +27,13 @@
* 5. Submit form
* 6. Perform all assertions
*
- * @group Search_Terms_(MX)
+ * @group Search_Terms
* @ZephyrId MAGETWO-26599
*/
class MassDeleteSearchTermEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
index 77aa6b169cbb7..c845e7f0bfe85 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
@@ -19,14 +19,13 @@
* 2. Input test data into "search field" and press Enter key.
* 3. Perform all assertions.
*
- * @group Search_Frontend_(MX)
+ * @group Search_Frontend
* @ZephyrId MAGETWO-25095
*/
class SearchEntityResultsTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
index 285fb7b3daf65..42c1683a6cd14 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
@@ -21,14 +21,13 @@
* 2. Input in "Search" field test data.
* 3. Perform asserts.
*
- * @group Search_Frontend_(CS)
+ * @group Search_Frontend
* @ZephyrId MAGETWO-24671
*/
class SuggestSearchingResultEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.php
index b58fc2083a400..291f71322ded5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.php
@@ -26,14 +26,13 @@
* 7. Save the Search Term.
* 8. Perform all assertions.
*
- * @group Search_Terms_(MX)
+ * @group Search_Terms
* @ZephyrId MAGETWO-26100
*/
class UpdateSearchTermEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 8eed34db7e349..0733d778b9662 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -23,14 +23,13 @@
* 3. Add to cart test product
* 4. Perform all asserts
*
- * @group Shopping_Cart_(CS)
+ * @group Shopping_Cart
* @ZephyrId MAGETWO-25382
*/
class AddProductsToShoppingCartEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
index 4997ed168f325..f2a809656ed65 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
@@ -25,14 +25,13 @@
* 4. Click Ok
* 5. Perform all assertions
*
- * @group Mini_Shopping_Cart_(CS)
+ * @group Mini_Shopping_Cart
* @ZephyrId MAGETWO-29104
*/
class DeleteProductFromMiniShoppingCartTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
index 40edbd64dd01e..ae48e6e6b7948 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
@@ -23,14 +23,13 @@
* 2. Click 'Remove item' button from Shopping Cart for each product(s)
* 3. Perform all asserts
*
- * @group Shopping_Cart_(CS)
+ * @group Shopping_Cart
* @ZephyrId MAGETWO-25218
*/
class DeleteProductsFromShoppingCartTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
index 40789d462d16c..58d0c23f2274f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
@@ -32,7 +32,7 @@
* 13. Place order.
* 14. Perform assertions.
*
- * @group One_Page_Checkout_(CS)
+ * @group One_Page_Checkout
* @ZephyrId MAGETWO-27485, MAGETWO-12412, MAGETWO-12429
* @ZephyrId MAGETWO-12444, MAGETWO-12848, MAGETWO-12849, MAGETWO-12850
*/
@@ -40,7 +40,6 @@ class OnePageCheckoutTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
index 709b131c95655..62d773a6637bf 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -25,14 +25,13 @@
* 4. Click Update.
* 5. Perform all assertions.
*
- * @group Mini_Shopping_Cart_(CS)
+ * @group Mini_Shopping_Cart
* @ZephyrId MAGETWO-29812
*/
class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 89563fe97ba24..809688cd8286a 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -26,14 +26,13 @@
* 4. Click "Update Shopping Cart" button
* 5. Perform all assertion from dataset
*
- * @group Shopping_Cart_(CS)
+ * @group Shopping_Cart
* @ZephyrId MAGETWO-25081
*/
class UpdateShoppingCartTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php
index 6cb7dac085389..21f48abef963d 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php
@@ -19,14 +19,13 @@
* 4. Save
* 5. Perform all assertions
*
- * @group Terms_and_Conditions_(CS)
+ * @group Terms_and_Conditions
* @ZephyrId MAGETWO-29586, MAGETWO-32499
*/
class CreateTermEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php
index ab9c1484ef37d..2c65150aa6973 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php
@@ -19,14 +19,13 @@
* 3. Click on 'Delete' button.
* 4. Perform all assertions.
*
- * @group Terms_and_Conditions_(CS)
+ * @group Terms_and_Conditions
* @ZephyrId MAGETWO-29687
*/
class DeleteTermEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php
index 1a054cd8991be..277f38e0c7e1f 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php
@@ -20,14 +20,13 @@
* 4. Save
* 5. Perform all assertions
*
- * @group Terms_and_Conditions_(CS)
+ * @group Terms_and_Conditions
* @ZephyrId MAGETWO-29635
*/
class UpdateTermEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
index 33824a8a84ffd..7e3c3f0ebb3c9 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
@@ -19,14 +19,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-25578
*/
class CreateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
index ca6f7a8d3f6e1..f5035a2eaf76d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
@@ -21,14 +21,13 @@
* 5. Save CMS Page.
* 6. Verify created CMS Page.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-25580
*/
class CreateCmsPageEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php
index d4d15290d7ba6..296525540073f 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php
@@ -25,14 +25,13 @@
* 7. Save Rewrite.
* 8. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-24847
*/
class CreateCmsPageRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
index c4897ea36269d..ad2ae5689c985 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click "Delete Block".
* 5. Perform all assertions.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-25698
*/
class DeleteCmsBlockEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
index 1a52df3142f8c..25225917014fc 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
@@ -22,14 +22,13 @@
* 4. Click "Delete Page" button.
* 5. Perform all assertions.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-23291
*/
class DeleteCmsPageEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.php
index ac8f69b3fb50a..68d0ae541253d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.php
@@ -23,14 +23,13 @@
* 4. Delete Redirect.
* 5. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-25915
*/
class DeleteCmsPageUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
index f42078879c59d..8fa92fba59f8e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
@@ -20,14 +20,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-25941
*/
class UpdateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
index 280b2cd915a06..b16f4384f27d5 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
@@ -24,14 +24,13 @@
* 5. Click 'Save' CMS Page.
* 6. Perform asserts.
*
- * @group CMS_Content_(PS)
+ * @group CMS_Content
* @ZephyrId MAGETWO-25186
*/
class UpdateCmsPageEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
index edec851d86615..43fd7e69ac359 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
@@ -28,14 +28,13 @@
* 5. Save Redirect.
* 6. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-26173
*/
class UpdateCmsPageRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
index c800c8b1bfef5..e72b98c93b93d 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
@@ -33,7 +33,7 @@
* 6. Save product
* 7. Perform all assertions
*
- * @group Configurable_Product_(MX)
+ * @group Configurable_Product
* @ZephyrId MAGETWO-26041
*/
class CreateConfigurableProductEntityTest extends Injectable
@@ -41,7 +41,6 @@ class CreateConfigurableProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
index e9014ca2476cb..7ff2be303d677 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
@@ -25,14 +25,13 @@
* 5. Save product.
* 6. Perform all assertions.
*
- * @group Configurable_Product_(MX)
+ * @group Configurable_Product
* @ZephyrId MAGETWO-29916
*/
class UpdateConfigurableProductEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
index f98745d22e1a3..14a9d6f283b27 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php
@@ -20,14 +20,13 @@
* 4. Click 'Save Currency Symbols' button
* 5. Perform all asserts.
*
- * @group Currency_(PS)
+ * @group Currency
* @ZephyrId MAGETWO-26600
*/
class EditCurrencySymbolEntityTest extends AbstractCurrencySymbolEntityTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
index 25895dc27e772..8740b0000ff58 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php
@@ -21,14 +21,13 @@
* 4. Click 'Save Currency Symbols' button
* 5. Perform all asserts.
*
- * @group Currency_(PS)
+ * @group Currency
* @ZephyrId MAGETWO-26638
*/
class ResetCurrencySymbolEntityTest extends AbstractCurrencySymbolEntityTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ApplyVatIdTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ApplyVatIdTest.php
index bc0fea4b563d3..8f5b671fec904 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ApplyVatIdTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ApplyVatIdTest.php
@@ -25,14 +25,13 @@
* 5. Save Customer Address.
* 6. Perform assertions.
*
- * @group VAT_ID_(CS)
+ * @group VAT_ID
* @ZephyrId MAGETWO-12447
*/
class ApplyVatIdTest extends AbstractApplyVatIdTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php
index ecc981db97251..a8774bb99569d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php
@@ -26,14 +26,13 @@
* 4. Fill form according to data set and save
* 5. Perform all assertions
*
- * @group Customer_Account_(CS)
+ * @group Customer_Account
* @ZephyrId MAGETWO-29411
*/
class ChangeCustomerPasswordTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
index 0ad79c4c4933a..bf3ae060a6d1b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -27,7 +27,6 @@ class CreateCustomerBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
index 25ff9ff25db04..64051195daa32 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -22,14 +22,13 @@
* 5.Click "Save Customer Group" button.
* 6.Perform all assertions.
*
- * @group Customer_Groups_(CS)
+ * @group Customer_Groups
* @ZephyrId MAGETWO-23422
*/
class CreateCustomerGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.php
index 502e9d0609208..1f13c6ccdacdc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.php
@@ -29,7 +29,6 @@ class CreateExistingCustomerBackendEntity extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
index 25108d19534f1..7ac9b5284b3f0 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
@@ -23,14 +23,13 @@
* 4. Click 'Create account' button.
* 5. Perform assertions.
*
- * @group Customer_Account_(CS)
+ * @group Customer_Account
* @ZephyrId MAGETWO-23545
*/
class CreateExistingCustomerFrontendEntity extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
index 7943a1d993265..61771665c059e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
@@ -23,14 +23,13 @@
* 4. Delete second address - click 'Delete Address' button.
* 5. Perform all assertions.
*
- * @group Customers_(CS)
+ * @group Customers
* @ZephyrId MAGETWO-28066
*/
class DeleteCustomerAddressTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
index c22526ed1a078..3e6916eb2b252 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
@@ -25,14 +25,13 @@
* 4. Fill in data according to dataset
* 5. Perform all assertions according to dataset
*
- * @group Customers_(CS)
+ * @group Customers
* @ZephyrId MAGETWO-24764
*/
class DeleteCustomerBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
index 0622ceb028f60..f8c426a3efb00 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -24,14 +24,13 @@
* 5. Confirm in pop-up.
* 6. Perform all assertions.
*
- * @group Customer_Groups_(CS)
+ * @group Customer_Groups
* @ZephyrId MAGETWO-25243
*/
class DeleteCustomerGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
index 5d26493333672..a9e09d24fb07f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
@@ -17,14 +17,13 @@
* 3. Select system Customer Group specified in data set from grid.
* 4. Perform all assertions.
*
- * @group Customer_Groups_(CS)
+ * @group Customer_Groups
* @ZephyrId MAGETWO-53576
*/
class DeleteSystemCustomerGroupTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
index 67afe99b20274..d257805dc5491 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
@@ -20,14 +20,13 @@
* 3. Click forgot password button.
* 4. Check forgot password message.
*
- * @group Customer_(CS)
+ * @group Customer
* @ZephyrId MAGETWO-37145
*/
class ForgotPasswordOnFrontendTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
index de458ff0a8be1..f7448024b93aa 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
@@ -29,14 +29,13 @@
* 6. Click "Submit" button
* 7. Perform all assertions
*
- * @group Customer_Groups_(CS), Customers_(CS)
+ * @group Customer_Groups, Customers
* @ZephyrId MAGETWO-27892
*/
class MassAssignCustomerGroupTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
index 37431c7878e3b..598a44657246b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
@@ -27,14 +27,13 @@
* 5. Click Submit button
* 6. Perform all assertions according to dataset
*
- * @group Customers_(CS)
+ * @group Customers
* @ZephyrId MAGETWO-26848
*/
class MassDeleteCustomerBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
index b5be83035f01f..b2bad9a3bd31b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
@@ -20,14 +20,13 @@
* 4. Click 'Create account' button.
* 5. Perform assertions.
*
- * @group Customer_Account_(CS)
+ * @group Customer_Account
* @ZephyrId MAGETWO-23546
*/
class RegisterCustomerFrontendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
index fcc523db65c41..d6820720d89bc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
@@ -31,7 +31,6 @@ class UpdateCustomerBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
@@ -101,23 +100,45 @@ private function prepareCustomer(
: $initialCustomer->getData();
$groupId = $customer->hasData('group_id') ? $customer : $initialCustomer;
$data['group_id'] = ['customerGroup' => $groupId->getDataFieldConfig('group_id')['source']->getCustomerGroup()];
+ $customerAddress = $this->prepareCustomerAddress($initialCustomer, $address, $addressToDelete);
+ if (!empty($customerAddress)) {
+ $data['address'] = $customerAddress;
+ }
+
+ return $this->fixtureFactory->createByCode(
+ 'customer',
+ ['data' => $data]
+ );
+ }
+
+ /**
+ * Prepare address for customer entity.
+ *
+ * @param Customer $initialCustomer
+ * @param Address|null $address
+ * @param Address|null $addressToDelete
+ * @return array
+ */
+ private function prepareCustomerAddress(
+ Customer $initialCustomer,
+ Address $address = null,
+ Address $addressToDelete = null
+ ) {
+ $customerAddress = [];
if ($initialCustomer->hasData('address')) {
$addressesList = $initialCustomer->getDataFieldConfig('address')['source']->getAddresses();
foreach ($addressesList as $key => $addressFixture) {
if ($addressToDelete === null || $addressFixture != $address) {
- $data['address'] = ['addresses' => [$key => $addressFixture]];
+ $customerAddress = ['addresses' => [$key => $addressFixture]];
}
}
}
if ($address !== null) {
- $data['address']['addresses'][] = $address;
+ $customerAddress['addresses'][] = $address;
}
- return $this->fixtureFactory->createByCode(
- 'customer',
- ['data' => $data]
- );
+ return $customerAddress;
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
index c3b50d4371f33..34338371d45af 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -29,7 +29,7 @@
* 6. Fill fields with test data and save.
* 7. Perform all assertions.
*
- * @group Customer_Account_(CS)
+ * @group Customer_Account
* @ZephyrId MAGETWO-25925
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -38,7 +38,6 @@ class UpdateCustomerFrontendEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
index 548333915c690..7fda95c0be7d2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -25,14 +25,13 @@
* 5. Click "Save Customer Group" button
* 6. Perform all assertions
*
- * @group Customer_Groups_(CS)
+ * @group Customer_Groups
* @ZephyrId MAGETWO-25536
*/
class UpdateCustomerGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
index 243b856448146..dfe3afca43f0d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
@@ -17,14 +17,13 @@
* 3. Select system Customer Group specified in data set from grid.
* 4. Perform all assertions.
*
- * @group Customer_Groups_(CS)
+ * @group Customer_Groups
* @ZephyrId MAGETWO-52481
*/
class VerifyDisabledCustomerGroupFieldTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
index 15567c4ef8d16..4d397bde28bf6 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php
@@ -24,14 +24,13 @@
* 4. Click on 'Save Currency Rates' button.
* 5. Perform assertions.
*
- * @group Localization_(PS)
+ * @group Localization
* @ZephyrId MAGETWO-36824
*/
class CreateCurrencyRateTest extends Injectable
{
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
index 117f045487735..7cc3fd6375c3c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
@@ -22,7 +22,7 @@
* 6. Save product.
* 7. Verify created product.
*
- * @group Downloadable_Product_(MX)
+ * @group Downloadable_Product
* @ZephyrId MAGETWO-23425
*/
class CreateDownloadableProductEntityTest extends Injectable
@@ -30,7 +30,6 @@ class CreateDownloadableProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
index 6eb17b87a74e9..276cc08e8efb7 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
@@ -30,14 +30,13 @@
* 5. Click "Save".
* 6. Perform asserts.
*
- * @group Downloadable_Product_(MX)
+ * @group Downloadable_Product
* @ZephyrId MAGETWO-24775
*/
class UpdateDownloadableProductEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
index 4d349580bd74b..e33adb68be4eb 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
@@ -22,14 +22,13 @@
* 4. Complete Checkout steps
* 5. Perform all asserts
*
- * @group Gift_Messages_(CS)
+ * @group Gift_Messages
* @ZephyrId MAGETWO-28978
*/
class CheckoutWithGiftMessagesTest extends Scenario
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
const TO_MAINTAIN = 'yes'; // Consider variation #2 to work correctly with Virtual products
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
index 7126dfa00a9f2..bbe3b5ace0e83 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
@@ -29,7 +29,7 @@
* 7. Save the Product.
* 8. Perform assertions.
*
- * @group Grouped_Product_(MX)
+ * @group Grouped_Product
* @ZephyrId MAGETWO-24877
*/
class CreateGroupedProductEntityTest extends Injectable
@@ -37,7 +37,6 @@ class CreateGroupedProductEntityTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
index 36c67db2ec306..224fcbd3170bb 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
@@ -23,14 +23,13 @@
* 5. Save the Product.
* 6. Perform all assertions.
*
- * @group Grouped_Product_(MX)
+ * @group Grouped_Product
* @ZephyrId MAGETWO-26462
*/
class UpdateGroupedProductEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 427bec3528169..f7931b03e3def 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -37,7 +37,7 @@
* 12. Click "Next" and on the "Step 6: Install" page click "Install Now" button.
* 13. Perform assertions.
*
- * @group Installer_and_Upgrade/Downgrade_(PS)
+ * @group Installer_and_Upgrade/Downgrade
* @ZephyrId MAGETWO-31431
*/
class InstallTest extends Injectable
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
index b6e81512c9f32..b8fa9638dc21e 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
@@ -20,14 +20,13 @@
* 3. Click on the "Activate" link near required integration.
* 4. Perform all assertions.
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-26119
*/
class ActivateIntegrationEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
index 53e6c9fef1332..d7bd5b93ef0c6 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
@@ -20,14 +20,13 @@
* 5. Click "Save" button.
* 6. Perform all assertions.
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-26009, MAGETWO-16755, MAGETWO-16819, MAGETWO-16820
*/
class CreateIntegrationEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.php
index 2f5b450f7bd3d..52d6dea9a13ac 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.php
@@ -23,14 +23,13 @@
* 8. Click "Save" button
* 9. Perform all assertions
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-16756
*/
class CreateIntegrationWithDuplicatedNameTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
index 894cdccadd6be..c2878aeda72e4 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
@@ -21,14 +21,13 @@
* 4. Click "Delete" button.
* 5. Perform all assertions.
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-26058
*/
class DeleteIntegrationEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
index ed373ed2a58cb..2af446b97b0cf 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
@@ -23,14 +23,13 @@
* 4. Click Done.
* 5. Perform assertions.
*
- * @group Integrations_(PS)
+ * @group Integrations
* @ZephyrId MAGETWO-29648
*/
class ReAuthorizeTokensIntegrationEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
index fc246582127fc..a349ba3865083 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
@@ -23,14 +23,13 @@
* 5. Click "Save" button.
* 6. Perform all assertions.
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-26102
*/
class UpdateIntegrationEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
index 976d52fb0f156..543880aea1273 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.php
@@ -20,13 +20,12 @@
* 2. Create product with created category.
* 3. Perform all assertions.
*
- * @group Layered_Navigation_(MX)
+ * @group Layered_Navigation
* @ZephyrId MAGETWO-12419
*/
class FilterProductListTest extends Injectable
{
/* tags */
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php
index 19332e899e1ab..f6f9c912f358d 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php
@@ -13,13 +13,12 @@
* 1. Create product.
* 2. Perform all assertions.
*
- * @group MAP_(MX)
+ * @group MAP
* @ZephyrId MAGETWO-12430, MAGETWO-12847
*/
class ApplyMapTest extends Injectable
{
/* tags */
- const DOMAIN = 'MX';
const MVP = 'yes';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
index 99d9fff1465d4..a79ea3995eeff 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
@@ -24,14 +24,13 @@
* 4. Select action in action dropdown for created template according to dataset
* 5. Perform all assertions
*
- * @group Newsletters_(MX)
+ * @group Newsletters
* @ZephyrId MAGETWO-27043
*/
class ActionNewsletterTemplateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
index 314670ad2d177..62fb186a3c674 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
@@ -22,14 +22,13 @@
* 5. Save.
* 6. Perform asserts.
*
- * @group Newsletters_(MX)
+ * @group Newsletters
* @ZephyrId MAGETWO-23302
*/
class CreateNewsletterTemplateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php
index bd30c443ca0c1..2ec44f0e30313 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php
@@ -25,14 +25,13 @@
* 4. Click "Preview Template" button at the top of the page
* 5. Perform all assertions
*
- * @group Newsletters_(MX)
+ * @group Newsletters
* @ZephyrId MAGETWO-51979
*/
class PreviewNewsletterTemplateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
index ed27d43681e08..f6d29ba6a843b 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
@@ -27,14 +27,13 @@
* 5. Click 'Save Template' button
* 6. Perform asserts
*
- * @group Newsletters_(MX)
+ * @group Newsletters
* @ZephyrId MAGETWO-29427
*/
class UpdateNewsletterTemplateTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.php
index af7cdfc69979a..8fd543d88a8af 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.php
@@ -22,7 +22,6 @@ class FlushAdditionalCachesTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.php
index f07546b100640..28090b8662903 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.php
@@ -21,7 +21,6 @@ class FlushStaticFilesCacheButtonVisibilityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
index be6c223a2503c..c8fb3e4f30f19 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
@@ -22,14 +22,13 @@
* 5. Process checkout via PayPal.
* 6. Perform asserts.
*
- * @group PayPal_(CS)
+ * @group PayPal
* @ZephyrId MAGETWO-12415
*/
class ExpressCheckoutFromProductPageTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
index fc85feb524baf..7fc35ff1eb6fd 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
@@ -22,14 +22,13 @@
* 5. Process checkout via PayPal.
* 6. Perform asserts.
*
- * @group PayPal_(CS)
+ * @group PayPal
* @ZephyrId MAGETWO-12414
*/
class ExpressCheckoutFromShoppingCartTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
index f57544ae5a663..b40adf986dbe9 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
@@ -26,14 +26,13 @@
* 5. Process checkout via PayPal.
* 6. Perform asserts.
*
- * @group PayPal_(CS)
+ * @group PayPal
* @ZephyrId MAGETWO-12413, MAGETWO-14359, MAGETWO-12996
*/
class ExpressCheckoutOnePageTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
index 9637d95a7216b..07f03b1c931cf 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
@@ -23,14 +23,13 @@
* 5. Click "Cancel".
* 6. Perform asserts.
*
- * @group PayPal_(CS)
+ * @group PayPal
* @ZephyrId MAGETWO-47213
*/
class InContextExpressCheckoutFromShoppingCartTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
index 1cc9e00df7ec9..ff06e6b10266e 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
@@ -23,14 +23,13 @@
* 5. Click "Cancel".
* 6. Perform asserts.
*
- * @group PayPal_(CS)
+ * @group PayPal
* @ZephyrId MAGETWO-47261
*/
class InContextExpressOnePageCheckoutTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.php
index e0fff16f9cbd5..c5175df4ad078 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/AddProductVideoTest.php
@@ -24,7 +24,7 @@
* 6. Click "Save" button on product page.
* 7. Perform asserts.
*
- * @group ProductVideo_(MX)
+ * @group ProductVideo
* @ZephyrId MAGETWO-43673
*/
class AddProductVideoTest extends Injectable
@@ -32,7 +32,6 @@ class AddProductVideoTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.php
index 63f3fa8f4f49a..ebc5e0ccf93b4 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/DeleteProductVideoTest.php
@@ -26,7 +26,7 @@
* 8. Click "Save" button on product page.
* 9. Perform asserts.
*
- * @group ProductVideo_(MX)
+ * @group ProductVideo
* @ZephyrId MAGETWO-43660
*/
class DeleteProductVideoTest extends Injectable
@@ -34,7 +34,6 @@ class DeleteProductVideoTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
index b6c4fdc25dc78..30df076817dff 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.php
@@ -27,7 +27,7 @@
* 9. Click "Save" button on product page
* 10. Perform asserts.
*
- * @group ProductVideo_(MX)
+ * @group ProductVideo
* @ZephyrId MAGETWO-43664, @ZephyrId MAGETWO-43656, @ZephyrId MAGETWO-43661, @ZephyrId MAGETWO-43663
*/
class UpdateProductVideoTest extends Injectable
@@ -35,7 +35,6 @@ class UpdateProductVideoTest extends Injectable
/* tags */
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index 20feecc8a5431..5930e63b9d3bd 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -27,14 +27,13 @@
* 3. Click "Reset Filter".
* 4. Perform all assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28558
*/
class AbandonedCartsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/BestsellerProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/BestsellerProductsReportEntityTest.php
index 317ea3cd16c10..3eb5237eddd97 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/BestsellerProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/BestsellerProductsReportEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click "Show report".
* 5. Perform all assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28222
*/
class BestsellerProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
index e27ddbd5be6c4..cacb6e5a329bf 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click button Refresh
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28521
*/
class CustomersOrderCountReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.php
index fe4454065b7f9..c366cedb3c3a9 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderTotalReportEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click button Refresh
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28358
*/
class CustomersOrderTotalReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
index 97ea72404ecdd..97dc365d62338 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
@@ -25,14 +25,13 @@
* 2. Go to Reports > Products > Downloads.
* 3. Perform all assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28823
*/
class DownloadProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
index b925a6f049c13..0dd87bde327c9 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
@@ -18,14 +18,13 @@
* 2. Open Reports > Low Stock.
* 3. Perform appropriate assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-27193
*/
class LowStockProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
index 2c24ef791c629..bb5f8644d4359 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
@@ -23,14 +23,13 @@
* 4. Click "Refresh button".
* 5. Perform all assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-27742
*/
class NewAccountsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
index ca1b3594b118a..7d0d13862e772 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
@@ -21,14 +21,13 @@
* 4. Click "Refresh button"
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28200
*/
class OrderedProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
index fb8007bc24434..148c0a69cecaa 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
@@ -25,14 +25,13 @@
* 4. Add product to cart as unregistered customer
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-27952
*/
class ProductsInCartReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ReviewReportEntityTest.php
index 9ed56a46e565e..376e5662320b8 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ReviewReportEntityTest.php
@@ -29,7 +29,7 @@
* 4. Click Submit review.
* 5. Perform appropriate assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-27555
* @ZephyrId MAGETWO-27223
*
@@ -39,7 +39,6 @@ class ReviewReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
index de3f9e60f3fba..0d59b989fc25f 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.php
@@ -27,14 +27,13 @@
* 4. Click "Show report"
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28190
*/
class SalesCouponReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
index 6e480ca94bc84..3ebfd4746a858 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
@@ -30,14 +30,13 @@
* 4. Click "Show Report"
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-29216
*/
class SalesInvoiceReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php
index 014148b561ead..c1eb4e8b35c3f 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php
@@ -30,14 +30,13 @@
* 4. Click "Show Report"
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-29136
*/
class SalesOrderReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php
index 2b411a19c22ed..692e9024a2212 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php
@@ -29,14 +29,13 @@
* 4. Click button Show Report
* 5. Perform Asserts
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-29348
*/
class SalesRefundsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
index 844a30bed98a3..0d5249ef4d06f 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
@@ -32,7 +32,7 @@
* 4. Click "Show report".
* 5. Perform all assertions.
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-28515
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -41,7 +41,6 @@ class SalesTaxReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
index 69ed5fbce7d24..1175942452f89 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
@@ -21,14 +21,13 @@
* 3. Navigate to: Reports > Search Terms.
* 4. Perform appropriate assertions.
*
- * @group Search_Terms_(MX)
+ * @group Search_Terms
* @ZephyrId MAGETWO-27106
*/
class SearchTermsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
index 3f45a0541fe7c..905fa8fb70f0c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
@@ -26,14 +26,13 @@
* 4. Click "Show report"
* 5. Perform all assertions
*
- * @group Reports_(MX)
+ * @group Reports
* @ZephyrId MAGETWO-27954
*/
class ViewedProductsReportEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
@@ -63,6 +62,7 @@ class ViewedProductsReportEntityTest extends Injectable
* @var CatalogProductIndex
*/
protected $catalogProductIndexPage;
+
/**
* Catalog product index page
*
@@ -150,7 +150,11 @@ protected function openProducts(array $products, $total)
foreach ($products as $key => $product) {
for ($i = 0; $i < $total[$key]; $i++) {
$this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
- $this->assertEquals($product->getName(), $this->cmsIndex->getTitleBlock()->getTitle(), 'Could not open product page');
+ $this->assertEquals(
+ $product->getName(),
+ $this->cmsIndex->getTitleBlock()->getTitle(),
+ 'Could not open product page.'
+ );
}
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
index f25b46c53123a..648de4bf40183 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
@@ -25,14 +25,13 @@
* 5. Save Rating.
* 6. Perform asserts.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-23331
*/
class CreateProductRatingEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
index d7de5f52103d8..aeeff3480e4a6 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
@@ -27,14 +27,13 @@
* 6. Click "Save Review" button.
* 7. Perform Asserts.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-26476
*/
class CreateProductReviewBackendEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
index fa46c5d51583b..2e764636789e1 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
@@ -27,14 +27,13 @@
* 5. click "Submit review".
* 6. Perform all assertions.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-25519
*/
class CreateProductReviewFrontendEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
index 71fcc265d9af2..316af94078849 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
@@ -24,14 +24,13 @@
* 5. Click 'Delete Rating' button.
* 6. Perform all asserts.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-23276
*/
class DeleteProductRatingEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index 09ed2350b0c1f..fc58266356223 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -34,7 +34,7 @@
* 7. Click "Submit review".
* 8. Perform all assertions.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-27625
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -43,7 +43,6 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
index 0cc043c4c3388..027b299e71072 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
@@ -26,14 +26,13 @@
* 6. Click "Submit" button.
* 7. Perform Asserts.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-26618
*/
class MassActionsProductReviewEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
index d0dcf9a14eb2a..dbe89b387e615 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
@@ -24,14 +24,13 @@
* 5. Save.
* 6. Perform all assertions.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-26768
*/
class ModerateProductReviewEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
index 555217246c65b..9f343bdfc10fe 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
@@ -28,7 +28,7 @@
* 6. Save changes.
* 7. Perform all assertions.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-27743
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -36,7 +36,6 @@ class UpdateProductReviewEntityOnProductPageTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
index e82f3637a133a..a5901a6211a25 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
@@ -27,14 +27,13 @@
* 5. Click "Submit review".
* 6. Perform all assertions.
*
- * @group Reviews_and_Ratings_(MX)
+ * @group Reviews_and_Ratings
* @ZephyrId MAGETWO-25604
*/
class UpdateProductReviewEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php
index 62bc18ee07f1e..6d49174e069a6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php
@@ -29,7 +29,7 @@
* 7. Create Order.
* 8. Perform all assertions from dataset.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29382
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -37,7 +37,6 @@ class AssignCustomOrderStatusTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
index 91f697e332baa..1779ad437c76e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
@@ -24,14 +24,13 @@
* 4. Do cancel Order.
* 5. Perform all assetions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28191
*/
class CancelCreatedOrderTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
index 57f18d9e8644d..ed00a414bd0e6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
@@ -25,14 +25,13 @@
* 4. On order's page click 'Refund offline' button.
* 5. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29116
*/
class CreateCreditMemoEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
index 66ddf31ca0ebd..3dc689a385271 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
@@ -20,14 +20,13 @@
* 5. Save order status.
* 6. Verify created order status.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-23412
*/
class CreateCustomOrderStatusEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
index 1bde546b2d644..f62583583c3dc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php
@@ -23,14 +23,13 @@
* 5. Click 'Submit Invoice' button.
* 6. Perform assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28209
*/
class CreateInvoiceEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
index c871d382fbee9..c3b00b4b7f794 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOnlineInvoiceEntityTest.php
@@ -32,14 +32,13 @@
* 16. Click 'Submit Invoice' button.
* 17. Perform assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-47010
*/
class CreateOnlineInvoiceEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
index c5bd68ab71c07..284a09f42332f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.php
@@ -27,14 +27,13 @@
* 11. Submit Order.
* 12. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28696
*/
class CreateOrderBackendTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.php
index 9e6b2c9556a5d..8b45a8a22eecf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.php
@@ -24,14 +24,13 @@
* 4. Do 'Hold' for Order.
* 5. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28214
*/
class HoldCreatedOrderTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.php
index 5735c26625106..4f62fa07bba42 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.php
@@ -22,14 +22,13 @@
* 4. Submit.
* 5. Perform Asserts.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-27897
*/
class MassOrdersUpdateTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.php
index 7c41d7c1894ca..719ae58630513 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.php
@@ -26,14 +26,13 @@
* 5. Click Update Changes.
* 6. Perform all assertions.
*
- * @group Customers_(CS), Order_Management_(CS)
+ * @group Customers, Order_Management
* @ZephyrId MAGETWO-27640
*/
class MoveLastOrderedProductsOnOrderPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.php
index 6cfeabdd056ae..cedf2aeb71c58 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveProductsInComparedOnOrderPageTest.php
@@ -30,7 +30,7 @@
* 5. Click 'Update Changes'.
* 6. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28050
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -39,7 +39,6 @@ class MoveProductsInComparedOnOrderPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
index cd95ec1479ec8..49487ff1b2e8e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
@@ -31,7 +31,7 @@
* 5. Click 'Update Changes'.
* 6. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28109
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -40,7 +40,6 @@ class MoveRecentlyComparedProductsOnOrderPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.php
index 0118c2cdcc832..d6a4b685e5711 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyViewedProductsOnOrderPageTest.php
@@ -28,14 +28,13 @@
* 10. Click Update Items and Qty's button.
* 11. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29723
*/
class MoveRecentlyViewedProductsOnOrderPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
index 628cfa0871619..21a13d782e0d5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
@@ -29,7 +29,7 @@
* 5. Click Update Changes.
* 6. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28540
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -38,7 +38,6 @@ class MoveShoppingCartProductsOnOrderPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
index 753f4fa50c0f6..4e05d4025fce4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
@@ -25,14 +25,13 @@
* 5. Click on the "Print Order" button.
* 6. Perform appropriate assertions.v
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-30253
*/
class PrintOrderFrontendGuestTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.php
index 0ae9f844f88c8..60547dd9e03e1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/ReorderOrderEntityTest.php
@@ -21,14 +21,13 @@
* 4. Do 'Reorder' for placed order.
* 5. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29007
*/
class ReorderOrderEntityTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UnassignCustomOrderStatusTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UnassignCustomOrderStatusTest.php
index 85c492dcf0b88..de9939ce106ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UnassignCustomOrderStatusTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UnassignCustomOrderStatusTest.php
@@ -21,14 +21,13 @@
* 3. Click "Unassign" for appropriate status.
* 4. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29450
*/
class UnassignCustomOrderStatusTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UpdateCustomOrderStatusTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UpdateCustomOrderStatusTest.php
index 98726fbd9d31a..e5da53b48b74e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UpdateCustomOrderStatusTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UpdateCustomOrderStatusTest.php
@@ -27,14 +27,13 @@
* 5. Save order status.
* 6. Perform all assertions.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-29868
*/
class UpdateCustomOrderStatusTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.php
index 30f2a1546cb2e..a5a554f7a180b 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.php
@@ -21,14 +21,13 @@
* 2. Apply all created rules.
* 3. Perform all assertions.
*
- * @group Sales_Rules_(CS)
+ * @group Sales_Rules
* @ZephyrId MAGETWO-45883
*/
class ApplySeveralSalesRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
index 13281a69566f9..a07799d5f1ed7 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
@@ -27,14 +27,13 @@
* 3. Create Cart Price rule according to dataset and click "Save" button.
* 4. Perform asserts.
*
- * @group Shopping_Cart_Price_Rules_(CS)
+ * @group Shopping_Cart_Price_Rules
* @ZephyrId MAGETWO-24855
*/
class CreateSalesRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
index 7ac8c0621a4e7..7e0204a90d4e1 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
@@ -22,14 +22,13 @@
* 4. Click 'Delete' button.
* 5. Perform asserts.
*
- * @group Shopping_Cart_Price_Rules_(CS)
+ * @group Shopping_Cart_Price_Rules
* @ZephyrId MAGETWO-24985
*/
class DeleteSalesRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php
index 7107775cd9f98..95fae4642d878 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php
@@ -12,7 +12,6 @@ class OnePageCheckoutWithDiscountTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
/* end tags */
@@ -25,4 +24,4 @@ public function test()
{
$this->executeScenario();
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.php
index 2bf0cb6d2d539..92dc0f4f83956 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.php
@@ -24,14 +24,13 @@
* 5. Click 'Save' button.
* 6. Perform asserts.
*
- * @group Shopping_Cart_Price_Rules_(CS)
+ * @group Shopping_Cart_Price_Rules
* @ZephyrId MAGETWO-24860
*/
class UpdateSalesRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.php
index 462aa845e3ccc..ce2222ba3dd2c 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/CreateSynonymGroupEntityTest.php
@@ -22,14 +22,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group Search_(MX)
+ * @group Search
* @ZephyrId MAGETWO-47681
*/
class CreateSynonymGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/DeleteSynonymGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/DeleteSynonymGroupEntityTest.php
index d11a8213a96f0..7e6ec5c14da6d 100755
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/DeleteSynonymGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/DeleteSynonymGroupEntityTest.php
@@ -22,14 +22,13 @@
* 3. Delete created Synonym Group
* 4. Perform all assertions.
*
- * @group Search_(MX)
+ * @group Search
* @ZephyrId MAGETWO-47683
*/
class DeleteSynonymGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/MergeSynonymGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/MergeSynonymGroupEntityTest.php
index 207e84c5ffa19..4e9424a83be02 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/MergeSynonymGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/MergeSynonymGroupEntityTest.php
@@ -23,14 +23,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group Search_(MX)
+ * @group Search
* @ZephyrId MAGETWO-47684
*/
class MergeSynonymGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.php
index 984984ee25012..042a656339abb 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/UpdateSynonymGroupEntityTest.php
@@ -23,14 +23,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group Search_(MX)
+ * @group Search
* @ZephyrId MAGETWO-49412
*/
class UpdateSynonymGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
index 9a36e05e60aba..cc75c27949c0e 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
@@ -33,7 +33,6 @@ class LockAdminUserWhenCreatingNewIntegrationTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
index 03b38c58a9a1a..23a43100de854 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
@@ -33,7 +33,6 @@ class LockAdminUserWhenCreatingNewRoleTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
index 03c7a33533e91..c5b910c124707 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
@@ -35,7 +35,6 @@ class LockCustomerOnEditPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.php
index 75b06ed87b4fc..1612f1dac24e4 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.php
@@ -29,7 +29,6 @@ class LockCustomerOnLoginPageTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.php
index 57154031e704d..8fdab9165db03 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.php
@@ -25,7 +25,6 @@ class NewCustomerPasswordComplexityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.php
index f953be4bc5a07..d3b7a3ccb1304 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.php
@@ -27,7 +27,6 @@ class ResetCustomerPasswordFailedTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.php
index 8e1b013745163..0bf600a7042f9 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetUserPasswordFailedTest.php
@@ -27,7 +27,6 @@ class ResetUserPasswordFailedTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/EnableDisableModuleTest.php b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/EnableDisableModuleTest.php
index 5344e07cfc9fa..b68f25bd7440a 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/EnableDisableModuleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/EnableDisableModuleTest.php
@@ -37,7 +37,7 @@
* 16. Check for Success message
* 17. Return to "Web Setup Wizard".
*
- * @group Setup_(CS)
+ * @group Setup
* @ZephyrId MAGETWO-43202
*/
class EnableDisableModuleTest extends Injectable
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.php
index 3ac010409f326..064bc2ec0ba2b 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.php
@@ -23,14 +23,13 @@
* 5. Click 'Submit Shipment' button.
* 6. Perform all asserts.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-28708
*/
class CreateShipmentEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
index fbffe760eaabf..f820e92f9a526 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
@@ -22,14 +22,13 @@
* 5. Click "Save" button.
* 6. Perform all assertions.
*
- * @group XML_Sitemap_(PS)
+ * @group XML_Sitemap
* @ZephyrId MAGETWO-23277
*/
class CreateSitemapEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
index d898fd80cde39..e8f24bfccc056 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click "Delete" button.
* 5. Perform all assertions.
*
- * @group XML_Sitemap_(PS)
+ * @group XML_Sitemap
* @ZephyrId MAGETWO-23296
*/
class DeleteSitemapEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
index 4418882a8b309..804111c497cca 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
@@ -26,14 +26,13 @@
* 4. Fill data according to dataset
* 5. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27647
*/
class CreateStoreEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
index f7f5e6c689079..5d638d781d173 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
@@ -22,14 +22,13 @@
* 5. Click "Save Store" button
* 6. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27345
*/
class CreateStoreGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
index e2018dbdf73df..766e030b3f618 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
@@ -22,14 +22,13 @@
* 5. Click "Save Web Site" button
* 6. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27665
*/
class CreateWebsiteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
index 66d8cf55a10ad..cbe261fe750a8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
@@ -29,14 +29,13 @@
* 6. Click "Delete Store View"
* 7. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27942
*/
class DeleteStoreEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
index a3980497764e6..e7ba27b44c1a8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
@@ -31,14 +31,13 @@
* 6. Click "Delete store"
* 7. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27596
*/
class DeleteStoreGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 5d5a068800b04..5d4af70cb03e3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -31,14 +31,13 @@
* 6. Click "Delete Web Site"
* 7. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27723
*/
class DeleteWebsiteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
index 4bd993e22d35a..38250d958bc10 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
@@ -26,14 +26,13 @@
* 4. Fill data according to dataset
* 5. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27786
*/
class UpdateStoreEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
index 728e11825196f..7e9143a5c91df 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
@@ -27,14 +27,13 @@
* 5. Click "Save Store" button
* 6. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27568
*/
class UpdateStoreGroupEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
index 050cb3734ccd2..b187f05856670 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
@@ -28,14 +28,13 @@
* 5. Click "Save Web Site" button
* 6. Perform all assertions
*
- * @group Store_Management_(PS)
+ * @group Store_Management
* @ZephyrId MAGETWO-27690
*/
class UpdateWebsiteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/TestCase/SwaggerUiForRestApiTest.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/TestCase/SwaggerUiForRestApiTest.php
index 3a9afc2185792..9246bdcd9929b 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/TestCase/SwaggerUiForRestApiTest.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/TestCase/SwaggerUiForRestApiTest.php
@@ -21,14 +21,13 @@
* 5. Click operation name to show operation details
* 6. Perform all assertions
*
- * @group Swagger_(PS)
+ * @group Swagger
* @ZephyrId MAGETWO-41381, MAGETWO-41383
*/
class SwaggerUiForRestApiTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/ApplyTaxBasedOnVatIdTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/ApplyTaxBasedOnVatIdTest.php
index 5837793ab263e..b35c566fd9b98 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/ApplyTaxBasedOnVatIdTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/ApplyTaxBasedOnVatIdTest.php
@@ -31,14 +31,13 @@
* 5. In 'Estimate Shipping and Tax' section specify destination and click 'Get a Quote' button.
* 6. Perform assertions.
*
- * @group VAT_ID_(CS)
+ * @group VAT_ID
* @ZephyrId MAGETWO-13436
*/
class ApplyTaxBasedOnVatIdTest extends AbstractApplyVatIdTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
index 50a7167c207a8..f13cfc8d42793 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
@@ -21,14 +21,13 @@
* 5. Save Tax Rate.
* 6. Perform all assertions.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-23286
*/
class CreateTaxRateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
index 7722a7e977329..9cfa401510bc1 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
@@ -20,14 +20,13 @@
* 5. Save Tax Rule.
* 6. Perform all assertions.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-20913
*/
class CreateTaxRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
index d256fe1783a91..567e4860df12b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click Delete Rate
* 5. Perform all assertions
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-23295
*/
class DeleteTaxRateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
index 18c4db9689b3e..5553738b21463 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
@@ -23,14 +23,13 @@
* 4. Click on the "Delete Rule" button.
* 5. Perform all assertions.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-20924
*/
class DeleteTaxRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
index b6c1391a0b04a..14ef3cc293d92 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
@@ -24,14 +24,13 @@
* 12. Save tax configuration.
* 13. Perform all assertions.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-27809
*/
class TaxCalculationTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
index 7e972c17c4922..9517ee063ce67 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
@@ -30,14 +30,13 @@
* 13. Register two customers on front end that will match two different rates
* 14. Login with each customer and verify prices
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-29052
*/
class TaxWithCrossBorderTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
index b0cc79aa52ea3..ff54451529aab 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
@@ -26,14 +26,13 @@
* 6. Click 'Save Rate' button.
* 7. Perform asserts.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-23299
*/
class UpdateTaxRateEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
index b9cf14a74e7fe..bef2ede5733cd 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
@@ -25,14 +25,13 @@
* 5. Click 'Save' button.
* 6. Perform all asserts.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-20996
*/
class UpdateTaxRuleEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
index 57cdccd6edb9f..39a80b783a0a1 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringTest.php
@@ -22,14 +22,13 @@
* 3. Filter grid using provided columns
* 5. Perform Asserts
*
- * @group Ui_(CS)
+ * @group Ui
* @ZephyrId MAGETWO-41329
*/
class GridFilteringTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
index a441bbc68c775..c0049f0cc2fb3 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
@@ -22,14 +22,13 @@
* 3. Perfrom full text search
* 5. Perform Asserts
*
- * @group Ui_(CS)
+ * @group Ui
* @ZephyrId MAGETWO-41330
*/
class GridFullTextSearchTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
index bfd360fbf1053..d1f543c7b9891 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
@@ -22,14 +22,13 @@
* 3. Sort grid using provided columns
* 5. Perform Asserts
*
- * @group Ui_(CS)
+ * @group Ui
* @ZephyrId MAGETWO-41328
*/
class GridSortingTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
index f2dddaa65ff12..c3502924b56e0 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
@@ -27,14 +27,13 @@
* 7. Save Rewrite.
* 8. Verify created rewrite.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-24280
*/
class CreateCategoryRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.php
index 718d87857218c..201a52ce5dec1 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCustomUrlRewriteEntityTest.php
@@ -26,14 +26,13 @@
* 6. Save Rewrite.
* 7. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-25474
*/
class CreateCustomUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
index 9c25d56bb53c3..e333fdd2f0618 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
@@ -27,14 +27,13 @@
* 7. Fill data according to dataset.
* 8. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-25150
*/
class CreateProductUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
index 348d0548f1d15..0dcc9d8e1985b 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
@@ -23,14 +23,13 @@
* 4. Delete URL Rewrite.
* 5. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-25086
*/
class DeleteCategoryUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
index e058f3c4041b4..4f4526d907be1 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
@@ -22,14 +22,13 @@
* 4. Delete Redirect.
* 5. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-26337
*/
class DeleteCustomUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
index 25fb260c1a863..9d8491b8afa4b 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
@@ -24,14 +24,13 @@
* 4. Click 'Delete' button.
* 5. Perform asserts.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-23287
*/
class DeleteProductUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
index 4361bc2a6a7b4..2c7cf3ecbf4ce 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
@@ -26,14 +26,13 @@
* 5. Click 'Save' button.
* 6. Perform all asserts.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-24838
*/
class UpdateCategoryUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
index 813f5b0937dad..04eb7fd5aa8e5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
@@ -24,14 +24,13 @@
* 5. Save Redirect.
* 6. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-25784
*/
class UpdateCustomUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
index 2ba4e53b31e70..1f9c09fcb5f3c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
@@ -25,14 +25,13 @@
* 4. Fill data according to dataset.
* 5. Perform all assertions.
*
- * @group URL_Rewrites_(MX)
+ * @group URL_Rewrites
* @ZephyrId MAGETWO-24819
*/
class UpdateProductUrlRewriteEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'MX';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
index 22c82757dd4c8..2003bb4b27770 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
@@ -23,14 +23,13 @@
* 5. Save user
* 6. Perform assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-25699
*/
class CreateAdminUserEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
index 39a11c0c16994..42dfaf10b9307 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
@@ -20,14 +20,13 @@
* 5. Save role
* 6. Perform assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-23413
*/
class CreateAdminUserRoleEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
index 65f0443812d1b..57de56c7f56f7 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
@@ -27,14 +27,13 @@
* 4. Click "Delete User" button
* 5. Perform all assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-23416
*/
class DeleteAdminUserEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
index 7282818399d7f..c3f0d766406b2 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
@@ -28,14 +28,13 @@
* 4. Click "Delete Role" button
* 5. Perform all assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-23926
*/
class DeleteUserRoleEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
index a14273d7f9484..a6074b3f5ac6b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
@@ -24,14 +24,13 @@
* 3. "You did not sign in correctly or your account is temporarily disabled." appears after each login attempt.
* 4. Perform all assertions.
*
- * @group AuthN_&_AuthZ_(PS)
+ * @group AuthN_&_AuthZ
* @ZephyrId MAGETWO-12386
*/
class LockAdminUserEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
index e6139c681d226..f570d179cd23e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
@@ -27,14 +27,13 @@
* 5. Click Ok on popup window.
* 6. Perform all asserts.
*
- * @group Web_API_Framework_(PS)
+ * @group Web_API_Framework
* @ZephyrId MAGETWO-29675
*/
class RevokeAllAccessTokensForAdminWithoutTokensTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
index c3b65ce1ca97a..79c58c434e238 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
@@ -27,14 +27,13 @@
* 5. Save user
* 6. Perform all assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-24345
*/
class UpdateAdminUserEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index dc417cfa96d78..aaf3a42dc1d1d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -27,14 +27,13 @@
* 4. Fill in data according to data set
* 5. Perform all assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-24768
*/
class UpdateAdminUserRoleEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
index 235d078b2831c..5eb73d2087e01 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
@@ -35,7 +35,7 @@
* 13. Log in using new admin user (before the bug was fixed, it was impossible to log in from the first attempt)
* 14. Perform assertions
*
- * @group ACL_(PS)
+ * @group ACL
* @ZephyrId MAGETWO-28828
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -43,7 +43,6 @@ class UserLoginAfterChangingPermissionsTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.php b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.php
index ff441a0ec574a..ccb146635719f 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/CreateCustomVariableEntityTest.php
@@ -20,14 +20,13 @@
* 5. Click 'Save' button.
* 6. Perform all asserts.
*
- * @group Variables_(PS)
+ * @group Variables
* @ZephyrId MAGETWO-23293
*/
class CreateCustomVariableEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.php b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.php
index 88bc18a71bcec..6b3e819eaf903 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/DeleteCustomVariableEntityTest.php
@@ -22,14 +22,13 @@
* 4. Click 'Delete' button.
* 5. Perform asserts.
*
- * @group Variables_(PS)
+ * @group Variables
* @ZephyrId MAGETWO-25535
*/
class DeleteCustomVariableEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php
index 4f3b82b26dddc..6e9631c7a95f9 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php
@@ -29,14 +29,13 @@
* 8. Save Custom variable using correspond saveActions.
* 9. Perform all assertions.
*
- * @group Variables_(PS)
+ * @group Variables
* @ZephyrId MAGETWO-26104
*/
class UpdateCustomVariableEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
index 37d0fdc81c5aa..3c306280215ea 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
@@ -30,14 +30,13 @@
* 15. Select any available payment token.
* 16. Place order.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-48127, MAGETWO-48091
*/
class CreateVaultOrderBackendTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
index 7d5e6d8284ff1..a90bd37f33047 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
@@ -23,22 +23,39 @@
* 6. Go to One page Checkout
* 7. Perform assertions.
*
- * @group Vault_(CS)
+ * @group Vault
* @ZephyrId MAGETWO-54059, MAGETWO-54072, MAGETWO-54068, MAGETWO-54015, MAGETWO-54011
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DeleteSavedCreditCardTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
+ /**
+ * Page for one page checkout.
+ *
+ * @var CheckoutOnepage
+ */
+ private $checkoutOnepage;
+
+ /**
+ * Injection data.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @return void
+ */
+ public function __inject(CheckoutOnepage $checkoutOnepage)
+ {
+ $this->checkoutOnepage = $checkoutOnepage;
+ }
+
/**
* Runs delete saved credit card test.
*
* @param AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout
- * @param CheckoutOnepage $checkoutOnepage
* @param $products
* @param $configData
* @param $customer
@@ -47,10 +64,10 @@ class DeleteSavedCreditCardTest extends Injectable
* @param $shipping
* @param array $payments
* @param $creditCardSave
+ * @return void
*/
public function test(
AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout,
- CheckoutOnepage $checkoutOnepage,
$products,
$configData,
$customer,
@@ -69,7 +86,7 @@ public function test(
foreach ($payments as $key => $payment) {
$this->addToCart($products);
$this->proceedToCheckout();
- if($key < 1) { // if this is the first order to be placed
+ if ($key < 1) { // if this is the first order to be placed
$this->selectCheckoutMethod($checkoutMethod, $customer);
$this->fillShippingAddress($shippingAddress);
}
@@ -84,7 +101,7 @@ public function test(
}
// Delete credit cards from Stored Payment Methods and verify they are not available on checkout
$paymentsCount = count($payments);
- for($i = 2; $i < $paymentsCount; $i++) {
+ for ($i = 2; $i < $paymentsCount; $i++) {
$deletedCard = $this->deleteCreditCardFromMyAccount(
$customer,
$payments[$i]['creditCard'],
@@ -94,7 +111,7 @@ public function test(
$this->proceedToCheckout();
$this->fillShippingMethod($shipping);
$assertCreditCardNotPresentOnCheckout->processAssert(
- $checkoutOnepage,
+ $this->checkoutOnepage,
$deletedCard['deletedCreditCard']
);
}
@@ -244,7 +261,7 @@ protected function saveCreditCard($payment, $creditCardSave)
);
$saveCreditCardStep->run();
}
-
+
/**
* @return void
*/
@@ -255,7 +272,7 @@ protected function fillBillingInformation()
);
$fillBillingInformationStep->run();
}
-
+
/**
* @return void
*/
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
index 357dca735c9bd..c3b82af6949c4 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
@@ -28,14 +28,13 @@
* 10. Select any available payment token.
* 11. Place order.
*
- * @group Order_Management_(CS)
+ * @group Order_Management
* @ZephyrId MAGETWO-54870, MAGETWO-54872
*/
class ReorderUsingVaultTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test, 3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
index 39332d9c657ab..902ccc62af7f5 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
@@ -31,14 +31,13 @@
* 12. Click Place Order button.
* 13. Perform assertions.
*
- * @group One_Page_Checkout_(CS)
+ * @group One_Page_Checkout
* @ZephyrId MAGETWO-46530
*/
class UseVaultOnCheckoutTest extends Scenario
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'CS';
const TEST_TYPE = '3rd_party_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php
index 5f3d91b58d147..e430afbbad197 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php
@@ -41,14 +41,13 @@
* 9. Go to frontend and login with customer
* 10. Perform all assertions.
*
- * @group Tax_(CS)
+ * @group Tax
* @ZephyrId MAGETWO-29551
*/
class CreateTaxWithFptTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
index 0583cacb1a40b..edd021713f892 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php
@@ -18,14 +18,13 @@
* 6. Fill widget data according dataset.
* 7. Perform all assertions.
*
- * @group Widget_(PS)
+ * @group Widget
* @ZephyrId MAGETWO-27916
*/
class CreateWidgetEntityTest extends AbstractCreateWidgetEntityTest
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/DeleteWidgetEntityTest.php b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/DeleteWidgetEntityTest.php
index f942689021233..ba89d591e3640 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/DeleteWidgetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/DeleteWidgetEntityTest.php
@@ -22,14 +22,13 @@
* 4. Delete.
* 5. Perform all asserts.
*
- * @group Widget_(PS)
+ * @group Widget
* @ZephyrId MAGETWO-28459
*/
class DeleteWidgetEntityTest extends Injectable
{
/* tags */
const MVP = 'yes';
- const DOMAIN = 'PS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
index 6804bdfa46498..9959796828df2 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
@@ -21,14 +21,13 @@
* 3. Add created product to Wishlist according to dataset
* 4. Perform all assertions
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-29045
*/
class AddProductToWishlistEntityTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
index 1a145f4a06c72..cf16a045c3487 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
@@ -21,14 +21,13 @@
* 3. Click "Add to Cart"
* 4. Perform asserts
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-25268
*/
class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
index ed0f91570a64f..21841a70b356d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
@@ -26,14 +26,13 @@
* 7. Click Ok
* 8. Perform assertions
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-29257
*/
class ConfigureProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
index 2abae35294410..3738dd0631e82 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
@@ -22,14 +22,13 @@
* 4. Click 'Ok'
* 5. Perform assertions
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-29507
*/
class ConfigureProductInCustomerWishlistOnFrontendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
index 2699153ef9a1b..aca814aebca6a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
@@ -27,14 +27,13 @@
* 5. Click 'Delete'
* 6. Perform assertions
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-27813
*/
class DeleteProductFromCustomerWishlistOnBackendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php
index 9705358cba55b..361e80ea56b02 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php
@@ -20,14 +20,13 @@
* 4. Click "Remove item".
* 5. Perform all assertions.
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-28874
*/
class DeleteProductsFromWishlistOnFrontendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php
index 33c47f4406970..7ff599cf43df0 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php
@@ -21,14 +21,13 @@
* 2. Click 'Move to Wishlist' button from Shopping Cart for added product.
* 3. Perform asserts.
*
- * @group Shopping_Cart_(CS)
+ * @group Shopping_Cart
* @ZephyrId MAGETWO-29545
*/
class MoveProductFromShoppingCartToWishlistTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
const TEST_TYPE = 'extended_acceptance_test';
/* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
index fd8abbe0644fd..866b60f3dc26a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
@@ -26,7 +26,7 @@
* 5. Click "Share Wishlist" button.
* 6. Perform all assertions.
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-23394
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -35,7 +35,6 @@ class ShareWishlistEntityTest extends Injectable
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
index b1736c332b01c..06b0bfa77bf1d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
@@ -25,14 +25,13 @@
* 4. Open wish list tab.
* 5. Perform assertions.
*
- * @group Wishlist_(CS)
+ * @group Wishlist
* @ZephyrId MAGETWO-29616
*/
class ViewProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest
{
/* tags */
const MVP = 'no';
- const DOMAIN = 'CS';
/* end tags */
/**
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 6c7e8b334baa5..507cf768acfa9 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -98,8 +98,17 @@ private function initObjectManager()
/** @var \Magento\Mtf\Config\DataInterface $configData */
$configData = $objectManagerFactory->getObjectManager()->create(\Magento\Mtf\Config\TestRunner::class);
- $configData->setFileName($configFileName . '.xml')->load($configFilePath);
-
+ $filter = getopt('', ['filter:']);
+ if (!isset($filter['filter'])) {
+ $configData->setFileName($configFileName . '.xml')->load($configFilePath);
+ } else {
+ $isValid = preg_match('`variation::(.*?)$`', $filter['filter'], $variation);
+ if ($isValid === 1) {
+ $configData->setFileName($configFileName . '.xml')->load($configFilePath);
+ $data['rule']['variation']['allow'][0]['name'][0]['value'] = $variation[1];
+ $configData->merge($data);
+ }
+ }
$this->objectManager = $objectManagerFactory->create(
[\Magento\Mtf\Config\TestRunner::class => $configData]
);
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx_category.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/category.xml
similarity index 100%
rename from dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx_category.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/category.xml
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
deleted file mode 100644
index cdb06f36d53b6..0000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
deleted file mode 100644
index 9c5788733cdbc..0000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
deleted file mode 100644
index 9b7e29085936e..0000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-