diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index 8c412dace45354da7b6056d396c7168156f2d446..2ad2194b36466b0112afc78880ff91249a7ca6af 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -701,6 +701,7 @@ Image,Image
"Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png."
"Image Opacity","Image Opacity"
"Example format: 200x300.","Example format: 200x300."
+"This value does not follow the specified format (for example, 200X300).","This value does not follow the specified format (for example, 200X300)."
"Image Position","Image Position"
Small,Small
"Attribute Label","Attribute Label"
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
index dc8ced173bc544b9b1aa24324b1294479374805d..9852ad74121c8c30f852600783a4fb91ab84ce61 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
@@ -55,12 +55,13 @@
<field name="watermark_image_size">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
+ <item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
<item name="label" xsi:type="string" translate="true">Image Size</item>
<item name="dataType" xsi:type="string">text</item>
<item name="formElement" xsi:type="string">input</item>
<item name="dataScope" xsi:type="string">watermark_image_size</item>
<item name="validation" xsi:type="array">
- <item name="validate-digits" xsi:type="boolean">true</item>
+ <item name="validate-image-size-range" xsi:type="boolean">true</item>
</item>
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
</item>
@@ -118,12 +119,13 @@
<field name="watermark_thumbnail_size">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
+ <item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
<item name="label" xsi:type="string" translate="true">Image Size</item>
<item name="dataType" xsi:type="string">text</item>
<item name="formElement" xsi:type="string">input</item>
<item name="dataScope" xsi:type="string">watermark_thumbnail_size</item>
<item name="validation" xsi:type="array">
- <item name="validate-digits" xsi:type="boolean">true</item>
+ <item name="validate-image-size-range" xsi:type="boolean">true</item>
</item>
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
</item>
@@ -181,12 +183,13 @@
<field name="watermark_small_image_size">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
+ <item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
<item name="label" xsi:type="string" translate="true">Image Size</item>
<item name="dataType" xsi:type="string">text</item>
<item name="formElement" xsi:type="string">input</item>
<item name="dataScope" xsi:type="string">watermark_small_image_size</item>
<item name="validation" xsi:type="array">
- <item name="validate-digits" xsi:type="boolean">true</item>
+ <item name="validate-image-size-range" xsi:type="boolean">true</item>
</item>
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
</item>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js
new file mode 100644
index 0000000000000000000000000000000000000000..b330ccfd8c12531d4945fad1ea255bdee23a6404
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Ui/js/lib/validation/utils',
+ 'Magento_Ui/js/form/element/abstract',
+ 'Magento_Ui/js/lib/validation/validator'
+], function ($, utils, Abstract, validator) {
+ 'use strict';
+
+ validator.addRule(
+ 'validate-image-size-range',
+ function (value) {
+ var dataAttrRange = /^(\d+)x(\d+)$/,
+ m;
+
+ if (utils.isEmptyNoTrim(value)) {
+ return true;
+ }
+
+ m = dataAttrRange.exec(value);
+
+ return !!(m && m[1] > 0 && m[2] > 0);
+ },
+ $.mage.__('This value does not follow the specified format (for example, 200X300).')
+ );
+
+ return Abstract.extend({
+
+ /**
+ * Checks for relevant value
+ *
+ * @returns {Boolean}
+ */
+ isRangeCorrect: function () {
+ return validator('validate-image-size-range', this.value()).passed;
+ }
+ });
+});
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f6dd2a0033fd45d7a7250aa12069dc4ae90a55aa..7de546bd8780d602760e8b94fb4c43b499b4950d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -40,7 +40,7 @@
<script>
require([
'jquery',
- 'Magento_Catalog/js/price-box'
+ 'priceBox'
], function($){
var priceBoxes = $('[data-role=priceBox]');
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 73551f332d140e0561dc5c481e9e6b0343f90f85..02953743662ebbfe52124c2b760258361810cd6f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -1284,6 +1284,14 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
$row['max_characters'] = $option['max_characters'];
}
+ foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+ if (!isset($option[$fileOptionKey])) {
+ continue;
+ }
+
+ $row[$fileOptionKey] = $option[$fileOptionKey];
+ }
+
$values = $option->getValues();
if ($values) {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index cb4a603f54577edaa59412f89cb56298fde7350b..d78376e2d1479c336a7de99996648fdce8edd3b9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -105,6 +105,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
'radio' => true,
'checkbox' => true,
'multiple' => true,
+ 'file' => ['sku', 'file_extension', 'image_size_x', 'image_size_y'],
];
/**
@@ -1136,6 +1137,28 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$result[$this->columnMaxCharacters] = $optionRow['max_characters'];
}
+ $result = $this->addFileOptions($result, $optionRow);
+
+ return $result;
+ }
+
+ /**
+ * Add file options
+ *
+ * @param array $result
+ * @param array $optionRow
+ * @return array
+ */
+ private function addFileOptions($result, $optionRow)
+ {
+ foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+ if (!isset($optionRow[$fileOptionKey])) {
+ continue;
+ }
+
+ $result[self::COLUMN_PREFIX . $fileOptionKey] = $optionRow[$fileOptionKey];
+ }
+
return $result;
}
diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
index 1b5ec69e5d5c246ee0acc735bce6990a07dbe1a8..0891fb351837697abcfe0f45f759d2006d35121e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
@@ -48,12 +48,13 @@
<field name="watermark_swatch_image_size">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
+ <item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
<item name="label" xsi:type="string" translate="true">Image Size</item>
<item name="dataType" xsi:type="string">text</item>
<item name="formElement" xsi:type="string">input</item>
<item name="dataScope" xsi:type="string">watermark_swatch_image_size</item>
<item name="validation" xsi:type="array">
- <item name="validate-digits" xsi:type="boolean">true</item>
+ <item name="validate-image-size-range" xsi:type="boolean">true</item>
</item>
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
</item>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
index b068af92aecf6c3b80c8069c516716be14371317..6af90fdf688a7a241dea3019e308570757f533b3 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
@@ -6,8 +6,9 @@ define([
'underscore',
'uiLayout',
'mageUtils',
- 'Magento_Ui/js/form/components/group'
-], function (_, layout, utils, Group) {
+ 'Magento_Ui/js/form/components/group',
+ 'mage/translate'
+], function (_, layout, utils, Group, $t) {
'use strict';
return Group.extend({
@@ -29,11 +30,11 @@ define([
},
ranges: {
from: {
- label: 'from',
+ label: $t('from'),
dataScope: 'from'
},
to: {
- label: 'to',
+ label: $t('to'),
dataScope: 'to'
}
}
diff --git a/composer.lock b/composer.lock
index 77553a16419e85258357d8b76c9aaea8302d7e37..6fd73ef405c822bcb049709ec1150c6e51254e35 100644
--- a/composer.lock
+++ b/composer.lock
@@ -922,16 +922,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "3d265f7c079f5b37d33475f996d7a383c5fc8aeb"
+ "reference": "41f85e9c2582b3f6d1b7d20395fb40c687ad5370"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/3d265f7c079f5b37d33475f996d7a383c5fc8aeb",
- "reference": "3d265f7c079f5b37d33475f996d7a383c5fc8aeb",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/41f85e9c2582b3f6d1b7d20395fb40c687ad5370",
+ "reference": "41f85e9c2582b3f6d1b7d20395fb40c687ad5370",
"shasum": ""
},
"require": {
@@ -1010,7 +1010,7 @@
"x.509",
"x509"
],
- "time": "2016-05-13 01:15:21"
+ "time": "2016-08-18 18:49:14"
},
{
"name": "psr/log",
@@ -1381,16 +1381,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9"
+ "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
- "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8",
+ "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8",
"shasum": ""
},
"require": {
@@ -1437,20 +1437,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:29:29"
+ "time": "2016-07-28 16:56:28"
},
{
"name": "symfony/filesystem",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "7258ddd6f987053f21fa43d03430580ba54e6096"
+ "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/7258ddd6f987053f21fa43d03430580ba54e6096",
- "reference": "7258ddd6f987053f21fa43d03430580ba54e6096",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
+ "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
"shasum": ""
},
"require": {
@@ -1486,11 +1486,11 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:31:50"
+ "time": "2016-07-20 05:41:28"
},
{
"name": "symfony/finder",
- "version": "v3.1.2",
+ "version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1539,16 +1539,16 @@
},
{
"name": "symfony/process",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe"
+ "reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/89f33c16796415ccfd8bb3cf8d520cbb79899bfe",
- "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe",
+ "url": "https://api.github.com/repos/symfony/process/zipball/d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
+ "reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
"shasum": ""
},
"require": {
@@ -1584,7 +1584,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:29:29"
+ "time": "2016-07-28 11:13:19"
},
{
"name": "tedivm/jshrink",
@@ -3233,35 +3233,35 @@
},
{
"name": "fabpot/php-cs-fixer",
- "version": "v1.11.5",
+ "version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "d3d08b76753092a232a4d8c3b94095ac06898719"
+ "reference": "ddac737e1c06a310a0bb4b3da755a094a31a916a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d3d08b76753092a232a4d8c3b94095ac06898719",
- "reference": "d3d08b76753092a232a4d8c3b94095ac06898719",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ddac737e1c06a310a0bb4b3da755a094a31a916a",
+ "reference": "ddac737e1c06a310a0bb4b3da755a094a31a916a",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.3.6",
- "sebastian/diff": "~1.1",
- "symfony/console": "~2.3|~3.0",
- "symfony/event-dispatcher": "~2.1|~3.0",
- "symfony/filesystem": "~2.1|~3.0",
- "symfony/finder": "~2.1|~3.0",
- "symfony/process": "~2.3|~3.0",
- "symfony/stopwatch": "~2.5|~3.0"
+ "php": "^5.3.6 || >=7.0 <7.2",
+ "sebastian/diff": "^1.1",
+ "symfony/console": "^2.3 || ^3.0",
+ "symfony/event-dispatcher": "^2.1 || ^3.0",
+ "symfony/filesystem": "^2.1 || ^3.0",
+ "symfony/finder": "^2.1 || ^3.0",
+ "symfony/process": "^2.3 || ^3.0",
+ "symfony/stopwatch": "^2.5 || ^3.0"
},
"conflict": {
"hhvm": "<3.9"
},
"require-dev": {
"phpunit/phpunit": "^4.5|^5",
- "satooshi/php-coveralls": "^0.7.1"
+ "satooshi/php-coveralls": "^1.0"
},
"bin": [
"php-cs-fixer"
@@ -3288,7 +3288,7 @@
],
"description": "A tool to automatically fix PHP code style",
"abandoned": "friendsofphp/php-cs-fixer",
- "time": "2016-07-06 22:49:35"
+ "time": "2016-08-17 00:17:27"
},
{
"name": "lusitanian/oauth",
@@ -3951,23 +3951,23 @@
},
{
"name": "sebastian/environment",
- "version": "1.3.7",
+ "version": "1.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+ "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+ "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^4.8 || ^5.0"
},
"type": "library",
"extra": {
@@ -3997,7 +3997,7 @@
"environment",
"hhvm"
],
- "time": "2016-05-17 03:18:57"
+ "time": "2016-08-18 05:49:44"
},
{
"name": "sebastian/exporter",
@@ -4321,16 +4321,16 @@
},
{
"name": "symfony/config",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0"
+ "reference": "4275ef5b59f18959df0eee3991e9ca0cc208ffd4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/0926e69411eba491803dbafb9f1f233e2ced58d0",
- "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0",
+ "url": "https://api.github.com/repos/symfony/config/zipball/4275ef5b59f18959df0eee3991e9ca0cc208ffd4",
+ "reference": "4275ef5b59f18959df0eee3991e9ca0cc208ffd4",
"shasum": ""
},
"require": {
@@ -4370,20 +4370,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:31:50"
+ "time": "2016-07-26 08:02:44"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063"
+ "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dd85de8216079d1360b2b14988cd5cdbbb49063",
- "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f2b5a00d176f6a201dc430375c0ef37706ea3d12",
+ "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12",
"shasum": ""
},
"require": {
@@ -4395,7 +4395,7 @@
"require-dev": {
"symfony/config": "~2.2|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
- "symfony/yaml": "~2.1|~3.0.0"
+ "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
},
"suggest": {
"symfony/config": "",
@@ -4433,11 +4433,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:31:50"
+ "time": "2016-07-30 07:20:35"
},
{
"name": "symfony/stopwatch",
- "version": "v3.1.2",
+ "version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -4486,16 +4486,16 @@
},
{
"name": "symfony/yaml",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
+ "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
- "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
+ "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
"shasum": ""
},
"require": {
@@ -4531,7 +4531,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:29:29"
+ "time": "2016-07-17 09:06:15"
},
{
"name": "theseer/fdomdocument",
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 4e36f1fa54f2197b79646374dfea39cdede39ec6..936c4b968af3b88ed9f05fb2d21dfe3c8184181f 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 4511840ccdb4f8960acc7e5c2325f383e02b1293..048f92783b42d730a1d0670d58bcea80f312b928 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 f0dbb4fbc2a331212bb3175014e87a50171e135b..a75c3f94ccde780815ba0b8554757bab1fb90115 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 95e69835435c65513e347f63f9adb703eb305c65..0c2cd138eb1c8b672ce3c893afc908672099ea68 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 412329700ef653248f2ec07c8a91b2e5c4b5c7dd..5dca7fad04e1fcb8e384d0f2ade711bfb1f28a83 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 4973598ac5959c7e8d3033e2ca17b756912574fe..f75ea3ade05fc990bb3c2242cae9991478a2b61f 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 007a6e04a42b0e63cb4c5d06bd4d2018a05d04d8..6601bd44892c93e30573c5342e483eb232573e70 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 8bad13557c888ad6d15a0428f1378a2b6b833e7c..a0bf482705f552318a7cdd09951aaff14eaf1cb2 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 d6723c71816f92f10a6a5356fa7a3a7d4ba696b2..f0f0291b33e20428765c110dbb23600ba463bdde 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 f45270012dd398e39f1bbf317bdbdd23cddeff7e..6554845d5ff81af96b887a9dbcb8e05761b21463 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 625c24866e31fe611db315e8e492ce3c53f8486b..7048984886582f7e74ffaa6d5d0597ee4ae5b018 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 f8d9338b528340bbb26e91ced398c4d97271c634..32599aa090651c76f7d9d2663309ea3a219f79f6 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 d6a4e4b51b1c66136104ac5c8e089a03998ae49e..9cf0e9c90c1215649e50e0a708bcae5db371d9fd 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 107918b973d864e6e86d8fa7df27ba09d010ef4b..f6813b74e40d7b09edf48369f6dc79ca28fefa7d 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 a0d850f07e977318968629dff239cc34fbc5eea1..13b8240d4c49ebe4b047e59f6bfdb63102fbcf47 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 8a24aed55cbe1c800d7ef79fd6639d3b6527359b..ac2c977f88b8308830e43243c2417e42c81a20ba 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ca7683fca93c78c7b7f6b0b81188b9e48ba360ea..bf17d216bcf9b479e6279f449e782bc94438600e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e648c84cf9afbd0c00a53036d0fcd421dcc93e98..d458ffeb22475b78d66eeb6441d1f911c12b0cc8 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 36bcf1a4386012a36cc66027b0da3f689c29a569..e7b613f43af59f98262b0f173c5d69413e1fed48 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b37aba462dcfb9730d91734277bd433b3e81bbad..ab8b03e8bfe15ae7028b022fc1d7dfbaa25ebdbf 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 @@ use Magento\Mtf\Fixture\FixtureFactory;
* 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 ec87faa5f1155759d43940284a2ac7c8a81d3748..131163311bcd2af4d34031883d103b3c2341cdb8 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 @@ use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
* 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 50819db0f1504d8e7327d1429a1a1be2c635c957..59f45bc004b8247e6846bc16dc0ed7983b3a37a9 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 @@ use Magento\Mtf\Fixture\InjectableFixture;
* 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 72a0b88ddf07e0281792bd17166e5e22a0a76588..ebc7360fe004bd2fcb719bca7095d586f684f0cc 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 @@ use Magento\Customer\Test\Page\CustomerAccountIndex;
* 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 97b2a0715f7cad80a63f2adef69cde1cd82a5a78..c0cab5ef8e6b743f1926eb6e8e752d3bb4ec9b04 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 86e45f9686ce10c07243009fe290c87a5e2a148a..290275ef4e8725f3d2205c7e2d3d41674d06cbe2 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 70c1757b82db45e330cd0f6f1df19c1002279ad7..7026b757bb7de03a00f18b525076a057749d2383 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 @@ use Magento\Mtf\Fixture\FixtureFactory;
* 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 bfc9e153a9e930e95ed1099b78369e9d31476d2f..1a0c46b146fafffb4b90eac6a5cd971686e9a15d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 dd0f5e221facb43e7e8cf1f3379c13e2799fa4d8..bdf90b5df3bc5eb2ff71ed1697fc4892bf599429 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 36c04d0bbbdf6430cffcf5b78b7dba4eac733662..f7fd82e3342bfdce8760c253215ad8189ef33643 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 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductActionAttributeEdit;
* 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 53451339e075ada19cf8bd08e04c48e285783623..49fec0876e48ffb426a63885bc9b13ea0bd416d0 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 @@ use Magento\Mtf\Fixture\InjectableFixture;
* 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 53e3a57a2e8bcfdad3909a3bd3e66ab83da0afd6..37d8c9dc91d0c58573bf4cad2cd63a1a1eaa52f2 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 @@ use Magento\Mtf\Fixture\InjectableFixture;
* 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 5a97e8922ce77d71fafc8cf94ab65f238d12b235..c8189cd50ebf318b1373c8e495ccec0f64262993 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 55814088db48197c6b247518b042ca59ba38310a..7c134c2902c330f51306ecff1d68f359fa29066c 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d2730644dc6bf1e937116546802b80de15a05414..f68ec539c62e0c7b59f9c6f958bff7dc350a91d6 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 43d44b577ab66e92cf6d0ffaaa7df73f213a207e..ddd788d7ee1c91dde5164b06ea2d908056031c25 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 eff2ef2a6972b73db62486fef33551db220b2f29..a8c375ba2d84962e1e7657974c63bbe726f2dbe6 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 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
* 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 a20282f786a2542b1411e352cec0902ed869f98a..d3bd8f44adb7413034a1b5fba27f6c0f2d7a193d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e40006301ffff01885dc032429ed17beeaef77f9..0a85628c5e708ec6c5fb4f4aee6aa7fa355e40d9 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 034acb5918b41f78cc274ad635dbc82380e40fb7..22325ead5f5f759f529066dac477e0caa7f74348 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 e8f20837bf384c7956383c530bc01ba362733120..11958cc2c1e87451e7f0bcb50c61150bda2ac85f 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b71e751015db08510155733b005c210d070c480e..b097dc4681b166b55efef8ef55e152a9c68516b7 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 0b0e078015a220964236404720ba5286b461deeb..737a086dbb7e96a66b8afb6818059ffb76eb4ebc 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e57a00a9d68ab9dc5d917c82cb3433776bff4a30..20fee003a576d5c4fd943e695e0669d62b9e7754 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 40c05f9f75a8d5c529373ee6c8fec96fa1d5f61b..baf9a238c6bc039cf606c5a384aed1ed0135c611 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 37ebda4406c3c20db01fe6eade9d138638da7ae0..af6b5747819cdc0f5d7c0de37473b5e6effefdfc 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e30bb6622af664f122987934f57e553d947c6961..399b918078f22ee27ba498d7ffe82fc0273bfeda 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 1da500b386454a045f822b4b1594fa2043b2fbc9..4a4c6a25321c8363133aa0d6696cb29a35c946b5 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 @@ use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleEdit;
* 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 bbab44b01d514c3806ed7fb78d656809a573a6a4..f5efc258fbdbf5854bd5accb95cc7bfef1820089 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 @@ use Magento\Customer\Test\Fixture\CustomerGroup;
* 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 89dd079aecdd5adc4d8ae0f6b8792ec569976c91..a2d0ff9500d4c4c8ac62bf2e4b9f54e6fcc5c4f4 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 2f04d13ca445e00852e093dd1e9430a3cf01f35b..8ca54baed577c63408f6bd36d257f985a8411694 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 @@ use Magento\Mtf\Util\Command\Cli\Cron;
* 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 90234c28627ce59ca701e566121c0515054436b9..a3e5a4ba850d448e163dbee7499c4b616810fd1a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 a6853a8c4758d46ffbfad54ebc5102b2edf14ee3..f6ffd84c0b4e97da274a4fb6693d52ba4f731c99 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d646ffc6c4aaf689316c985bbb9ba75d9199cb1e..ab5fb5f5bcd4d9120c4127f55e1373d1a4310141 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c64d5f5d72aef16b1cf15bef91d5d79a07645858..5f41d187564f92d022a8eb50b85cd7aef9cf777c 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 77aa6b169cbb780b54c4a3e4776162bf4c451234..c845e7f0bfe85958c20136ebcf0da30f53d31874 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 285fb7b3daf6533c7a71f849ad21fbc84a44de2b..42c1683a6cd1485de9b927911e477bba5ebd29f1 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b58fc2083a4004108d8b47717ec2e0d05346c02e..291f71322ded5389b400466a01306198bbe7596b 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 8eed34db7e349e4183add7c78dae2c17cdaf2b41..0733d778b9662dba9c857eff90b213b4da77e4c3 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4997ed168f3257ed82aef973d1196f886531c4b4..f2a809656ed65449fc63d5405b3449f8587005c5 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 40edbd64dd01e668e0aa303be04e56dab7e1a964..ae48e6e6b79487571539aa28567f7dd930b57237 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 40789d462d16c172bb36e5e74ba6dadbfc418b2f..58d0c23f2274fcdde30703aa8ca4920ec0aa208a 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 709b131c9565597f3121e77fb6529b12577016da..62d773a6637bf8fdacedf62932d798dcd6d9e431 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 89563fe97ba241fe47b7d09512d7788f4741a37e..809688cd8286a0afdc68ef3d236a6b1673b1c66b 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 6cb7dac085389ba877dcb02e74129c0b63ecef2d..21f48abef963d288415d09b24d08a3fe8fd34ebe 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 ab9c1484ef37db6d0cfd5df4fa4bca6706b58753..2c65150aa697371c1fe050e5e4f5f9dfbdcb25b1 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 1a054cd8991be92974c8cf07fdd0bb4f02f225bf..277f38e0c7e1f1bdda9f122183415b35aa772f40 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 33824a8a84ffd69a278a56061305b818ece6fc24..7e3c3f0ebb3c95b69fdf1f5c766b8184c25d736c 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 @@ use Magento\Cms\Test\Fixture\CmsBlock;
* 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 ca6f7a8d3f6e1e25e99c8f34679f360fbf475e27..f5035a2eaf76d734e7288a84d2657c897d90b5b4 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d4d15290d7ba6a3102c98e9f188a7af8fa6ed010..296525540073fee5a0e12101cd9575ffcc2a15f5 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c4897ea36269dd38850dbe537472e8621b64a6ce..ad2ae5689c98588aa3964d948dd6e04e7a1a0fd2 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 @@ use Magento\Catalog\Test\Fixture\Category;
* 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 1a52df3142f8c213bdb37cc627c3bf829dd138b9..25225917014fcbee5385f1cb2334ba9889300390 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ac8f69b3fb50adca30d812e0c9f23fe3b8e241cb..68d0ae541253d779e60cd374e8055600446b4641 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 f42078879c59d6ac6e60be044cebde2142aae8f9..8fa92fba59f8e65dc8a528c26a239b0ed54b2e48 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 @@ use Magento\Cms\Test\Fixture\CmsBlock;
* 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 280b2cd915a067e7876e146f1658df9f81eb4dbd..b16f4384f27d50e75411b3fcd20a388f514cd9d5 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 edec851d866153f432f965ce18090bdaf9b1e727..43fd7e69ac35930fc3274c6042cdcc6e43ef4f9a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c800c8b1bfef5ca7a73f53ef6c76709dd886abfd..e72b98c93b93d4a154cc6a93eb2149f4407e2e53 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e9014ca2476cb50f3b8dceb758e91a866455425f..7ff2be303d677a944e5c2391a509882ecb7d3e96 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 f98745d22e1a3aa59b13922ffc1b7b0a6fc5d1cc..14a9d6f283b278228f178f4f3a14ffbe7786aceb 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 @@ use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity;
* 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 25895dc27e772fafe104c30394b7dd0f70072246..8740b0000ff58324787941a92213528b6c24d11d 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 @@ use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity;
* 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 bc0fea4b563d39b4758f5dd71efedb9a70a129c4..8f5b671fec904f50e2294c4e7a91356abd131da5 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 ecc981db972518bfaf152ca9815d2eeb4899b2b5..a8774bb99569d59d596b6dcbe3e05d5b5c506381 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 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
* 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 0ad79c4c4933aabf7cb7963bdfaa981052d13ca1..bf3ae060a6d1b008aab6a94181008aa24149a08c 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 25ff9ff25db0454df5a3ec5e4f65e94b79725a4a..64051195daa32a808536adb8afaa6a5100c51ce6 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 502e9d06092080c8e56093ef2ea7c90ea0c6d34d..1f13c6ccdacdc1d4656b7c796b037a1e8069a27e 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 25108d19534f1571dca7f6dc31166c9b6bb27d32..7ac9b5284b3f0f2dee4059a8659e43f65532fee8 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 7943a1d9932659779583bc0ab28e956a49e0ca53..61771665c059ed1783c3e3820a8005601d91e631 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c22526ed1a0783f69ea7e4ab1ad806b4b4d05a83..3e6916eb2b2525a57b50643def70bbd7abb6b726 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 0622ceb028f6077ee533971766d85283e1fc1445..f8c426a3efb00246c141c21998976acbd74c6e98 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 5d26493333672f6bc785f55c7aae0b7fb488595f..a9e09d24fb07f0c4ee21b7e8face3f99444c369b 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 67afe99b2027433fc67ff886679b98d877c0e5e4..d257805dc54916082c58def59cfb0bc382cdcd9b 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 @@ use Magento\Customer\Test\Page\CustomerAccountForgotPassword;
* 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 de458ff0a8be1bd8aacb3cff6270082e329c6ef8..f7448024b93aa2d889a4ac35b31df900adb68aed 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 37431c7878e3b28e7ce0b2174b0bcf59115a9016..598a44657246b8fe03a82df8f443e0b8d9e881ff 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b5be83035f01fac6c3e00fe5a071842fbe2761f4..b2bad9a3bd31b1e70f304a1c57ee6d814efbd164 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fcc523db65c41fdbad4d5ee49ad27daf526fb881..d6820720d89bcc579e193a94a0bb8729f25eaeba 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 @@ class UpdateCustomerBackendEntityTest extends Injectable
: $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 c3b50d4371f33cdaab152dff16b5a50033157d9b..34338371d45af849f54956588aee5a97c0f75ecd 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 548333915c6908f7f2e5f9f6541437f9356eba77..7fda95c0be7d2e48e58cb2a01317704cc54a0b57 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 243b8564481468571d6d45199cac42c42aa73793..dfe3afca43f0d2ad54a05a0b3ffbf82cfc7bc049 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 15567c4ef8d168d2bc8f7a0b18c963502c2c9a87..4d397bde28bf6a11dc2a11032de62c4b317154bc 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 @@ use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex;
* 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 117f04548773513afc2648aa035d19d87c2a4692..7cc3fd6375c3caaccb6525bb357cea4f0050d5a6 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 6eb17b87a74e9f2b74f10afc1d94a655bfb79110..276cc08e8efb74f05c70868cdf67a77f452bb44a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4d349580bd74bc0ab431d47de8031ce9b2c72055..e33adb68be4eb6eeb05753b072d394804acefb4a 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 7126dfa00a9f2d48ba19e0ba600ddbea3c69f0fe..bbe3b5ace0e830f36272d7a8b4d8f49cfa24e791 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 36c67db2ec306340255125011f0002d06ab5ce92..224fcbd3170bbe40ee4fe5164a75184acd8860ee 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 427bec3528169fab1049ba1d212251f70539b505..f7931b03e3def69ddb02f6c73c7c0381fd8cf0c1 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 @@ use Magento\Install\Test\Constraint\AssertAdminUriAutogenerated;
* 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 b6e81512c9f32b8301009e39587e0b766f094d00..b8fa9638dc21ed6cb63de8df8de2ade8592de329 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 53e6c9fef1332acc39e8ff3d401d7475ae0b4e01..d7bd5b93ef0c6c621a1cb1583007b2a8f323bb5a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 2f5b450f7bd3d34a5c2c4b56fe013864215544b9..52d6dea9a13ac7c0bf8df3a2c85d7442dae32bab 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 894cdccadd6beac909966a95dea52faf0e2d02ab..c2878aeda72e4e402904b7041fa75f3e5db069c6 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ed373ed2a58cbda24bcf73d4b6bf699ac37a85df..2af446b97b0cf502a55890a122a65aaecce0e96d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fc246582127fc374a0305e23d88c1fb65248609e..a349ba386508397fc8af6024f92a439c1c6ff76a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 976d52fb0f15650be1b1944aa6627c3c2e1d6729..543880aea127310181be8b7e7d5663495e8202ba 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 19332e899e1aba5141edf448053f4add8503693d..f6f9c912f358da9bc7bc233ddfe2da86cb6a911e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 99d9fff1465d44f3cd48c138baedcc380533aa4e..a79ea3995eeff08464befe26a71e61171af3bc2e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 314670ad2d177b2ffce48a2c5356a0a05a776675..62fb186a3c6744ec9d35ede421516852d27da746 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 bd30c443ca0c18a41fba7a760222859df7e7025a..2ec44f0e303134d8fd5d703b83a4466e8cc1d6be 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ed27d43681e082e06a743bdeb6b5f8470434c128..f6d29ba6a843bd9f780e7a04a1fc32dcb07576c5 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 af7cdfc69979a3f16576547202c4a35540fb5508..8fd543d88a8af536a15e90e68bdeb7fdfc44a3ef 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 f07546b100640f4dd71aacf6b1a33de0bf2d71e7..28090b866290370fff0ec8b48bde0d196ffb6d5b 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 be6c223a2503c1f172a186413e596f4c36df5ed5..c8fb3e4f30f19834d1587cf1a1290aeeace7b958 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 fc85feb524baf534c3e5de95e457988b49a6b56e..7fc35ff1eb6fd83e929886bcdeac741de868fe68 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 f57544ae5a663b1dc0dd183a0054901c3ba47777..b40adf986dbe9a7311fec484411bb8a7ed50810d 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 9637d95a7216b949421c0f2b69257c0ca40f206b..07f03b1c931cfc0c547f781451630fa828101294 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 1cc9e00df7ec907652fb071c3d1daee2f7f86e95..ff06e6b10266ef4b723811bf143b648aa59853e9 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 e0fff16f9cbd5cd5bbe2b5168aa170feef980d22..c5175df4ad0787b48cb5f9d54bacc3c76057d520 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 63f3fa8f4f49a39f217cba98680dcb6a0739a641..ebc5e0ccf93b48b61d49f3fdaca168f1cb66ed91 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b6c4fdc25dc786a408f99e7cdc7c01697f6102d9..30df076817dff80416933e9bccf11d598fb28a87 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 20feecc8a54310a50f5947f8dd0ad03e7f4ab595..5930e63b9d3bd367a4c93fb241cc64613fa9aea6 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 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
* 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 317ea3cd16c10a70ca0d74d9ea9604e6c199f27c..3eb5237eddd97fc076cd1702938291cdfae92161 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e27ddbd5be6c4bc3984595d91acd24ac8521814c..cacb6e5a329bff99eb28fd62118f440c569ade46 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fe4454065b7f99edc0aec26367b2df92cf6ead50..c366cedb3c3a99825b18b8527555c935b33b641a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 97ea72404ecdd43bddbb475f12f395cea97023b5..97dc365d62338e83d1418ab1b4ce4587e80ddd25 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b925a6f049c136d89e3a36edc713eacb898f48bb..0dd87bde327c9f3e30c876c682b57563ace9df61 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 2c24ef791c6297eea84d3e30483f2bd2dbea13e8..bb5f8644d4359e70f12060e97bf849a009332de9 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ca1b3594b118a23082295fe8d36e2bb8d0bfd1c9..7d0d13862e7720b0b63516639d8b4968909c66cc 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fb8007bc24434fbde98878abe62e09f48601cd2b..148c0a69cecaa950cf4e4b3641ec163320c4f8e1 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 9ed56a46e565ef0c489229d3b89af959cad8fc5b..376e5662320b89de024821f22fa32d070171f615 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 de3f9e60f3fba8bb503ba8464fe318cb4270b482..0d59b989fc25fc162e450ce719c96413229c45fe 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 6e480ca94bc84849663ad9606759283dc7d2e2a3..3ebfd4746a858f92381e9c58e8b20cc84356c0be 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 014148b561ead3562c7cbf0aec5fae5cb1b77df9..c1eb4e8b35c3f3373abd2aed6d42f091d497c576 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 2b411a19c22ed4bf092d0ee6d4b7b4caf35f888c..692e9024a2212ee3ed52a5f9fc4c896f0a408748 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 844a30bed98a35db02ba562b816bfda1548dbae4..0d5249ef4d06f79f39ad4644eb7dc7f648fc7071 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 69ed5fbce7d2402eac59ae1ed1f1c819873bc388..1175942452f89d8680267d2d21cd463cbde62ba3 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 3f45a0541fe7c1eaa4e1d0e0182d67c430c1fd5f..905fa8fb70f0cebff985cf4a99d193359969e5e1 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 @@ use Magento\Cms\Test\Page\CmsIndex;
* 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 @@ class ViewedProductsReportEntityTest extends Injectable
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 f25b46c53123aca6c835d377b432b2278a5ed8e2..648de4bf40183fd33b0373c57cfc6dc4aa60859e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d7de5f52103d8b4aa806a548bc732616cc1f8f9f..aeeff3480e4a623c23f8491f19a180f2acbcab48 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fa46c5d51583bbb14156efcfd92bf455bbaa9187..2e764636789e1c91f2907b67bdf0b58eac653f9b 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 71fcc265d9af2bdec2af2f0d03708ff717179fb1..316af94078849f8f60630fdda7da2a94335f45c9 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 09ed2350b0c1f70a755126ccfca951f233aff00e..fc58266356223d48457d54a14d508a01712acc4c 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 0cc043c4c33888a7f99bdfcff52def1f71aa9b07..027b299e71072febe63d2cbe61cd754b11f1acba 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d0dcf9a14eb2a93c3bba3f162322eb4bb657e1a8..dbe89b387e61587f938a1c62b7c1fd0baa67e1b7 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 555217246c65b3e20ee40a8ef8d921a3bf23174c..9f343bdfc10febfdadca024043bead211881c0b3 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e82f3637a133a048ae52e03f6ec8a0bc74a1e2de..a5901a6211a251329f32e1aaa42636850bd8a952 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 62bc18ee07f1eb987793e2b00cd51ee5a78c2be9..6d49174e069a601163adb5915763901842a2cc22 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 91f697e332baa7437f8e83ea20ca97d9452f4e22..1779ad437c76e4192fd8c9774fc5a6f0ab8ccafb 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 57f18d9e8644de806f32c2364b6e1230124dcd1f..ed00a414bd0e689cfdb15b75ccf5d795ca40c992 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 66ddf31ca0ebdfc49dd086ed37670bf4bf6c75ab..3dc689a38527153dbef1f3ff9646cacaa6ee203f 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 1bde546b2d644d01af3642755ac86eed35d4a7eb..f62583583c3dc565579196d24ed564a14613eef9 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c871d382fbee9202b6443238c3437c63340091e6..c3b00b4b7f7942176300450faf9a0b42c956942b 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 c5bd68ab71c0714eec039e07bc1c456c8ce79060..284a09f42332fa456107017db9fb9bb5c78b3e65 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 9e6b2c9556a5d375dfec5ea8c28cd33d90761ad8..8b45a8a22eecf91511eb4143d70024c0171b5416 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 5735c26625106bf1050153b591bc9f2a7548769c..4f62fa07bba4261ae6cb78e6f2e1cdcfda57928a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 7c41d7c1894ca64af2fe1aa683c69e6cea16ac7a..719ae5863051343b253bf503c8b3535cf411a186 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 6cfeabdd056ae72f5b4b41469ba255a223c48942..cedf2aeb71c5811cfdebf2298717f91b218efe5d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 cd95ec1479ec809406665c715a037e708cd620cb..49487ff1b2e8ea9b9e23543a44a2878b797c4f2c 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 0118c2cdcc832de4b7e8ad43c0f1e0a5651b1474..d6a4b685e57112c8d718c4e2a1e6825d8699fb27 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 628cfa0871619eb07d536b66b96f9564ea1b7410..21a13d782e0d5cde5683626c2104c849b759b29d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 753f4fa50c0f689118eafbb5304085b13fd79b4f..4e05d4025fce42dc94381dd67cce35b72b9fd87b 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 0ae9f844f88c856efb42d0e7d1ade07db280920b..60547dd9e03e17f4bb35f7dbe00122f6d1bfdd50 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 85c492dcf0b880ae00ff52011e516bac96f1c7d1..de9939ce106adbe639e4120ffeb7212fab289c88 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 98726fbd9d31ac11a3aa1f1e0ece4f38d1e2434e..e5da53b48b74e8a2711a36a76b1fab81ee0a4313 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 30f2a1546cb2e98ae2384d9f04bf7fa025f0da81..a5a554f7a180bf157db7f7213b1c41c915968488 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 @@ use Magento\Mtf\Fixture\FixtureFactory;
* 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 13281a69566f9bad37e6c89d28199227ba66439e..a07799d5f1ed77d46b06462ab214248508b89b7b 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 7ac8c0621a4e7aa6fc128476faf41e22e51f3a7d..7e0204a90d4e177e4eaad066cdeb9b3c6df702e4 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 7107775cd9f9851c7066b7d30fe38d554b9f673d..95fae4642d8781dbc0b63f4d2ffd893e77b94ffc 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 @@ class OnePageCheckoutWithDiscountTest extends Scenario
{
$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 2bf0cb6d2d539a9266e2b6cee630e0898ecff3b0..92dc0f4f83956df10aa31e9c07a4ded103237de0 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 462aa845e3ccc99f4a1f0e73116a76b13e02a13d..ce2222ba3dd2c1aa378da6ff0b361e9970a7640f 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 @@ use Magento\Search\Test\Fixture\SynonymGroup;
* 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 d11a8213a96f06370983672ee011bb9df42965fa..7e6ec5c14da6dae51696bad68df3c52fb8df5108 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 @@ use Magento\Search\Test\Fixture\SynonymGroup;
* 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 207e84c5ffa194f20a85856e922290c5a45d51eb..4e9424a83be02886811e3f4af2967fb098be7202 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 @@ use Magento\Search\Test\Fixture\SynonymGroup;
* 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 984984ee25012464dfabd8204cc19532a8372260..042a656339abba2a79a850f12edd9b42a9832276 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 @@ use Magento\Search\Test\Fixture\SynonymGroup;
* 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 9a36e05e60abaf1ffc4e0091942102d2509f5243..cc75c27949c0e739c6e1b8eb3ae2cd9742583be7 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 03b38c58a9a1ac7fffe382b7077b36c9eb369c26..23a43100de85421927f774600aac3a316cc309e2 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 03c7a33533e9144d8841dfea885c46bc5085b4c3..c5b910c12470793916b8fa4aa68f64ff2d6b38f0 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 75b06ed87b4fc8026cf6d5e5625c3cf2b5d4802a..1612f1dac24e417393e861a0bbc04918791ab9d0 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 57154031e704d0c4d5eaba20d4cbcf5ad0ae6998..8fdab9165db036361d22ad2a6d211fbb7f45acd1 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 f953be4bc5a07c3aa096b7e845d45197137b7740..d3b7a3ccb130490244e4081a1bd7b22813f00b48 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 8e1b013745163e7e6d305adf35fec0d7bd32f06a..0bf600a7042f9889239507d06e51aa24a1fc4287 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 5344e07cfc9fae587adaa911774bbbbec1289b5f..b68f25bd7440ab18bfbd5a6b263c570311ab0140 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 @@ use Magento\Setup\Test\Page\Adminhtml\SetupWizard;
* 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 3ac010409f326fb0656b06f063daf4606e047273..064bc2ec0ba2b37ea57616cd1c6187e30114528f 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 fbffe760eaabf73e30d15dca598c397c94ba4e10..f820e92f9a5265b8b6db984b21e3fdf768d642f2 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d898fd80cde390d16926ca915d08b49a308dc9d6..e8f24bfccc05691525a46bed378a23bb088768b7 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4418882a8b309713f7c474b1e8d5342e18542be3..804111c497cca364fc749a477ee85e356c686d53 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 f7f5e6c6890791e82bd1c2c7dc1afeb502f8de08..5d638d781d173ab22923ad2772fd31a984dd944e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e2018dbdf73df8d564b1e8127c5a60f3ddf6ef12..766e030b3f61880551fd4b82ffc217ce0aa5179a 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 66d8cf55a10ad1365f21f1a3ffe347ddfc5b8848..cbe261fe750a8c7c8fd61244edd5387aea6152cb 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 a3980497764e611e4cf123a2c4ea47ced2c420d3..e7ba27b44c1a845bd513a55bf22d042b3100d1cc 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 5d5a068800b0450e5674d90e93b373fceaa5b54d..5d4af70cb03e3154364e03611be4347104d09db0 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4bd993e22d35a28a368abd717db74676a4df20ed..38250d958bc10273d3918789b6b00559bdf0c567 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 728e11825196f875d7d20db124b831c10f05e1b6..7e9143a5c91df4775bc2222a4281171ffb6681b7 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 050cb3734ccd2ea36681c69e0734bd8142016260..b187f05856670a1807b904a8b87bfca78ee51357 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 3a9afc2185792e321074086abb3ff5ccd7665a2d..9246bdcd9929b339d657bc1be42d739efb4858db 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 @@ use Magento\Swagger\Test\Page\SwaggerUiPage;
* 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 5837793ab263e8d2515257d20c5b5cf4c9abaede..b35c566fd9b988e1d0a03147419ecc45f366627e 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 @@ use Magento\Customer\Test\TestCase\AbstractApplyVatIdTest;
* 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 50a7167c207a819e21096f651dfcea4c979e37e5..f13cfc8d42793046b86b64b203a7abf52a12a85d 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 7722a7e9773299dfee949239a1226f273a645515..9cfa401510bc17bd1e0651f7cb3a71370c46a2fe 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 d256fe1783a912c9f8daf5721f585184f9d4420d..567e4860df12be2df431b9d0ee6d6a1a1c489792 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 18c4db9689b3e7bb60bb897f3df3c73137e8d26f..5553738b21463dd4acca5eedec362af5b672e70c 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b6c1391a0b04aa9a123b4ce7a66092471375f09e..14ef3cc293d923b5b006856ba4fccccccec9a610 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 7e972c17c492287e3b1322ab9769ce030e13df43..9517ee063ce67cbf33e50ed44412d8e7253526e2 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b0cc79aa52ea356c5a74f3c71e7bf63ecf951c00..ff54451529aabdfbab776361ab9769e2e848958e 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b9cf14a74e7fe6b8b8f638306b9087ff334c8645..bef2ede5733cd909a7e5358acf0f98ea76f6cdd8 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 57cdccd6edb9fd9228c0ef348fc69171efa7402c..39a80b783a0a1cf2dcb36a91e8d140bf3e236b8c 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 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
* 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 a441bbc68c77590ced6a9a2abe921f8429b791e8..c0049f0cc2fb39d22758a1ce3cae3fcc22bf9552 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 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
* 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 bfd360fbf1053a5f21239a319904b54f159300d5..d1f543c7b989137c209bdbd63e6c4755644e9e8b 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 @@ use Magento\Ui\Test\Block\Adminhtml\DataGrid;
* 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 f2dddaa65ff12ed62136e013fe757ebb67dd6fd3..c3502924b56e08f9456eb08db00d330f77363d95 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 718d87857218c1078202775211a4bc0d8cd00eb4..201a52ce5dec1a5c1df9e4cd489fcfdb8df7c6fe 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 9c25d56bb53c321cba7f0808795b73cc7a5db1c1..e333fdd2f0618a2af3620d9a7e35ffabfb256bcb 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 348d0548f1d156817079cc51f96016175af32589..0dcc9d8e1985b0fd1ccb7651dd2ff4de630bc803 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 e058f3c4041b44a6e5748de8b3ce42d950a888cf..4f4526d907be19bb12805a649bfe7ad6c28d18df 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 25fb260c1a863d16f13da038ff980517c9823a58..9d8491b8afa4bb9873fd836c5c215be9dee206c5 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4361bc2a6a7b4a9a95bc7a62a39ed5806cb31058..2c7cf3ecbf4ce58dcf18ae915f851a672954fa50 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 813f5b0937dadc2f0ba1ecca58155fea37b4f77c..04eb7fd5aa8e57499360cdce4662f3d2d4aa5648 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 2ba4e53b31e704f1a25ecf7a5d87461be359b556..1f9c09fcb5f3cd2998877f2b24aa08ffb81f5f53 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 22c82757dd4c899569fd25a3a97dc9e71fede166..2003bb4b27770239a2b9c2b8d75dc1a9a178f02b 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 39a11c0c16994e21bd1b4913b10fb1555cea9f2a..42dfaf10b9307a2aa0657ba5272459a91a83e0ac 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 65f0443812d1b5d8bbb9e5638d045776f95b101a..57de56c7f56f7397282e1863ec43a3f42c6a9ec2 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 7282818399d7f404f7d3c9c730aa7ecab68da628..c3f0d766406b20edcf62fffa9a4d172b915bcdb8 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 a14273d7f94846c59a663ddbe1ab88c9cb03e893..a6074b3f5ac6b4e4c40fee94d8a0af17c29066d8 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 @@ use Magento\User\Test\Fixture\User;
* 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 e6139c681d226d0dcfd024a16cada0786d654cf0..f570d179cd23e819c90cbc1a816c008e85d3b643 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 c3b65ce1ca97a58845594b8a3b743e5d0f9684d8..79c58c434e2387d59408aaf814bf451d5b4ac061 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 dc417cfa96d788d5d685edc363aaec11a95a94dc..aaf3a42dc1d1dd5490c7186f7ecaceb442903099 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 235d078b2831cdc1ed887b1aeef10b0d60eb8c00..5eb73d2087e01101dc45dce30c09523fceff2349 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 ff441a0ec574ac305e07b649b52318e7a55e8911..ccb146635719fd986917efb9f25ebb705ef7db31 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 88bc18a71bcecbc9270485a930b40c644b8dd13a..6b3e819eaf9039f93e270b9e0c97d40b72a75ddb 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 4f3b82b26dddcb1a8ba3d006e56deb4cf6017f7f..6e9631c7a95f9c4089130a4ff7dc3254bf101400 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 37d0fdc81c5aae9f6109b764b6c8074526bdb621..3c306280215ea1a2ee460db6f7838fd7c33caf7c 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 7d5e6d8284ff18babf07a49ed88df36b3ea003ee..a90bd37f33047ea9e339254f1f30f294b983f160 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 @@ use Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout;
* 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 @@ class DeleteSavedCreditCardTest extends Injectable
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 @@ class DeleteSavedCreditCardTest extends Injectable
}
// 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 @@ class DeleteSavedCreditCardTest extends Injectable
$this->proceedToCheckout();
$this->fillShippingMethod($shipping);
$assertCreditCardNotPresentOnCheckout->processAssert(
- $checkoutOnepage,
+ $this->checkoutOnepage,
$deletedCard['deletedCreditCard']
);
}
@@ -244,7 +261,7 @@ class DeleteSavedCreditCardTest extends Injectable
);
$saveCreditCardStep->run();
}
-
+
/**
* @return void
*/
@@ -255,7 +272,7 @@ class DeleteSavedCreditCardTest extends Injectable
);
$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 357dca735c9bd158ee76147a778d448f016c31ad..c3b82af6949c4a0ea114324abae90aa7ccab3a24 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 39332d9c657ab98626ed8fb02ed44623272eb12a..902ccc62af7f57c23db399bc22d5d3530b0a7515 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 @@ use Magento\Mtf\TestCase\Scenario;
* 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 5f3d91b58d147bdd8bde6f91aa450ba676cd3f70..e430afbbad197f59300e3fe442adb356dedf4cdf 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 0583cacb1a40bf655c9c146a3c13a6d1bb71efa9..edd021713f8923afef6901d32c5ab1bf974ff5b4 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 @@ use Magento\Widget\Test\Fixture\Widget;
* 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 f9426890212337e003e26f60a87de7f8c51d2ce4..ba89d591e36406475ebd3783e777d049ff599517 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 6804bdfa464985acd9c742ac1dea1d1b2c2649e0..9959796828df23943db8fc3f6dfdce4b6387e1ac 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 1a145f4a06c723204a553f1d81d159bc63d26c33..cf16a045c3487ca9c8520a03ff4b47fc83ed84dd 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 ed0f91570a64fb3bad8d4cde5dfef5f3feadfda7..21841a70b356ddef0003ab21939342f2bfce6988 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 @@ use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
* 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 2abae352944105f8093688c33a5271a653d3b7c1..3738dd0631e82510715c1ef10f2c12dd5cc7c5d1 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 2699153ef9a1b5b7491ee38ef796760e879ca53c..aca814aebca6ad7815442f76a0a9e587784e10a7 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 @@ use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
* 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 9705358cba55bbfd98b2e40246f5ed7be1f78ba6..361e80ea56b023cf48cb9b3ca45e20bbf3fabfe2 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 @@ use Magento\Customer\Test\Fixture\Customer;
* 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 33c47f44069707748bd5af5fc302e804a7deea3c..7ff599cf43df04daa283eb1a334a6c7b74019715 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 @@ use Magento\Mtf\Fixture\FixtureInterface;
* 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 fd8abbe0644fd861ffb3563e941175fa33fb3102..866b60f3dc26a29f5c71e139dafbc2f616df1448 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 @@ use Magento\Mtf\TestCase\Injectable;
* 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 b1736c332b01c97a824e075c3aed73cbe1214372..06b0bfa77bf1da97e8c7c4955397b72955c7837a 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 @@ use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
* 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 6c7e8b334baa5b3d9b0baa3804bd18dddb5ecc37..507cf768acfa9bc7d1e4522425e87acd3e8a6de0 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 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
/** @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 cdb06f36d53b6da31d89e635882fc6ca1ef90e9b..0000000000000000000000000000000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
- <rule scope="testcase">
- <allow>
- <tag group="domain" value="CS" />
- </allow>
- <deny>
- <tag group="stable" value="no" />
- <tag group="to_maintain" value="yes" />
- <tag group="test_type" value="3rd_party_test_deprecated" />
- </deny>
- </rule>
- <rule scope="variation">
- <deny>
- <tag group="stable" value="no" />
- <tag group="to_maintain" value="yes" />
- <tag group="test_type" value="3rd_party_test" />
- </deny>
- </rule>
-</config>
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 9c5788733cdbc6b0a670a1b301a2024c660d382a..0000000000000000000000000000000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
- <rule scope="testcase">
- <allow>
- <tag group="domain" value="MX" />
- </allow>
- <deny>
- <tag group="test_type" value="3rd_party_test_deprecated" />
- </deny>
- </rule>
- <rule scope="variation">
- <deny>
- <tag group="test_type" value="3rd_party_test" />
- </deny>
- </rule>
-</config>
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 9b7e29085936e28939a1540a31922a5ea31bd320..0000000000000000000000000000000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
- <rule scope="testcase">
- <allow>
- <tag group="domain" value="PS" />
- </allow>
- <deny>
- <tag group="stable" value="no" />
- <tag group="to_maintain" value="yes" />
- <tag group="test_type" value="3rd_party_test_deprecated" />
- </deny>
- </rule>
- <rule scope="variation">
- <deny>
- <tag group="stable" value="no" />
- <tag group="to_maintain" value="yes" />
- <tag group="test_type" value="3rd_party_test" />
- </deny>
- </rule>
-</config>
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4029454ee523052fedcc9592b778fea9704b7abf
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Scan source code for DB schema or data updates for patch releases in non-actual branches
+ * Backwards compatibility test
+ */
+namespace Magento\Test\Legacy;
+
+class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var string
+ */
+ protected static $changedFilesPattern = __DIR__ . '/../_files/changed_files*';
+
+ /**
+ * @var string
+ */
+ protected static $changedFileList = '';
+
+ /**
+ * Set changed files paths and list for all projects
+ */
+ public static function setUpBeforeClass()
+ {
+ foreach (glob(self::$changedFilesPattern) as $changedFile) {
+ self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
+ }
+ }
+
+ /**
+ * Test changes for module.xml files
+ */
+ public function testModuleXmlFiles()
+ {
+ preg_match_all('|etc/module\.xml$|mi', self::$changedFileList, $matches);
+ $this->assertEmpty(
+ reset($matches),
+ 'module.xml changes for patch releases in non-actual branches are not allowed:' . PHP_EOL .
+ implode(PHP_EOL, array_values(reset($matches)))
+ );
+ }
+
+ /**
+ * Test changes for files in Module Setup dir
+ */
+ public function testModuleSetupFiles()
+ {
+ preg_match_all('|app/code/Magento/[^/]+/Setup/[^/]+$|mi', self::$changedFileList, $matches);
+ $this->assertEmpty(
+ reset($matches),
+ 'Code with changes for DB schema or data in non-actual branches are not allowed:' . PHP_EOL .
+ implode(PHP_EOL, array_values(reset($matches)))
+ );
+ }
+}
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 11f31e707a0481655c273435e4bd40b20ebd725f..d1b65b5ea907be657c2261a78ddddb8fafa398bf 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -139,7 +139,7 @@ class Template extends AbstractBlock
}
/**
- * Set template context. Sets the object that should represent $this in template
+ * Set template context. Sets the object that should represent $block in template
*
* @param \Magento\Framework\View\Element\BlockInterface $templateContext
* @return void
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index ebdad945cd977515f7aa08bbb0a4130719423c67..62f8cf476b808264a59e6592b73a069f127c6ddb 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -224,7 +224,7 @@
}
return true;
},
- 'Please enter a number greater 0 in this field.'
+ $.mage.__('Please enter a number greater 0 in this field.')
],
'validate-rating': [
function () {
@@ -236,7 +236,7 @@
});
return noError;
},
- 'Please select one of each ratings above.'
+ $.mage.__('Please select one of each ratings above.')
],
'validate-downloadable-file': [
function (v, element) {
@@ -267,7 +267,7 @@
}
return true;
},
- 'Please specify Url.'
+ $.mage.__('Please specify Url.')
]
}, function (rule, i) {
rule.unshift(i);
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 4562285654c70f8b991e89866dfc82977842dd64..f0b67e3fb86657262b39f9354d9dac854f523fd9 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -275,6 +275,9 @@ define([
if (!target.hasClass('level-top') || !target.has(".ui-menu").length) {
window.location.href = target.find('> a').attr('href');
}
+ },
+ "click .ui-menu-item:has(.ui-state-active)": function (event) {
+ this.collapseAll(event, true);
}
});
@@ -390,6 +393,39 @@ define([
};
return setTimeout(handlerProxy, delay || 0);
+ },
+ expand: function( event ) {
+ var newItem = this.active &&
+ this.active
+ .children( ".ui-menu " )
+ .children( ".ui-menu-item" )
+ .first();
+
+ if ( newItem && newItem.length ) {
+ if (newItem.closest( ".ui-menu" ).is( ":visible" )
+ && newItem.closest( ".ui-menu" ).has( ".all-categories" )
+ ) {
+ return;
+ }
+
+ this._open( newItem.parent() );
+
+ // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+ this._delay(function() {
+ this.focus( event, newItem );
+ });
+ }
+ },
+ select: function( event ) {
+ this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+ if (this.active.is( ".all-category" )) {
+ this.active = $( event.target ).closest( ".ui-menu-item" );
+ }
+ var ui = { item: this.active };
+ if ( !this.active.has( ".ui-menu" ).length ) {
+ this.collapseAll( event, true );
+ }
+ this._trigger( "select", event, ui );
}
});
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index f61177188bdccc40393099e46defa5ddf4bb7168..6c8deba8164112a31939b11d1ed79b5c23dd7bc0 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -166,13 +166,13 @@
function (value, element, params) {
return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length < params;
},
- 'Please enter {0} words or less.'
+ $.mage.__('Please enter {0} words or less.')
],
"min-words": [
function (value, element, params) {
return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length >= params;
},
- 'Please enter at least {0} words.'
+ $.mage.__('Please enter at least {0} words.')
],
"range-words": [
function (value, element, params) {
@@ -180,43 +180,43 @@
$.mage.stripHtml(value).match(/\b\w+\b/g).length >= params[0] &&
value.match(/bw+b/g).length < params[1];
},
- 'Please enter between {0} and {1} words.'
+ $.mage.__('Please enter between {0} and {1} words.')
],
"letters-with-basic-punc": [
function (value, element) {
return this.optional(element) || /^[a-z\-.,()'\"\s]+$/i.test(value);
},
- 'Letters or punctuation only please'
+ $.mage.__('Letters or punctuation only please')
],
"alphanumeric": [
function (value, element) {
return this.optional(element) || /^\w+$/i.test(value);
},
- 'Letters, numbers, spaces or underscores only please'
+ $.mage.__('Letters, numbers, spaces or underscores only please')
],
"letters-only": [
function (value, element) {
return this.optional(element) || /^[a-z]+$/i.test(value);
},
- 'Letters only please'
+ $.mage.__('Letters only please')
],
"no-whitespace": [
function (value, element) {
return this.optional(element) || /^\S+$/i.test(value);
},
- 'No white space please'
+ $.mage.__('No white space please')
],
"zip-range": [
function (value, element) {
return this.optional(element) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
},
- 'Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx'
+ $.mage.__('Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx')
],
"integer": [
function (value, element) {
return this.optional(element) || /^-?\d+$/.test(value);
},
- 'A positive or negative non-decimal number please'
+ $.mage.__('A positive or negative non-decimal number please')
],
"vinUS": [
function (v) {
@@ -259,7 +259,7 @@
}
return false;
},
- 'The specified vehicle identification number (VIN) is invalid.'
+ $.mage.__('The specified vehicle identification number (VIN) is invalid.')
],
"dateITA": [
function (value, element) {
@@ -282,7 +282,7 @@
}
return this.optional(element) || check;
},
- 'Please enter a correct date'
+ $.mage.__('Please enter a correct date')
],
"dateNL": [
function (value, element) {
@@ -294,13 +294,13 @@
function (value, element) {
return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
},
- 'Please enter a valid time, between 00:00 and 23:59'
+ $.mage.__('Please enter a valid time, between 00:00 and 23:59')
],
"time12h": [
function (value, element) {
return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
},
- 'Please enter a valid time, between 00:00 am and 12:00 pm'
+ $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
],
"phoneUS": [
function (phone_number, element) {
@@ -308,27 +308,27 @@
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
},
- 'Please specify a valid phone number'
+ $.mage.__('Please specify a valid phone number')
],
"phoneUK": [
function (phone_number, element) {
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
},
- 'Please specify a valid phone number'
+ $.mage.__('Please specify a valid phone number')
],
"mobileUK": [
function (phone_number, element) {
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
},
- 'Please specify a valid mobile number'
+ $.mage.__('Please specify a valid mobile number')
],
"stripped-min-length": [
function (value, element, param) {
return value.length >= param;
},
- 'Please enter at least {0} characters'
+ $.mage.__('Please enter at least {0} characters')
],
"email2": [
function (value, element) {
@@ -407,25 +407,25 @@
}
return false;
},
- 'Please enter a valid credit card number.'
+ $.mage.__('Please enter a valid credit card number.')
],
"ipv4": [
function (value, element) {
return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);
},
- 'Please enter a valid IP v4 address.'
+ $.mage.__('Please enter a valid IP v4 address.')
],
"ipv6": [
function (value, element) {
return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
},
- 'Please enter a valid IP v6 address.'
+ $.mage.__('Please enter a valid IP v6 address.')
],
"pattern": [
function (value, element, param) {
return this.optional(element) || param.test(value);
},
- 'Invalid format.'
+ $.mage.__('Invalid format.')
],
"allow-container-className": [
function (element) {
@@ -439,67 +439,67 @@
function (value) {
return !/<(\/)?\w+/.test(value);
},
- 'HTML tags are not allowed.'
+ $.mage.__('HTML tags are not allowed.')
],
"validate-select": [
function (value) {
return ((value !== "none") && (value != null) && (value.length !== 0));
},
- 'Please select an option.'
+ $.mage.__('Please select an option.')
],
"validate-no-empty": [
function (value) {
return !$.mage.isEmpty(value);
},
- 'Empty Value.'
+ $.mage.__('Empty Value.')
],
"validate-alphanum-with-spaces": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9 ]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.')
],
"validate-data": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[A-Za-z]+[A-Za-z0-9_]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')
],
"validate-street": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.')
],
"validate-phoneStrict": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
},
- 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
+ $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
],
"validate-phoneLax": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^((\d[\-. ]?)?((\(\d{3}\))|\d{3}))?[\-. ]?\d{3}[\-. ]?\d{4}$/.test(v);
},
- 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
+ $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
],
"validate-fax": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
},
- 'Please enter a valid fax number (Ex: 123-456-7890).'
+ $.mage.__('Please enter a valid fax number (Ex: 123-456-7890).')
],
"validate-email": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(v);
},
- 'Please enter a valid email address (Ex: johndoe@domain.com).'
+ $.mage.__('Please enter a valid email address (Ex: johndoe@domain.com).')
],
"validate-emailSender": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[\S ]+$/.test(v);
},
- 'Please enter a valid email address (Ex: johndoe@domain.com).'
+ $.mage.__('Please enter a valid email address (Ex: johndoe@domain.com).')
],
"validate-password": [
function (v) {
@@ -513,7 +513,7 @@
}
return !(pass.length > 0 && pass.length < 6);
},
- 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
+ $.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
],
"validate-admin-password": [
function (v) {
@@ -533,7 +533,7 @@
}
return true;
},
- 'Please enter 7 or more characters, using both numeric and alphabetic.'
+ $.mage.__('Please enter 7 or more characters, using both numeric and alphabetic.')
],
"validate-customer-password": [
function (v, elm) {
@@ -584,35 +584,35 @@
return (/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i).test(v);
},
- 'Please enter a valid URL. Protocol is required (http://, https:// or ftp://).'
+ $.mage.__('Please enter a valid URL. Protocol is required (http://, https:// or ftp://).')
],
"validate-clean-url": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v) || /^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v);
},
- 'Please enter a valid URL. For example http://www.example.com or www.example.com.'
+ $.mage.__('Please enter a valid URL. For example http://www.example.com or www.example.com.')
],
"validate-xml-identifier": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[A-Z][A-Z0-9_\/-]*$/i.test(v);
},
- 'Please enter a valid XML-identifier (Ex: something_1, block5, id-4).'
+ $.mage.__('Please enter a valid XML-identifier (Ex: something_1, block5, id-4).')
],
"validate-ssn": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^\d{3}-?\d{2}-?\d{4}$/.test(v);
},
- 'Please enter a valid social security number (Ex: 123-45-6789).'
+ $.mage.__('Please enter a valid social security number (Ex: 123-45-6789).')
],
"validate-zip-us": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /(^\d{5}$)|(^\d{5}-\d{4}$)/.test(v);
},
- 'Please enter a valid zip code (Ex: 90602 or 90602-1234).'
+ $.mage.__('Please enter a valid zip code (Ex: 90602 or 90602-1234).')
],
"validate-date-au": [
function (v) {
@@ -629,14 +629,14 @@
parseInt(RegExp.$3, 10) === d.getFullYear();
},
- 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'
+ $.mage.__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.')
],
"validate-currency-dollar": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(v);
},
- 'Please enter a valid $ amount. For example $100.00.'
+ $.mage.__('Please enter a valid $ amount. For example $100.00.')
],
"validate-not-negative-number": [
function (v) {
@@ -647,7 +647,7 @@
return !isNaN(v) && v >= 0;
},
- 'Please enter a number 0 or greater in this field.'
+ $.mage.__('Please enter a number 0 or greater in this field.')
],
// validate-not-negative-number should be replaced in all places with this one and then removed
"validate-zero-or-greater": [
@@ -659,7 +659,7 @@
return !isNaN(v) && v >= 0;
},
- 'Please enter a number 0 or greater in this field.'
+ $.mage.__('Please enter a number 0 or greater in this field.')
],
"validate-greater-than-zero": [
function (v) {
@@ -669,7 +669,7 @@
v = $.mage.parseNumber(v);
return !isNaN(v) && v > 0;
},
- 'Please enter a number greater than 0 in this field.'
+ $.mage.__('Please enter a number greater than 0 in this field.')
],
"validate-css-length": [
function (v) {
@@ -678,20 +678,20 @@
}
return true;
},
- 'Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).'
+ $.mage.__('Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).')
],
/** @description Additional methods */
"validate-number": [
function (v) {
return $.mage.isEmptyNoTrim(v) || (!isNaN($.mage.parseNumber(v)) && /^\s*-?\d*(\.\d*)?\s*$/.test(v));
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"required-number": [
function (v) {
return !!v.length;
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"validate-number-range": [
function (v, elm, param) {
@@ -731,14 +731,14 @@
return result;
},
- 'The value is not within the specified range.',
+ $.mage.__('The value is not within the specified range.'),
true
],
"validate-digits": [
function (v) {
return $.mage.isEmptyNoTrim(v) || !/[^\d]/.test(v);
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"validate-digits-range": [
function (v, elm, param) {
@@ -778,7 +778,7 @@
return result;
},
- 'The value is not within the specified range.',
+ $.mage.__('The value is not within the specified range.'),
true
],
'validate-range': [
@@ -819,31 +819,32 @@
}
return result;
},
- 'The value is not within the specified range.'
+ $.mage.__('The value is not within the specified range.')
],
"validate-alpha": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z]+$/.test(v);
},
- 'Please use letters only (a-z or A-Z) in this field.'
+ $.mage.__('Please use letters only (a-z or A-Z) in this field.')
],
"validate-code": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-z]+[a-z0-9_]+$/.test(v);
},
- 'Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
+ $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')
],
"validate-alphanum": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.'
+ $.mage.__('Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.')
],
"validate-date": [
function (v) {
var test = new Date(v);
return $.mage.isEmptyNoTrim(v) || !isNaN(test);
- }, 'Please enter a valid date.'
+ },
+ $.mage.__('Please enter a valid date.')
],
"validate-date-range": [
@@ -866,7 +867,7 @@
return !dependentElements.length || $.mage.isEmptyNoTrim(dependentElements[0].value) ||
normalizedTime(v) <= normalizedTime(dependentElements[0].value);
},
- 'Make sure the To Date is later than or the same as the From Date.'
+ $.mage.__('Make sure the To Date is later than or the same as the From Date.')
],
"validate-cpassword": [
function () {
@@ -887,13 +888,13 @@
}
return (pass.val() === conf.val());
},
- 'Please make sure your passwords match.'
+ $.mage.__('Please make sure your passwords match.')
],
"validate-identifier": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(v);
},
- 'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").'
+ $.mage.__('Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").')
],
"validate-zip-international": [
/*function(v) {
@@ -903,7 +904,7 @@
function () {
return true;
},
- 'Please enter a valid zip code.'
+ $.mage.__('Please enter a valid zip code.')
],
"validate-one-required": [
function (v, elm) {
@@ -913,13 +914,13 @@
return $(elm).val();
}).length > 0;
},
- 'Please select one of the options above.'
+ $.mage.__('Please select one of the options above.')
],
"validate-state": [
function (v) {
return (v !== 0 || v === '');
},
- 'Please select State/Province.'
+ $.mage.__('Please select State/Province.')
],
"required-file": [
function (v, elm) {
@@ -932,7 +933,7 @@
}
return result;
},
- 'Please select a file.'
+ $.mage.__('Please select a file.')
],
"validate-ajax-error": [
function (v, element) {
@@ -961,7 +962,7 @@
}
return hasWithValue ^ hasWithNoValue;
},
- 'The field isn\'t complete.'
+ $.mage.__('The field isn\'t complete.')
],
"validate-required-datetime": [
function (v, elm, param) {
@@ -973,7 +974,7 @@
}
return true;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
"validate-one-required-by-name": [
function (v, elm, selector) {
@@ -1024,7 +1025,8 @@
}
}
return true;
- }, "Please enter valid email addresses, separated by commas. For example, johndoe@domain.com, johnsmith@domain.com."
+ },
+ $.mage.__("Please enter valid email addresses, separated by commas. For example, johndoe@domain.com, johnsmith@domain.com.")
],
"validate-cc-type-select": [
@@ -1040,7 +1042,8 @@
return creditCartTypes[value][0].test($(params).val().replace(/\s+/g, ''));
}
return false;
- }, 'Card type does not match credit card number.'
+ },
+ $.mage.__('Card type does not match credit card number.')
],
"validate-cc-number": [
/**
@@ -1053,7 +1056,8 @@
return validateCreditCard(value);
}
return false;
- }, 'Please enter a valid credit card number.'
+ },
+ $.mage.__('Please enter a valid credit card number.')
],
"validate-cc-type": [
/**
@@ -1074,7 +1078,8 @@
}
}
return false;
- }, 'Credit card number does not match credit card type.'
+ },
+ $.mage.__('Credit card number does not match credit card type.')
],
"validate-cc-exp": [
/**
@@ -1095,7 +1100,8 @@
isValid = !year || year > currentYear || (year == currentYear && month >= currentMonth);
}
return isValid;
- }, 'Incorrect credit card expiration date.'
+ },
+ $.mage.__('Incorrect credit card expiration date.')
],
"validate-cc-cvn": [
/**
@@ -1113,7 +1119,8 @@
}
}
return false;
- }, 'Please enter a valid credit card verification number.'
+ },
+ $.mage.__('Please enter a valid credit card verification number.')
],
"validate-cc-ukss": [
/**
@@ -1123,7 +1130,8 @@
*/
function (value) {
return value;
- }, 'Please enter issue number or start date for switch/solo card type.'
+ },
+ $.mage.__('Please enter issue number or start date for switch/solo card type.')
],
"validate-length": [
@@ -1166,7 +1174,7 @@
else
return true;
},
- 'Please enter positive number in this field.'
+ $.mage.__('Please enter positive number in this field.')
],
'validate-per-page-value-list': [
function (v) {
@@ -1179,7 +1187,7 @@
}
return isValid;
},
- 'Please enter a valid value, ex: 10,20,30'
+ $.mage.__('Please enter a valid value, ex: 10,20,30')
],
'validate-per-page-value': [
function (v, elm) {
@@ -1189,7 +1197,7 @@
var values = $('#' + elm.id + '_values').val().split(',');
return values.indexOf(v) != -1;
},
- 'Please enter a valid value from list'
+ $.mage.__('Please enter a valid value from list')
],
'validate-new-password': [
function (v) {
@@ -1202,7 +1210,7 @@
}
return true;
},
- 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
+ $.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
],
'required-if-not-specified': [
function (value, element, params) {
@@ -1226,7 +1234,7 @@
return valid;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
'required-if-all-sku-empty-and-file-not-loaded': [
function (value, element, params) {
@@ -1254,7 +1262,8 @@
});
return valid;
- }, 'Please enter valid SKU key.'
+ },
+ $.mage.__('Please enter valid SKU key.')
],
'required-if-specified': [
function (value, element, params) {
@@ -1279,7 +1288,7 @@
return valid;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
'required-number-if-specified': [
function (value, element, params) {
@@ -1298,7 +1307,7 @@
return valid ? !!value.length : true;
},
- 'Please enter a valid number.'
+ $.mage.__('Please enter a valid number.')
],
'datetime-validation': [
function (value, element) {
@@ -1311,19 +1320,19 @@
return isValid;
},
- 'This is required field'
+ $.mage.__('This is required field')
],
'required-text-swatch-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'required-visual-swatch-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'required-dropdown-attribute-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'validate-item-quantity': [
function (value, element, params) {
@@ -1357,7 +1366,22 @@
}
});
$.validator.messages = $.extend($.validator.messages, {
- required: $.mage.__('This is a required field.')
+ required: $.mage.__('This is a required field.'),
+ remote: $.mage.__('Please fix this field.'),
+ email: $.mage.__('Please enter a valid email address.'),
+ url: $.mage.__('Please enter a valid URL.'),
+ date: $.mage.__('Please enter a valid date.'),
+ dateISO: $.mage.__('Please enter a valid date (ISO).'),
+ number: $.mage.__('Please enter a valid number.'),
+ digits: $.mage.__('Please enter only digits.'),
+ creditcard: $.mage.__('Please enter a valid credit card number.'),
+ equalTo: $.mage.__('Please enter the same value again.'),
+ maxlength: $.validator.format($.mage.__('Please enter no more than {0} characters.')),
+ minlength: $.validator.format($.mage.__('Please enter at least {0} characters.')),
+ rangelength: $.validator.format($.mage.__('Please enter a value between {0} and {1} characters long.')),
+ range: $.validator.format($.mage.__('Please enter a value between {0} and {1}.')),
+ max: $.validator.format($.mage.__('Please enter a value less than or equal to {0}.')),
+ min: $.validator.format($.mage.__('Please enter a value greater than or equal to {0}.'))
});
if ($.metadata) {
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
index a60ca5e737b6d1e90d5b10f7661d2ca020cf9f7f..b1c4db994ed2a7d52ec78d45fecdebe6b6360512 100644
--- a/lib/web/mage/validation/validation.js
+++ b/lib/web/mage/validation/validation.js
@@ -36,7 +36,7 @@
});
return result && total > 0;
},
- 'Please specify the quantity of product(s).'
+ $.mage.__('Please specify the quantity of product(s).')
],
'validate-one-checkbox-required-by-name': [
function (value, element, params) {
@@ -60,7 +60,7 @@
return false;
}
},
- 'Please select one of the options.'
+ $.mage.__('Please select one of the options.')
],
'validate-date-between': [
function (value, element, params) {
@@ -89,7 +89,7 @@
yearVal = $(dob).find(params[2]).find('input:text').val(),
dobLength = dayVal.length + monthVal.length + yearVal.length;
if (params[3] && dobLength === 0) {
- this.dobErrorMessage = 'This is a required field.';
+ this.dobErrorMessage = $.mage.__('This is a required field.');
return false;
}
if (!params[3] && dobLength === 0) {
@@ -100,11 +100,11 @@
year = parseInt(yearVal, 10) || 0,
curYear = (new Date()).getFullYear();
if (!day || !month || !year) {
- this.dobErrorMessage = 'Please enter a valid full date.';
+ this.dobErrorMessage = $.mage.__('Please enter a valid full date.');
return false;
}
if (month < 1 || month > 12) {
- this.dobErrorMessage = 'Please enter a valid month (1-12).';
+ this.dobErrorMessage = $.mage.__('Please enter a valid month (1-12).');
return false;
}
if (year < 1900 || year > curYear) {
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index dad3fc087c01601720813fe895fa9c4137ec8972..1b89ea2be06a5121c53b2ea8a97a681db067d0df 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -113,24 +113,6 @@ angular.module('readiness-check', ['remove-dialog'])
updaterNoticeMessage: ''
};
$scope.items = {
- 'php-version': {
- url:'index.php/environment/php-version',
- params: $scope.actionFrom,
- useGet: true,
- show: function() {
- $scope.startProgress();
- $scope.version.visible = true;
- },
- process: function(data) {
- $scope.version.processed = true;
- angular.extend($scope.version, data);
- $scope.updateOnProcessed($scope.version.responseType);
- $scope.stopProgress();
- },
- fail: function() {
- $scope.requestFailedHandler($scope.version);
- }
- },
'php-settings': {
url:'index.php/environment/php-settings',
params: $scope.actionFrom,
@@ -173,6 +155,24 @@ angular.module('readiness-check', ['remove-dialog'])
};
if ($scope.actionFrom === 'installer') {
+ $scope.items['php-version'] = {
+ url:'index.php/environment/php-version',
+ params: $scope.actionFrom,
+ useGet: true,
+ show: function() {
+ $scope.startProgress();
+ $scope.version.visible = true;
+ },
+ process: function(data) {
+ $scope.version.processed = true;
+ angular.extend($scope.version, data);
+ $scope.updateOnProcessed($scope.version.responseType);
+ $scope.stopProgress();
+ },
+ fail: function() {
+ $scope.requestFailedHandler($scope.version);
+ }
+ };
$scope.items['file-permissions'] = {
url:'index.php/environment/file-permissions',
show: function() {
@@ -260,22 +260,20 @@ angular.module('readiness-check', ['remove-dialog'])
}
};
}
-
}
$scope.isCompleted = function() {
- return $scope.version.processed
- && $scope.settings.processed
+ var cronProcessed = (
+ $scope.cronScript.processed
+ && ($scope.componentDependency.processed || !$scope.componentDependency.enabled)
+ && $scope.updater.processed
+ );
+
+ return $scope.settings.processed
&& $scope.extensions.processed
&& ($scope.permissions.processed || ($scope.actionFrom === 'updater'))
- && (
- (
- $scope.cronScript.processed
- && ($scope.componentDependency.processed || !$scope.componentDependency.enabled)
- && $scope.updater.processed
- )
- || ($scope.actionFrom !== 'updater')
- );
+ && ($scope.version.processed || ($scope.actionFrom === 'updater'))
+ && (cronProcessed || ($scope.actionFrom !== 'updater'));
};
$scope.updateOnProcessed = function(value) {
diff --git a/setup/src/Magento/Setup/Controller/CompleteBackup.php b/setup/src/Magento/Setup/Controller/CompleteBackup.php
index d8996cca7fe642f8011df06ce8f6e0764259f937..f194f02ed1fc96209bbc11a5b7da22cd7e0fe65d 100644
--- a/setup/src/Magento/Setup/Controller/CompleteBackup.php
+++ b/setup/src/Magento/Setup/Controller/CompleteBackup.php
@@ -18,8 +18,8 @@ class CompleteBackup extends AbstractActionController
public function indexAction()
{
$view = new ViewModel;
- $view->setTerminal(true);
- $view->setTemplate('/magento/setup/complete-backup.phtml');
+ $view->setTemplate('/error/404.phtml');
+ $this->getResponse()->setStatusCode(\Zend\Http\Response::STATUS_CODE_404);
return $view;
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php
index 7101629502cb26f3350e33da6d2082ff31ae6d55..efe87a98889e047c3b14c2a9977adff0f0c96017 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php
@@ -26,8 +26,11 @@ class CompleteBackupTest extends \PHPUnit_Framework_TestCase
{
$viewModel = $this->controller->indexAction();
$this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
- $this->assertTrue($viewModel->terminate());
- $this->assertSame('/magento/setup/complete-backup.phtml', $viewModel->getTemplate());
+ $this->assertSame('/error/404.phtml', $viewModel->getTemplate());
+ $this->assertSame(
+ \Zend\Http\Response::STATUS_CODE_404,
+ $this->controller->getResponse()->getStatusCode()
+ );
}
public function testProgressAction()
diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml
index 35c0c911b184cf9e3759eba4e9032cedd73216ff..135fb89b9773e40bfd879999def6a8af731d1a44 100644
--- a/setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/view/magento/setup/create-admin-account.phtml
@@ -19,7 +19,7 @@ $passwordWizard = sprintf(
</div>
<p>%s</p>',
'Password Strength:',
- 'Enter a mix of 7 or more numbers and letters. For a stronger password, include at least one small letter, big letter, and symbol (Ex: BuyIt$54).'
+ 'Enter a mix of 7 or more numbers and letters. For a stronger password, include at least one small letter, big letter, and symbol.'
);
?>