diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 665d0dd966bae..b825d0de50031 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,6 +1,6 @@ { "require": { - "magento/mtf": "1.0.0-rc16", + "magento/mtf": "1.0.0-rc17", "php": "~5.5.0|~5.6.0", "phpunit/phpunit": "4.1.0", "phpunit/phpunit-selenium": ">=1.2", diff --git a/dev/tests/functional/etc/global/config.xml b/dev/tests/functional/etc/config.xml similarity index 78% rename from dev/tests/functional/etc/global/config.xml rename to dev/tests/functional/etc/config.xml index 639209e08485b..eea1e7ae99144 100644 --- a/dev/tests/functional/etc/global/config.xml +++ b/dev/tests/functional/etc/config.xml @@ -10,15 +10,15 @@ testCase admin 123123q - http://magento.dev/backend/ - admin + http://magento2ce.com/admin/ + admin/auth/login 127.0.0.1 root 123123q default - http://127.0.0.1/magento2/ + http://magento2ce.com/ backend diff --git a/dev/tests/functional/etc/global/config.xsd b/dev/tests/functional/etc/config.xsd similarity index 100% rename from dev/tests/functional/etc/global/config.xsd rename to dev/tests/functional/etc/config.xsd diff --git a/dev/tests/functional/etc/global/di.xml b/dev/tests/functional/etc/di.xml similarity index 77% rename from dev/tests/functional/etc/global/di.xml rename to dev/tests/functional/etc/di.xml index 2ebece73669c1..8c2a0fe525d51 100644 --- a/dev/tests/functional/etc/global/di.xml +++ b/dev/tests/functional/etc/di.xml @@ -5,12 +5,12 @@ * See COPYING.txt for license details. */ --> - + - etc/global/config.xsd + etc/config.xsd diff --git a/dev/tests/functional/etc/global/events.xml b/dev/tests/functional/etc/events.xml similarity index 100% rename from dev/tests/functional/etc/global/events.xml rename to dev/tests/functional/etc/events.xml diff --git a/dev/tests/functional/etc/global/events.xsd b/dev/tests/functional/etc/events.xsd similarity index 100% rename from dev/tests/functional/etc/global/events.xsd rename to dev/tests/functional/etc/events.xsd diff --git a/dev/tests/functional/etc/global/variations.xsd b/dev/tests/functional/etc/global/variations.xsd deleted file mode 100644 index dcec4703332aa..0000000000000 --- a/dev/tests/functional/etc/global/variations.xsd +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - The root element for configuration data. - - - - - - - - An element that contains configuration data of a test case. - - - - - - - - - - - - - - An element that contains configuration data of a test case variation. - - - - - - - - - - - - - - - An element that contains a single configuration data set of a test case variation. - - - - - - - - - - - - - - - - - - diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml index 5566256b223d9..296c0e0183dc7 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Backend\Test\Block\Cache - div.page-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml index 9b003e378bc62..4060273331ae0 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml @@ -4,33 +4,13 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ ---> - - - - Magento\Backend\Test\Block\Page\Header - .page-header - css selector - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Backend\Test\Block\Page\Main - .dashboard-main - css selector - - - Magento\Backend\Test\Block\Menu - .navigation - css selector - - - Magento\Backend\Test\Block\Dashboard\StoreStats - .dashboard-store-stats - css selector - - - + --> + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml index 130e053dcfa47..5f5cefb6e2059 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\Delete\Form - #edit_form - css selector - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml index 14c23d649a503..80ece6d746b71 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\Delete\Form - #edit_form - css selector - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditGroup.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditGroup.xml index dff4a591c1cd9..1189da53e7eb5 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditGroup.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditStore.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditStore.xml index ada5ed16d6597..c886d07518be0 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditStore.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditStore.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditWebsite.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditWebsite.xml index 55d4b1a8175bd..ca28e1138269b 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditWebsite.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditWebsite.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewGroupIndex.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewGroupIndex.xml index da18952405803..80007a9aa79de 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewGroupIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewGroupIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewWebsiteIndex.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewWebsiteIndex.xml index 97428c8e25a93..66750fc9fe91a 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewWebsiteIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewWebsiteIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml index 8154fce55f5e1..30718dc11b7c9 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\System\Store\Delete\Form - #edit_form - css selector - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml index ae7eaf3f2c32f..f5ced5274cf82 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\System\Store\GridPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\StoreGrid - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreNew.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreNew.xml index 095e553931ab5..85c9b50adec88 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreNew.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\System\Store\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfig.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfig.xml index dd557bf72abe7..be9dea9366587 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfig.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfig.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\System\Config\PageActions - .page-main-actions - css selector - -
- Magento\Backend\Test\Block\System\Config\Form - #config-edit-form - css selector -
- - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml index ecc562248fa41..e70779c96e7eb 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml @@ -1,24 +1,14 @@ - + - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/page.xml deleted file mode 100644 index 2d74061337275..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/page.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - admin/dashboard - adminhtml - Magento\Backend\Test\Page\Adminhtml\Dashboard - - - admin/system_config - adminhtml - Magento\Backend\Test\Page\Adminhtml\SystemConfig - - - admin/system_store - adminhtml - Magento\Backend\Test\Page\Adminhtml\StoreIndex - - - admin/system_store/newStore - adminhtml - Magento\Backend\Test\Page\Adminhtml\StoreNew - - - admin/system_store/editStore - adminhtml - Magento\Backend\Test\Page\Adminhtml\EditStore - - - admin/system_store/deleteStore - adminhtml - Magento\Backend\Test\Page\Adminhtml\StoreDelete - - - system_store/newGroup/index - adminhtml - Magento\Backend\Test\Page\Adminhtml\NewGroupIndex - - - system_store/editGroup - adminhtml - Magento\Backend\Test\Page\Adminhtml\EditGroup - - - system_store/deleteGroup - adminhtml - Magento\Backend\Test\Page\Adminhtml\DeleteGroup - - - system_store/newWebsite/index - adminhtml - Magento\Backend\Test\Page\Adminhtml\NewWebsiteIndex - - - system_store/editWebsite - adminhtml - Magento\Backend\Test\Page\Adminhtml\EditWebsite - - - system_store/deleteWebsite - adminhtml - Magento\Backend\Test\Page\Adminhtml\DeleteWebsite - - diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Page/Adminhtml/BackupIndex.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/Page/Adminhtml/BackupIndex.xml index 1e1531233eb7d..23440af8adfc9 100644 --- a/dev/tests/functional/tests/app/Magento/Backup/Test/Page/Adminhtml/BackupIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Page/Adminhtml/BackupIndex.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Backup\Test\Block\Adminhtml\BackupGrid - [data-grid-id="backupsGrid"] - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml index 5657e6c659026..4e2ffe29a7c39 100644 --- a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml @@ -1,12 +1,10 @@ - + - - - low - - + --> + + + diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/etc/page.xml deleted file mode 100644 index 25c44305d504e..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/page.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - backup/index - adminhtml - Magento\Backup\Test\Page\Adminhtml\BackupIndex - - diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/CustomerIndexEdit.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/CustomerIndexEdit.xml index 49cc4e91e674e..99a77d943b16b 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/CustomerIndexEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/CustomerIndexEdit.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\Bundle\Test\Block\Adminhtml\Product\Composite\Configure - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/OrderCreateIndex.xml index 81108cba0c985..a8393980b4586 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\Bundle\Test\Block\Adminhtml\Product\Composite\Configure - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Product/CatalogProductView.xml index 0ed077de7da8c..2fddc12693d45 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Product/CatalogProductView.xml @@ -1,23 +1,15 @@ - + - - - - - - Magento\Bundle\Test\Block\Catalog\Product\View - - - - - Magento\Bundle\Test\Block\Catalog\Product\View - #maincontent - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml index 41197896e30a7..e801b7b4dca13 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml @@ -5,483 +5,534 @@ * See COPYING.txt for license details. */ --> - - - - bundle-product-%isolation% - BundleProduct %isolation% - - - bundle_sku_%isolation% - - - - - - - - - - - - - - - - - - - Bundle Product Dynamic Required - - - - - - - - - - - - - No - No - - - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - default - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage - - - bundle-product-%isolation% - BundleProduct %isolation% - Fixed - bundle_sku_%isolation% - Product offline - Dynamic - - - - - - - Out of Stock - Dynamic - - - category_%isolation% - - - - - - - - - - - - - - - - - - - Separately - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - default - - - - - Catalog, Search - No - Yes - assertProductSaveMessage, assertProductNotSearchableBySku - - - bundle-product-%isolation% - BundleProduct %isolation% - Dynamic - bundle_sku_%isolation% - Product online - Dynamic - - - dynamic-200 - - - In Stock - Dynamic - - - category_%isolation% - Bundle Product Dynamic - - - - - - - - - - - Price Range - - - - - Together - all_types_dynamic - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - all_types_bundle_options - - - - - Catalog, Search - No - Yes - assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType - - - bundle-product-%isolation% - BundleProduct %isolation% - Fixed - bundle_sku_%isolation% - - - Fixed - 10 - fixed-15 - None - - - Fixed - 10 - - - Bundle Product Fixed Required - - - - - - - - - - - - - - - - - - - default_fixed - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - default - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage - - - bundle-product-%isolation% - BundleProduct %isolation% - Fixed - bundle_sku_%isolation% - Product online - Fixed - 100 - fixed-24 - taxable_goods - In Stock - Fixed - 10 - category_%isolation% - Bundle Product Fixed - default - - - - - - - - - As Low as - - - - - Separately - all_types_fixed - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - all_types_bundle_fixed_and_custom_options - all_types - - - Catalog, Search - No - No - assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType - - - bundle-product-%isolation% - BundleProduct %isolation% - Fixed - bundle_sku_%isolation% - Product online - Fixed - 10 - fixed-1 - taxable_goods - Out of Stock - Fixed - 10 - category_%isolation% - - - - - 10 - m/d/Y - m/d/Y +3 days - - - Price Range - No - Yes - Together - with_not_required_options - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - with_not_required_options - - - - - Catalog - No - No - assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView - - - bundle-product-%isolation% - BundleProduct %isolation% - Dynamic - bundle_sku_%isolation% - - - Dynamic - - - dynamic-50 - - - - - Fixed - 10 - - - - - - - - - - - - - default - As Low as - No - No - Together - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar - default - - - - - Search - - - - - assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage - - - bundle-product-%isolation% - Bundle Dynamic %isolation% - Dynamic - sku_bundle_dynamic_%isolation% - - - Dynamic - - - dynamic-8 - - - - - - - - - - - - - - - 20 - - - - - - - - - - - - - - - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - default - - - - - - - - - - - assertProductSaveMessage, assertBundleInCategory - - - bundle-product-%isolation% - Bundle Dynamic %isolation% - Dynamic - sku_bundle_dynamic_%isolation% - - - Dynamic - - - dynamic-32 - - - - - - - - - - - - - MAGETWO-23061 - - - - - - - - - - - - - - - - - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - default - - - - - - - - - - - assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType - - - bundle-product-%isolation% - Bundle Dynamic %isolation% - Dynamic - sku_bundle_dynamic_%isolation% - - - Dynamic - - - dynamic-40 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - default - - - - - - - - - - - assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType - - - bundle-product-%isolation% - Bundle Fixed %isolation% - Fixed - sku_bundle_fixed_%isolation% - - - Fixed - 110 - fixed-115 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - second - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - with_custom_options_1 - drop_down_with_one_option_fixed_price - catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option - - - - - - - assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage - - - bundle-product-%isolation% - Bundle Fixed %isolation% - Fixed - sku_bundle_fixed_%isolation% - - - Fixed - 110 - fixed-159 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - second - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - with_custom_options_2 - drop_down_with_one_option_percent_price - - - - - - - - - assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType - - - bundle-product-%isolation% - Bundle Dynamic %isolation% - Dynamic - sku_bundle_dynamic_%isolation% - - - Dynamic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default_dynamic - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - default - - - - - - - - - - - assertProductSaveMessage - - - bundle-product-%isolation% - Bundle Fixed %isolation% - Fixed - sku_bundle_fixed_%isolation% - - - Fixed - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - second - catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar - default - - - - - - - - - - - assertProductSaveMessage - - + + + + bundle-product-%isolation% + BundleProduct %isolation% + - + bundle_sku_%isolation% + - + - + - + - + - + - + - + - + - + Bundle Product Dynamic Required + - + - + - + - + - + - + No + No + - + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + default + - + - + - + - + - + + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Fixed + bundle_sku_%isolation% + Product offline + Dynamic + - + - + - + Out of Stock + Dynamic + - + category_%isolation% + - + - + - + - + - + - + - + - + - + Separately + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + default + - + - + Catalog, Search + No + Yes + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Dynamic + bundle_sku_%isolation% + Product online + Dynamic + - + dynamic-200 + - + In Stock + Dynamic + - + category_%isolation% + Bundle Product Dynamic + - + - + - + - + - + Price Range + - + - + Together + all_types_dynamic + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + all_types_bundle_options + - + - + Catalog, Search + No + Yes + + + + + + + + + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Fixed + bundle_sku_%isolation% + - + Fixed + 10 + fixed-15 + None + - + Fixed + 10 + - + Bundle Product Fixed Required + - + - + - + - + - + - + - + - + - + default_fixed + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + default + - + - + - + - + - + + + + + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Fixed + bundle_sku_%isolation% + Product online + Fixed + 100 + fixed-24 + taxable_goods + In Stock + Fixed + 10 + category_%isolation% + Bundle Product Fixed + default + - + - + - + - + As Low as + - + - + Separately + all_types_fixed + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + all_types_bundle_fixed_and_custom_options + all_types + - + Catalog, Search + No + No + + + + + + + + + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Fixed + bundle_sku_%isolation% + Product online + Fixed + 10 + fixed-1 + taxable_goods + Out of Stock + Fixed + 10 + category_%isolation% + - + - + 10 + m/d/Y + m/d/Y +3 days + - + Price Range + No + Yes + Together + with_not_required_options + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + with_not_required_options + - + - + Catalog + No + No + + + + + + + + + bundle-product-%isolation% + BundleProduct %isolation% + Dynamic + bundle_sku_%isolation% + - + Dynamic + - + dynamic-50 + - + - + Fixed + 10 + - + - + - + - + - + - + default + As Low as + No + No + Together + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + default + - + - + Search + - + - + + + + + + + + + + bundle-product-%isolation% + Bundle Dynamic %isolation% + Dynamic + sku_bundle_dynamic_%isolation% + - + Dynamic + - + dynamic-8 + - + - + - + - + - + - + - + 20 + - + - + - + - + - + - + - + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + default + - + - + - + - + - + + + + + bundle-product-%isolation% + Bundle Dynamic %isolation% + Dynamic + sku_bundle_dynamic_%isolation% + - + Dynamic + - + dynamic-32 + - + - + - + - + - + - + MAGETWO-23061 + - + - + - + - + - + - + - + - + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + default + - + - + - + - + - + + + + + + + bundle-product-%isolation% + Bundle Dynamic %isolation% + Dynamic + sku_bundle_dynamic_%isolation% + - + Dynamic + - + dynamic-40 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + default + - + - + - + - + - + + + + + + + bundle-product-%isolation% + Bundle Fixed %isolation% + Fixed + sku_bundle_fixed_%isolation% + - + Fixed + 110 + fixed-115 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + second + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + with_custom_options_1 + drop_down_with_one_option_fixed_price + catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option + - + - + - + + + + + + + + bundle-product-%isolation% + Bundle Fixed %isolation% + Fixed + sku_bundle_fixed_%isolation% + - + Fixed + 110 + fixed-159 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + second + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + with_custom_options_2 + drop_down_with_one_option_percent_price + - + - + - + - + + + + + + + bundle-product-%isolation% + Bundle Dynamic %isolation% + Dynamic + sku_bundle_dynamic_%isolation% + - + Dynamic + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + default_dynamic + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + default + - + - + - + - + - + + + + bundle-product-%isolation% + Bundle Fixed %isolation% + Fixed + sku_bundle_fixed_%isolation% + - + Fixed + 10 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + second + catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar + default + - + - + - + - + - + + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv deleted file mode 100644 index 4879de57fde4d..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv +++ /dev/null @@ -1,15 +0,0 @@ -"product/data/url_key";"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/status";"product/data/price_type";"product/data/price/value";"product/data/price/preset";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/is_in_stock";"product/data/weight_type";"product/data/weight";"product/data/category";"product/data/description";"product/data/group_price/preset";"product/data/special_price";"product/data/special_from_date/pattern";"product/data/special_to_date/pattern";"product/data/tier_price/preset";"product/data/price_view";"product/data/stock_data/use_config_manage_stock";"product/data/stock_data/manage_stock";"product/data/shipment_type";"product/data/bundle_selections/preset";"product/data/bundle_selections/products";"product/data/checkout_data/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"product/data/use_config_gift_message_available";"product/data/gift_message_available";"constraint" -"bundle-product-%isolation%";"BundleProduct %isolation%";"-";"bundle_sku_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Bundle Product Dynamic Required";"-";"-";"-";"-";"-";"-";"No";"No";"-";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductNotSearchableBySku" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"taxable_goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"10";"fixed-1";"taxable_goods";"Out of Stock";"Fixed";"10";"category_%isolation%";"-";"-";"10";"m/d/Y";"m/d/Y +3 days";"-";"Price Range";"No";"Yes";"Together";"with_not_required_options";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView" -"bundle-product-%isolation%";"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage" -"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" -"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml index 8c69e0f7b6ae4..2f3f9e8ba68bb 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml @@ -5,41 +5,56 @@ * See COPYING.txt for license details. */ --> - - - - bundle_dynamic_product - bundle_fixed_%isolation% - Fixed - bundle_fixed_%isolation% - dynamic-100 - Fixed - 1 - - - Bundle Product Fixed Required - Together - default_dynamic - default - - - bundle-fixed-url-%isolation% - assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType - - - bundle_fixed_product - bundle_dynamic_%isolation% - Dynamic - bundle_sku_%isolation% - fixed-756 - Dynamic - - - default_subcategory - - - Separately - default_fixed - default - Catalog, Search - bundle-dynamic-url-%isolation% - assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType - - + + + + bundle_dynamic_product + bundle_fixed_%isolation% + Fixed + bundle_fixed_%isolation% + dynamic-100 + Fixed + 1 + - + Bundle Product Fixed Required + Together + default_dynamic + default + - + bundle-fixed-url-%isolation% + + + + + + + + + + + bundle_fixed_product + bundle_dynamic_%isolation% + Dynamic + bundle_sku_%isolation% + fixed-756 + Dynamic + - + default_subcategory + - + Separately + default_fixed + default + Catalog, Search + bundle-dynamic-url-%isolation% + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest/test.csv deleted file mode 100644 index 235936c0f1038..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest/test.csv +++ /dev/null @@ -1,3 +0,0 @@ -"originalProduct/dataSet";"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/price/preset";"product/data/weight_type";"product/data/weight";"product/data/category_ids/presets";"product/data/description";"product/data/bundle_shipment_type";"product/data/bundle_selections/preset";"product/data/checkout_data/preset";"product/data/visibility";"product/data/url_key";"constraint" -"bundle_dynamic_product";"bundle_fixed_%isolation%";"Fixed";"bundle_fixed_%isolation%";"dynamic-100";"Fixed";"1";"-";"Bundle Product Fixed Required";"Together";"default_dynamic";"default";"-";"bundle-fixed-url-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType" -"bundle_fixed_product";"bundle_dynamic_%isolation%";"Dynamic";"bundle_sku_%isolation%";"fixed-756";"Dynamic";"-";"default_subcategory";"-";"Separately";"default_fixed";"default";"Catalog, Search";"bundle-dynamic-url-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType" diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml index 6f9bc7be7884e..80589354d05a5 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml @@ -1,45 +1,24 @@ - + - - - low - - - - - - - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Cms\Test\Page\CmsIndex + Magento\Bundle\Test\Fixture\BundleProduct + Magento\Catalog\Test\Fixture\Category + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml index b973e7deeebe7..3e4cfc3eb007a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Category\Edit\PageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Category\Edit\CategoryForm - #category-edit-container - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryIndex.xml index 169402af52e35..eaa8204b439ab 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryIndex.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Catalog\Test\Block\Adminhtml\Category\Tree - [id="page:left"] - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.xml index 3f7f2f1fe11a9..ba9f0da1ab03d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Grid - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.xml index 2d9cd7d5efc00..24868b2d13923 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductAttributeNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\AttributeForm - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductEdit.xml index c1da01216458f..a2355f9ebabb4 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\FormPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml index 35e9457a1e811..5872271e30c50 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductIndex.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Catalog\Test\Block\Adminhtml\Product\Grid - #productGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\GridPageAction - #add_new_product - css selector - - - Magento\Backend\Test\Block\Denied - [id="page:main-container"] - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductNew.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductNew.xml index 95dda5cf9e7c5..544a42dcf4d81 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductNew.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\FormPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml index 6e0839b001b71..7a8320a396f24 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetAdd.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main\AttributeSetForm - #set_name - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml index 903d82032d518..be45d688fbc5a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\FormPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main - .attribute-set - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main\EditForm - #set_name - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml index 3324acdc9d906..c5403a74e61aa 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductSetIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\GridPageActions - .page-main-actions - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Grid - #setGrid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml index 1198ef1003054..5acf5b0825f02 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml @@ -1,51 +1,19 @@ - + - - - - Magento\Catalog\Test\Block\Product\ListProduct - .products.wrapper.grid - css selector - - - Magento\Catalog\Test\Block\Product\Price - #map-popup-content - css selector - - - Magento\LayeredNavigation\Test\Block\Navigation - .block.filter - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\TopToolbar - .//*[contains(@class,"toolbar-products")][1] - xpath - - - Magento\Catalog\Test\Block\Product\ProductList\BottomToolbar - .//*[contains(@class,"toolbar-products")][2] - xpath - - - Magento\Theme\Test\Block\Html\Title - .page-title h1.title .base - css selector - - - Magento\Catalog\Test\Block\Category\View - #maincontent - css selector - - - Magento\Widget\Test\Block\WidgetView - .widget - css selector - - - + --> + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductCompare.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductCompare.xml index bccd835645386..bae2bffa5f38b 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductCompare.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductCompare.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Catalog\Test\Block\Product\Compare\ListCompare - .column.main - css selector - - - Magento\Core\Test\Block\Messages - .page.messages .messages - css selector - - - Magento\Widget\Test\Block\WidgetView - .column.main .widget - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml index 88f40a29e9add..e0db400ce3ac9 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml @@ -1,81 +1,25 @@ - + - - - - Magento\Catalog\Test\Block\Product\View - #maincontent - css selector - - - Magento\Catalog\Test\Block\Product\Additional - #additional - css selector - - - Magento\Catalog\Test\Block\Product\View\CustomOptions - #product-options-wrapper - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\Related - .block.related - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\Upsell - .block.upsell - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\Crosssell - .block.crosssell - css selector - - - Magento\Downloadable\Test\Block\Catalog\Product\View\Links - [data-container-for=downloadable-links] - css selector - - - Magento\Catalog\Test\Block\Product\Price - #map-popup-click-for-price - css selector - - - Magento\Core\Test\Block\Messages - .page.messages .messages - css selector - - - Magento\Review\Test\Block\Product\View\Summary - .product-reviews-summary - css selector - - - Magento\Review\Test\Block\Product\View - #customer-reviews - css selector - - - Magento\Review\Test\Block\Form - #review-form - css selector - - - Magento\Theme\Test\Block\Html\Title - .page-title h1.title .base - css selector - - - Magento\Widget\Test\Block\WidgetView - .column.main .widget - css selector - - - + --> + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml index b6383b99b21f6..3eef74e8326cb 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml @@ -5,234 +5,249 @@ * See COPYING.txt for license details. */ --> - - - - Create root category with required fields - addRootCategory - - - RootCategory%isolation% - RootCategory%isolation% - Yes - RootCategory Required - - - - - - - - - - - No - Position - Name - Price - - - - - - - - - - - - - assertCategorySaveMessage, assertCategoryForm - - - Create root category with all fields - addRootCategory - - - RootCategory%isolation% - RootCategory%isolation% - Yes - RootCategory All Fields - RootCategory Page Title - Yes - Static block and products - - - Yes - No - Position - Name - Price - No - Name - No - 50 - - - - - assertCategorySaveMessage, assertCategoryForm - - - Create subcategory with required fields - addSubcategory - default_category - Subcategory%isolation% - Subcategory%isolation% - Yes - Subcategory Required - - - - - - - - - - - Yes - - - - - - - - - - - - - - - - - - - assertCategorySaveMessage, assertCategoryForm, assertCategoryPage - - - Create not anchor subcategory with required fields - addSubcategory - default_category - Subcategory%isolation% - Subcategory%isolation% - Yes - Subcategory For Anchor Subcategory - - - Yes - - - - - No - Yes - - - - - - - Yes - - - Yes - - - default - catalogProductSimple::default,catalogProductSimple::default - assertCategorySaveMessage, assertCategoryForm, assertCategoryPage, assertCategoryForAssignedProducts - - - Create anchor subcategory with all fields - addSubcategory - default_category - Subcategory%isolation% - Subcategory%isolation% - Yes - Anchor Subcategory All Fields - Subcategory Page Title - Yes - Static block and products - default - Yes - No - Position - Name - Price - No - Price - No - 50 - default - catalogProductSimple::default,catalogProductSimple::default - assertCategorySaveMessage, assertCategoryForm, assertCategoryPage, assertCategoryForAssignedProducts - - - Create not active subcategory - addSubcategory - default_category - Subcategory%isolation% - Subcategory%isolation% - Yes - Not active category - - - Yes - - - - - - - Yes - - - - - - - Yes - - - Yes - - - - - - - assertCategorySaveMessage, assertCategoryForm - - - Create not included in menu subcategory - addSubcategory - default_category - Subcategory%isolation% - Subcategory%isolation% - Yes - Not included in menu - - - No - - - - - - - - - - - - - - - - - - - - - - - - - - - assertCategorySaveMessage, assertCategoryForm - - - MAGETWO-12513: Create Category from Category page with Required Fields Only - addSubcategory - default_category - Subcategory%isolation% - - - Yes - - - - - Yes - - - - - - - - - - - - - - - - - - - - - - - - - - - assertCategorySaveMessage, assertCategoryForm, assertCategoryPage - bamboo_plan:BAT,test_type:acceptance_test - - - MAGETWO-16351: Assign Products at the Category Level - addSubcategory - default_category - Subcategory%isolation% - - - Yes - - - - - Yes - - - - - - - - - - - - - - - - - - - - - - - - - catalogProductSimple::default, configurableProductInjectable::default, bundleProduct::bundle_fixed_product - assertCategorySaveMessage, assertCategoryForAssignedProducts - bamboo_plan:end_to_end,test_type:acceptance_test - - + + + + Create root category with required fields + addRootCategory + - + RootCategory%isolation% + RootCategory%isolation% + Yes + RootCategory Required + - + - + - + - + - + No + Position + Name + Price + - + - + - + - + - + - + + + + + Create root category with all fields + addRootCategory + - + RootCategory%isolation% + RootCategory%isolation% + Yes + RootCategory All Fields + RootCategory Page Title + Yes + Static block and products + - + Yes + No + Position + Name + Price + No + Name + No + 50 + - + - + + + + + Create subcategory with required fields + addSubcategory + default_category + Subcategory%isolation% + Subcategory%isolation% + Yes + Subcategory Required + - + - + - + - + - + Yes + - + - + - + - + - + - + - + - + - + + + + + + Create not anchor subcategory with required fields + addSubcategory + default_category + Subcategory%isolation% + Subcategory%isolation% + Yes + Subcategory For Anchor Subcategory + - + Yes + - + - + No + Yes + - + - + - + Yes + - + Yes + - + default + catalogProductSimple::default,catalogProductSimple::default + + + + + + + Create anchor subcategory with all fields + addSubcategory + default_category + Subcategory%isolation% + Subcategory%isolation% + Yes + Anchor Subcategory All Fields + Subcategory Page Title + Yes + Static block and products + default + Yes + No + Position + Name + Price + No + Price + No + 50 + default + catalogProductSimple::default,catalogProductSimple::default + + + + + + + Create not active subcategory + addSubcategory + default_category + Subcategory%isolation% + Subcategory%isolation% + Yes + Not active category + - + Yes + - + - + - + Yes + - + - + - + Yes + - + Yes + - + - + - + + + + + Create not included in menu subcategory + addSubcategory + default_category + Subcategory%isolation% + Subcategory%isolation% + Yes + Not included in menu + - + No + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + MAGETWO-12513: Create Category from Category page with Required Fields Only + addSubcategory + default_category + Subcategory%isolation% + - + Yes + - + - + Yes + - + - + - + - + - + - + - + - + - + - + - + - + - + bamboo_plan:BAT,test_type:acceptance_test + + + + + + MAGETWO-16351: Assign Products at the Category Level + addSubcategory + default_category + Subcategory%isolation% + - + Yes + - + - + Yes + - + - + - + - + - + - + - + - + - + - + - + - + catalogProductSimple::default, configurableProductInjectable::default, bundleProduct::bundle_fixed_product + bamboo_plan:end_to_end,test_type:acceptance_test + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml index 1107b38d23403..6ff90367f9747 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml @@ -5,15 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - root_category - assertCategorySuccessDeleteMessage, assertCategoryAbsenceOnBackend - - - root_subcategory - assertCategorySuccessDeleteMessage, assertUrlRewriteCategoryNotInGrid, assertCategoryAbsenceOnBackend, assertCategoryAbsenceOnFrontend - - + + + + root_category + + + + + root_subcategory + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml index 3b68d6a85f4f6..aab5a9b7de348 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml @@ -5,52 +5,60 @@ * See COPYING.txt for license details. */ --> - - - - default_category - Name%isolation% - Yes - UrlKey%isolation% - - - - - Yes - Yes - - - - - No - Name - assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage - - - default_category - Name%isolation% - Yes - UrlKey%isolation% - Category Description - Category Title - Yes - No - Position - Price - Yes - - - assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryPage - - - default_category - Name%isolation% - No - - - - - - - - - - - - - - - - - - - assertCategorySaveMessage, assertCategoryForm - - + + + + default_category + Name%isolation% + Yes + UrlKey%isolation% + - + - + Yes + Yes + - + - + No + Name + + + + + + + + default_category + Name%isolation% + Yes + UrlKey%isolation% + Category Description + Category Title + Yes + No + Position + Price + Yes + - + + + + + + + default_category + Name%isolation% + No + - + - + - + - + - + - + - + - + - + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv deleted file mode 100644 index a1c50cd3e8f42..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -"category/data/parent_id/dataSet";"category/data/name";"category/data/is_active";"category/data/url_key";"category/data/description";"category/data/meta_title";"category/data/include_in_menu";"category/data/available_product_listing_config";"category/data/available_sort_by/sort_2";"category/data/available_sort_by/sort_1";"category/data/default_product_listing_config";"category/data/default_sort_by";"constraint" -"default_category";"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage" -"default_category";"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryPage" -"default_category";"Name%isolation%";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.xml index d07c2d3cf7c96..827d2c90ad551 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.xml @@ -5,12 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::default - catalogProductSimple::default, configurableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertCrossSellsProductsSection - - + + + + catalogProductSimple::default + catalogProductSimple::default, configurableProductInjectable::default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.xml index c0834edbe21b6..f6e112dbd9255 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.xml @@ -5,12 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::default - catalogProductSimple::default, configurableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertRelatedProductsSection - - + + + + catalogProductSimple::default + catalogProductSimple::default, configurableProductInjectable::default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.xml index 128666b8d72d1..9f4c1859a6b22 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.xml @@ -5,17 +5,23 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::default - catalogProductSimple::default, configurableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertUpSellsProductsSection - - - configurableProductInjectable::default - catalogProductSimple::default, configurableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertUpSellsProductsSection - - + + + + catalogProductSimple::default + catalogProductSimple::default, configurableProductInjectable::default + + + + + + + configurableProductInjectable::default + catalogProductSimple::default, configurableProductInjectable::default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml index afa5be71b8ba7..b4df430d48c85 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml @@ -5,385 +5,457 @@ * See COPYING.txt for license details. */ --> - - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10000 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 50 - 657 - - - - - drop_down_with_one_option_fixed_price - drop_down_with_one_option_fixed_price - - - drop_down_with_one_option_fixed_price - - - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10001 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 51 - 658 - - - - - drop_down_with_one_option_percent_price - drop_down_with_one_option_percent_price - - - drop_down_with_one_option_percent_price - - - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10002 - 90 - Simple Product short_description %isolation% - Simple Product description %isolation% - 52 - 659 - - - - - drop_down_with_one_option_fixed_price - drop_down_with_one_option_fixed_price - - - MAGETWO-23029 - - - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10003 - 90 - Simple Product short_description %isolation% - Simple Product description %isolation% - 53 - 660 - - - - - drop_down_with_one_option_percent_price - drop_down_with_one_option_percent_price - - - MAGETWO-23030 - - - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10004 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 54 - 661 - - - - - drop_down_with_one_option_percent_price - drop_down_with_one_option_percent_price - - - MAGETWO-23030 - MAGETWO-23055 - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10005 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 55 - 662 - - - - - drop_down_with_one_option_fixed_price - drop_down_with_one_option_fixed_price - - - MAGETWO-23029 - MAGETWO-23055 - - - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10006 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 56 - 663 - - - - - drop_down_with_one_option_percent_price - drop_down_with_one_option_percent_price - - - MAGETWO-23030 - - - MAGETWO-23002 - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10007 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 57 - 664 - - - - - drop_down_with_one_option_fixed_price - drop_down_with_one_option_fixed_price - - - MAGETWO-23029 - - - MAGETWO-23002 - assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10008 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 58 - 665 - - - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10009 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 59 - 75 - In Stock - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInStock - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10010 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 60 - 0 - Out of Stock - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductOutOfStock - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10011 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 61 - 138 - - - Search - - - - - - - - - - - - - assertProductSaveMessage, assertProductSearchableBySku - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10012 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 62 - 139 - - - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10013 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 63 - 140 - - - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - taxable_goods - 10014 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 64 - 141 - - - - - - - - - - - - - default - - - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - taxable_goods - 10015 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 65 - 142 - - - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - None - 10016 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 66 - 143 - - - - - - - - - - - - - - - default - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage - - - simple-product-%isolation% - Simple Product %isolation% - simple_sku_%isolation% - - - 10017 - - - Simple Product short_description %isolation% - Simple Product description %isolation% - 67 - 144 - - - - - options-suite - options-suite - catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option - - - - - - - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage - - + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10000 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 50 + 657 + - + - + drop_down_with_one_option_fixed_price + drop_down_with_one_option_fixed_price + - + drop_down_with_one_option_fixed_price + - + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10001 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 51 + 658 + - + - + drop_down_with_one_option_percent_price + drop_down_with_one_option_percent_price + - + drop_down_with_one_option_percent_price + - + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10002 + 90 + Simple Product short_description %isolation% + Simple Product description %isolation% + 52 + 659 + - + - + drop_down_with_one_option_fixed_price + drop_down_with_one_option_fixed_price + - + MAGETWO-23029 + - + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10003 + 90 + Simple Product short_description %isolation% + Simple Product description %isolation% + 53 + 660 + - + - + drop_down_with_one_option_percent_price + drop_down_with_one_option_percent_price + - + MAGETWO-23030 + - + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10004 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 54 + 661 + - + - + drop_down_with_one_option_percent_price + drop_down_with_one_option_percent_price + - + MAGETWO-23030 + MAGETWO-23055 + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10005 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 55 + 662 + - + - + drop_down_with_one_option_fixed_price + drop_down_with_one_option_fixed_price + - + MAGETWO-23029 + MAGETWO-23055 + - + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10006 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 56 + 663 + - + - + drop_down_with_one_option_percent_price + drop_down_with_one_option_percent_price + - + MAGETWO-23030 + - + MAGETWO-23002 + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10007 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 57 + 664 + - + - + drop_down_with_one_option_fixed_price + drop_down_with_one_option_fixed_price + - + MAGETWO-23029 + - + MAGETWO-23002 + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10008 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 58 + 665 + - + - + - + - + - + - + - + - + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10009 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 59 + 75 + In Stock + - + - + - + - + - + - + - + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10010 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 60 + 0 + Out of Stock + - + - + - + - + - + - + - + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10011 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 61 + 138 + - + Search + - + - + - + - + - + - + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10012 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 62 + 139 + - + - + - + - + - + - + - + - + + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10013 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 63 + 140 + - + - + - + - + - + - + - + - + + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + taxable_goods + 10014 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 64 + 141 + - + - + - + - + - + - + default + - + + + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + taxable_goods + 10015 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 65 + 142 + - + - + - + - + - + - + - + - + + + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + None + 10016 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 66 + 143 + - + - + - + - + - + - + - + default + + + + + + + + + + simple-product-%isolation% + Simple Product %isolation% + simple_sku_%isolation% + - + 10017 + - + Simple Product short_description %isolation% + Simple Product description %isolation% + 67 + 144 + - + - + options-suite + options-suite + catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option + - + - + - + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv deleted file mode 100644 index 9ddc8f5a79c00..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv +++ /dev/null @@ -1,19 +0,0 @@ -"product/data/url_key";"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"taxable_goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"taxable_goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage" -"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml index 94d7e154b94a9..9e1f93447814b 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml @@ -5,140 +5,159 @@ * See COPYING.txt for license details. */ --> - - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 10 - - - - - Yes - - - - - - - - - - - - - - - - - - - assertProductSaveMessage, assertProductInGrid - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 10 - None - 999 - Yes - category_%isolation% - - - - - MAGETWO-23002 - Yes - In Stock - - - - - Catalog, Search - assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku - - - virtual-product-%isolation% - VirtualProduct %isolation% - - - 10 - taxable_goods - 999 - Yes - - - - - MAGETWO-23030 - - - - - Out of Stock - - - - - Search - assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 10 - - - - - Yes - category_%isolation% - MAGETWO-23055 - - - - - - - - - - - - - Catalog - assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 9000 - - - - - Yes - - - MAGETWO-23055 - - - - - - - - - options-suite - catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option - - - assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 10 - - - 999 - Yes - - - - - MAGETWO-23030 - - - No - In Stock - - - - - - - assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock - - - virtual-product-%isolation% - VirtualProduct %isolation% - virtual_sku_%isolation% - 9000 - - - 999 - Yes - - - - - - - default - - - Out of Stock - - - - - - - assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock - - + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 10 + - + - + Yes + - + - + - + - + - + - + - + - + - + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 10 + None + 999 + Yes + category_%isolation% + - + - + MAGETWO-23002 + Yes + In Stock + - + - + Catalog, Search + + + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + - + 10 + taxable_goods + 999 + Yes + - + - + MAGETWO-23030 + - + - + Out of Stock + - + - + Search + + + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 10 + - + - + Yes + category_%isolation% + MAGETWO-23055 + - + - + - + - + - + - + Catalog + + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 9000 + - + - + Yes + - + MAGETWO-23055 + - + - + - + - + options-suite + catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option + - + + + + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 10 + - + 999 + Yes + - + - + MAGETWO-23030 + - + No + In Stock + - + - + - + + + + + + + virtual-product-%isolation% + VirtualProduct %isolation% + virtual_sku_%isolation% + 9000 + - + 999 + Yes + - + - + - + default + - + Out of Stock + - + - + - + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv deleted file mode 100644 index 721e089ac971b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv +++ /dev/null @@ -1,8 +0,0 @@ -"product/data/url_key";"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"-";"10";"taxable_goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock" -"virtual-product-%isolation%";"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml index 358f86b482167..8d8d335f15459 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml @@ -5,52 +5,82 @@ * See COPYING.txt for license details. */ --> - - - - simple - configurableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately - - - simple - catalogProductVirtual::default - assertProductSaveMessage, assertProductInGrid - - - configurable - catalogProductSimple::default - assertProductSaveMessage, assertProductInGrid - - - configurable - catalogProductVirtual::default - assertProductSaveMessage, assertProductInGrid - - - virtual - catalogProductSimple::default - assertProductSaveMessage, assertProductInGrid - - - virtual - configurableProductInjectable::not_virtual_for_type_switching - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately - - - virtual - downloadableProductInjectable::default - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock - - - downloadable - catalogProductSimple::default - assertProductSaveMessage, assertProductInGrid - - - downloadable - configurableProductInjectable::not_virtual_for_type_switching - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately - - + + + + simple + configurableProductInjectable::default + + + + + + + + + + + simple + catalogProductVirtual::default + + + + + configurable + catalogProductSimple::default + + + + + configurable + catalogProductVirtual::default + + + + + virtual + catalogProductSimple::default + + + + + virtual + configurableProductInjectable::not_virtual_for_type_switching + + + + + + + + + + + virtual + downloadableProductInjectable::default + + + + + + + + downloadable + catalogProductSimple::default + + + + + downloadable + configurableProductInjectable::not_virtual_for_type_switching + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml index 59789aef03b13..2791699607867 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml @@ -5,73 +5,107 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::default - configurableProductInjectable::default - - - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately - - - catalogProductSimple::default - catalogProductVirtual::default - - - assertProductSaveMessage, assertProductInGrid - - - configurableProductInjectable::default - catalogProductSimple::default - deleteAttributes - assertProductSaveMessage, assertProductInGrid - - - configurableProductInjectable::default - catalogProductVirtual::default - deleteAttributes - assertProductSaveMessage, assertProductInGrid - - - catalogProductVirtual::default - catalogProductSimple::default - - - assertProductSaveMessage, assertProductInGrid - - - catalogProductVirtual::default - configurableProductInjectable::not_virtual_for_type_switching - - - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately - - - catalogProductVirtual::default - downloadableProductInjectable::default - - - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData - - - downloadableProductInjectable::default - catalogProductSimple::default - - - assertProductSaveMessage, assertProductInGrid - - - downloadableProductInjectable::default - configurableProductInjectable::not_virtual_for_type_switching - - - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately - - - downloadableProductInjectable::default - catalogProductVirtual::default - clearDownloadableData - assertProductSaveMessage, assertProductInGrid - - - catalogProductSimple::default - downloadableProductInjectable::default - - - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData - - + + + + catalogProductSimple::default + configurableProductInjectable::default + - + + + + + + + + + + catalogProductSimple::default + catalogProductVirtual::default + - + + + + + configurableProductInjectable::default + catalogProductSimple::default + deleteAttributes + + + + + configurableProductInjectable::default + catalogProductVirtual::default + deleteAttributes + + + + + catalogProductVirtual::default + catalogProductSimple::default + - + + + + + catalogProductVirtual::default + configurableProductInjectable::not_virtual_for_type_switching + - + + + + + + + + + + catalogProductVirtual::default + downloadableProductInjectable::default + - + + + + + + + + + downloadableProductInjectable::default + catalogProductSimple::default + - + + + + + downloadableProductInjectable::default + configurableProductInjectable::not_virtual_for_type_switching + - + + + + + + + + + + downloadableProductInjectable::default + catalogProductVirtual::default + clearDownloadableData + + + + + catalogProductSimple::default + downloadableProductInjectable::default + - + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml index c27dc60e2a6c5..cd99b61923780 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml @@ -5,105 +5,132 @@ * See COPYING.txt for license details. */ --> - - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 245.00 - 200.0000 - - - test-simple-product-%isolation% - 120.0000 - Catalog, Search - - - simple-product-%isolation% - assertProductSaveMessage, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 325.00 - 123.0000 - - - test-simple-product-%isolation% - 129.0000 - Not Visible Individually - - - simple-product-%isolation% - assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 325.01 - 125.0000 - - - test-simple-product-%isolation% - 25.0000 - Catalog - - - simple-product-%isolation% - assertProductSaveMessage, assertProductInStock, assertProductForm, assertProductSearchableBySku, assertProductVisibleInCategory, assertProductPage - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 325.02 - 89.0000 - - - test-simple-product-%isolation% - 89.0000 - Search - - - simple-product-%isolation% - assertProductSaveMessage, assertProductInStock, assertProductForm, assertProductVisibleInCategory, assertProductPage, assertProductSearchableBySku, assertProductPage - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 325.03 - 25.0000 - Out of Stock - test-simple-product-%isolation% - 125.0000 - - - - - simple-product-%isolation% - assertProductSaveMessage, assertProductForm, assertProductOutOfStock, assertProductPage, assertProductVisibleInCategory, assertProductSearchableBySku - - - - - Test simple product %isolation% - test_simple_product_%isolation% - 74.00 - 87.0000 - - - test-simple-product-%isolation% - 333.0000 - - - Product offline - simple-product-%isolation% - assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend - - - default - Test simple product %isolation% - test_simple_product_%isolation% - 74.00 - 87.0000 - - - test-simple-product-%isolation% - 333.0000 - - - - - simple-product-%isolation% - assertProductSaveMessage, assertProductForm, assertUrlRewriteUpdatedProductInGrid, assertProductVisibleInCategory - - + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 245.00 + 200.0000 + - + test-simple-product-%isolation% + 120.0000 + Catalog, Search + - + simple-product-%isolation% + + + + + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 325.00 + 123.0000 + - + test-simple-product-%isolation% + 129.0000 + Not Visible Individually + - + simple-product-%isolation% + + + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 325.01 + 125.0000 + - + test-simple-product-%isolation% + 25.0000 + Catalog + - + simple-product-%isolation% + + + + + + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 325.02 + 89.0000 + - + test-simple-product-%isolation% + 89.0000 + Search + - + simple-product-%isolation% + + + + + + + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 325.03 + 25.0000 + Out of Stock + test-simple-product-%isolation% + 125.0000 + - + - + simple-product-%isolation% + + + + + + + + + - + Test simple product %isolation% + test_simple_product_%isolation% + 74.00 + 87.0000 + - + test-simple-product-%isolation% + 333.0000 + - + Product offline + simple-product-%isolation% + + + + + + default + Test simple product %isolation% + test_simple_product_%isolation% + 74.00 + 87.0000 + - + test-simple-product-%isolation% + 333.0000 + - + - + simple-product-%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest/test.csv deleted file mode 100644 index 78e544b303da2..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest/test.csv +++ /dev/null @@ -1,8 +0,0 @@ -"product/data/category_ids/presets";"product/data/name";"product/data/sku";"product/data/price/value";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/url_key";"product/data/weight";"product/data/visibility";"product/data/status";"product/data/url_key";"constraint" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"245.00";"200.0000";"-";"test-simple-product-%isolation%";"120.0000";"Catalog, Search";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"325.00";"123.0000";"-";"test-simple-product-%isolation%";"129.0000";"Not Visible Individually";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"325.01";"125.0000";"-";"test-simple-product-%isolation%";"25.0000";"Catalog";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductInStock, assertProductForm, assertProductSearchableBySku, assertProductVisibleInCategory, assertProductPage" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"325.02";"89.0000";"-";"test-simple-product-%isolation%";"89.0000";"Search";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductInStock, assertProductForm, assertProductVisibleInCategory, assertProductPage, assertProductSearchableBySku, assertProductPage" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"325.03";"25.0000";"Out of Stock";"test-simple-product-%isolation%";"125.0000";"-";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductForm, assertProductOutOfStock, assertProductPage, assertProductVisibleInCategory, assertProductSearchableBySku" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"74.00";"87.0000";"-";"test-simple-product-%isolation%";"333.0000";"-";"Product offline";"simple-product-%isolation%";"assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend" -"default";"Test simple product %isolation%";"test_simple_product_%isolation%";"74.00";"87.0000";"-";"test-simple-product-%isolation%";"333.0000";"-";"-";"simple-product-%isolation%";"assertProductSaveMessage, assertProductForm, assertUrlRewriteUpdatedProductInGrid, assertProductVisibleInCategory" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml index cd242494467d2..ef634f79f6b87 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml @@ -5,194 +5,265 @@ * See COPYING.txt for license details. */ --> - - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 99.99 - None - 999 - Yes - default_subcategory - - - - - MAGETWO-23002 - In Stock - - - Catalog - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku - - - virtual_product_%isolation% - virtual_sku_%isolation% - 120.00 - taxable_goods - 999 - Yes - - - - - 45 - - - In Stock - - - Catalog, Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 185.00 - None - 999 - Yes - default_subcategory - - - - - MAGETWO-23002 - Out of Stock - - - Catalog, Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku - - - virtual_product_%isolation% - virtual_sku_%isolation% - 99.99 - taxable_goods - - - Yes - - - - - - - - - Out of Stock - - - Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 5.00 - None - - - Yes - - - - - - - - - Out of Stock - - - Catalog - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku - - - virtual_product_%isolation% - virtual_sku_%isolation% - 145.00 - taxable_goods - 999 - Yes - default_subcategory - MAGETWO-23055 - - - MAGETWO-23002 - In Stock - - - Catalog, Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 99.99 - None - - - Yes - default_subcategory - - - 45 - - - Out of Stock - - - Catalog, Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku - - - virtual_product_%isolation% - virtual_sku_%isolation% - 5.00 - taxable_goods - - - Yes - - - MAGETWO-23055 - - - - - Out of Stock - - - Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 120.00 - None - 999 - Yes - default_subcategory - - - - - - - In Stock - options-suite - Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 99.99 - taxable_goods - - - Yes - - - MAGETWO-23055 - - - - - Out of Stock - - - Catalog, Search - virtual-product-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku - - - VirtualProduct %isolation% - virtual_sku_%isolation% - 99.99 - None - 999 - Yes - default_subcategory - MAGETWO-23055 - - - MAGETWO-23002 - In Stock - - - virtual-product-%isolation% - Catalog - assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku - - + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 99.99 + None + 999 + Yes + default_subcategory + - + - + MAGETWO-23002 + In Stock + - + Catalog + virtual-product-%isolation% + + + + + + + + + + + virtual_product_%isolation% + virtual_sku_%isolation% + 120.00 + taxable_goods + 999 + Yes + - + - + 45 + - + In Stock + - + Catalog, Search + virtual-product-%isolation% + + + + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 185.00 + None + 999 + Yes + default_subcategory + - + - + MAGETWO-23002 + Out of Stock + - + Catalog, Search + virtual-product-%isolation% + + + + + + + + + + + + virtual_product_%isolation% + virtual_sku_%isolation% + 99.99 + taxable_goods + - + Yes + - + - + - + - + Out of Stock + - + Search + virtual-product-%isolation% + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 5.00 + None + - + Yes + - + - + - + - + Out of Stock + - + Catalog + virtual-product-%isolation% + + + + + + + + + virtual_product_%isolation% + virtual_sku_%isolation% + 145.00 + taxable_goods + 999 + Yes + default_subcategory + MAGETWO-23055 + - + MAGETWO-23002 + In Stock + - + Catalog, Search + virtual-product-%isolation% + + + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 99.99 + None + - + Yes + default_subcategory + - + 45 + - + Out of Stock + - + Catalog, Search + virtual-product-%isolation% + + + + + + + + + virtual_product_%isolation% + virtual_sku_%isolation% + 5.00 + taxable_goods + - + Yes + - + MAGETWO-23055 + - + - + Out of Stock + - + Search + virtual-product-%isolation% + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 120.00 + None + 999 + Yes + default_subcategory + - + - + - + In Stock + options-suite + Search + virtual-product-%isolation% + + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 99.99 + taxable_goods + - + Yes + - + MAGETWO-23055 + - + - + Out of Stock + - + Catalog, Search + virtual-product-%isolation% + + + + + + + + + VirtualProduct %isolation% + virtual_sku_%isolation% + 99.99 + None + 999 + Yes + default_subcategory + MAGETWO-23055 + - + MAGETWO-23002 + In Stock + - + virtual-product-%isolation% + Catalog + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv deleted file mode 100644 index 03f0ac9470b05..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv +++ /dev/null @@ -1,12 +0,0 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category_ids/presets";"product/data/group_price/preset";"product/data/special_price";"product/data/tier_price/preset";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/visibility";"product/data/url_key";"constraint" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"taxable_goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"185.00";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"Out of Stock";"-";"Catalog, Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"taxable_goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"-";"Yes";"default_subcategory";"-";"45";"-";"Out of Stock";"-";"Catalog, Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"virtual-product-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"virtual-product-%isolation%";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml index dfcec23dda367..6bd3a8e3737be 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml @@ -5,12 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - ProductTemplate%isolation% - default - assertProductTemplateSuccessSaveMessage, assertProductTemplateForm, assertProductTemplateInGrid, assertProductTemplateOnProductForm - - + + + + ProductTemplate%isolation% + default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml index 869189f6317e5..6b1ae228fe19e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml @@ -5,99 +5,110 @@ * See COPYING.txt for license details. */ --> - - - - Text_Field_Admin_%isolation% - Text Field - - - No - attr_text_%isolation% - Global - <b><i>default_value_text%isolation%</i></b> - - - Yes - - - Yes - Yes - Yes - - - - - - - Yes - Yes - - - Yes - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsUsedInSortOnFrontend - - - Dropdown_Admin_%isolation% - Dropdown - default - No - attr_dropdown_%isolation% - Global - - - - - - - - - - - - - - - Filterable (with results) - Yes - - - - - - - - - - - assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertProductAttributeIsConfigurable - - - Text_Field_Admin_%isolation% - Text Field - - - Yes - attr_text_%isolation% - - - default_value_text%isolation% - - - - - - - - - - - - - - - - - - - - - - - - - - - assertProductAttributeIsRequired - - - Text_Field_Admin_%isolation% - Text Field - - - No - attr_text_%isolation% - - - default_value_text%isolation% - - - Yes - - - - - - - - - - - - - - - - - - - - - - - assertProductAttributeIsUnique - - + + + + Text_Field_Admin_%isolation% + Text Field + - + No + attr_text_%isolation% + Global + <b><i>default_value_text%isolation%</i></b> + - + Yes + - + Yes + Yes + Yes + - + - + - + Yes + Yes + - + Yes + + + + + + + + + + + + + Dropdown_Admin_%isolation% + Dropdown + default + No + attr_dropdown_%isolation% + Global + - + - + - + - + - + - + - + Filterable (with results) + Yes + - + - + - + - + - + + + + + + Text_Field_Admin_%isolation% + Text Field + - + Yes + attr_text_%isolation% + - + default_value_text%isolation% + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + Text_Field_Admin_%isolation% + Text Field + - + No + attr_text_%isolation% + - + default_value_text%isolation% + - + Yes + - + - + - + - + - + - + - + - + - + - + - + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv deleted file mode 100644 index 4726bd31c8c9f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv +++ /dev/null @@ -1,5 +0,0 @@ -attribute/data/frontend_label;attribute/data/frontend_input;attribute/data/options/preset;attribute/data/is_required;attribute/data/attribute_code;attribute/data/is_global;attribute/data/default_value_text;attribute/data/default_value_textarea;attribute/data/is_unique;attribute/data/manage_frontend_label;attribute/data/is_searchable;attribute/data/is_visible_in_advanced_search;attribute/data/is_comparable;attribute/data/is_filterable;attribute/data/is_filterable_in_search;attribute/data/is_used_for_promo_rules;attribute/data/is_html_allowed_on_front;attribute/data/is_visible_on_front;attribute/data/used_in_product_listing;attribute/data/used_for_sort_by;constraint -Text_Field_Admin_%isolation%;Text Field;-;No;attr_text_%isolation%;Global;default_value_text%isolation%;-;Yes;-;Yes;Yes;Yes;-;-;-;Yes;Yes;-;Yes;assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsUsedInSortOnFrontend -Dropdown_Admin_%isolation%;Dropdown;default;No;attr_dropdown_%isolation%;Global;-;-;-;-;-;-;-;Filterable (with results);Yes;-;-;-;-;-;assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertProductAttributeIsConfigurable -Text_Field_Admin_%isolation%;Text Field;-;Yes;attr_text_%isolation%;-;default_value_text%isolation%;-;-;-;-;-;-;-;-;-;-;-;-;-;assertProductAttributeIsRequired -Text_Field_Admin_%isolation%;Text Field;-;No;attr_text_%isolation%;-;default_value_text%isolation%;-;Yes;-;-;-;-;-;-;-;-;-;-;-;assertProductAttributeIsUnique diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml index 8045fac211d21..77668683c1ffd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml @@ -5,251 +5,285 @@ * See COPYING.txt for license details. */ --> - - - - custom_attribute_set - Text_Field_Admin_%isolation% - Text Field - - - No - attr_textfield_%isolation% - - - default_value_text%isolation% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm - - - custom_attribute_set - Text_Field_Admin_%isolation% - Text Area - - - Yes - attr_textarea_%isolation% - Store View - - - default_value_textarea%isolation% - - - - - No - - - Area_Field%isolation% - Yes - Yes - Yes - - - - - - - - - - - - - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable - - - custom_attribute_set - Date_Admin_%isolation% - Date - - - No - attr_date_%isolation% - - - - - - - n/j/y - - - No - - - Date_Store_View - Yes - Yes - No - - - - - - - - - Yes - Yes - Yes - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsUsedPromoRules - - - custom_attribute_set - Yes/No_Admin_%isolation% - Yes/No - - - Yes - attr_yesno_%isolation% - Global - - - - - - - No - - - - - Yes/No_Global - - - - - - - - - - - - - - - - - - - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm - - - custom_attribute_set - Multiple_Select_Admin_%isolation% - Multiple Select - default - No - attr_multiselect_%isolation% - Website - - - - - - - - - Yes - - - - - Yes - Yes - Yes - Filterable (with results) - Yes - - - Yes - Yes - Yes - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm - - - custom_attribute_set - Dropdown_Admin_%isolation% - Dropdown - default - Yes - attr_dropdown_%isolation% - Global - - - - - - - - - No - Yes - - - Yes - Yes - Yes - Filterable (with results) - Yes - - - Yes - Yes - Yes - Yes - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm - - - custom_attribute_set - Price_Admin_%isolation% - Price - - - No - attr_price_%isolation% - - - 1000 - - - - - - - No - - - Price_StoreView - Yes - Yes - No - Filterable (with results) - Yes - - - - - - - - - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch - Bug:MAGETWO-31560 - - - custom_attribute_set - Fixed_Product_Tax_Admin_%isolation% - Fixed Product Tax - - - - - attr_fpt_code_%isolation% - - - - - - - - - - - - - - - Fixed_Product_Tax_Storeview - - - - - - - - - - - - - - - - - - - - - assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm - - - custom_attribute_set - Text_Field_Admin_%isolation% - Text Field - - - Yes - attr_textfield_%isolation% - Store View - default_value_text%isolation% - - - - - - - Yes - - - Area_Field%isolation% - Yes - Yes - Yes - - - - - - - - - - - - - - - assertProductAttributeIsUnique - - + + + + custom_attribute_set + Text_Field_Admin_%isolation% + Text Field + - + No + attr_textfield_%isolation% + - + default_value_text%isolation% + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + custom_attribute_set + Text_Field_Admin_%isolation% + Text Area + - + Yes + attr_textarea_%isolation% + Store View + - + default_value_textarea%isolation% + - + - + No + Area_Field%isolation% + Yes + Yes + Yes + - + - + - + - + - + - + - + + + + + + + + + + custom_attribute_set + Date_Admin_%isolation% + Date + - + No + attr_date_%isolation% + - + - + - + n/j/y + - + No + Date_Store_View + Yes + Yes + No + - + - + - + - + Yes + Yes + Yes + + + + + + + + custom_attribute_set + Yes/No_Admin_%isolation% + Yes/No + - + Yes + attr_yesno_%isolation% + Global + - + - + - + No + - + Yes/No_Global + - + - + - + - + - + - + - + - + - + - + + + + + + custom_attribute_set + Multiple_Select_Admin_%isolation% + Multiple Select + default + No + attr_multiselect_%isolation% + Website + - + - + - + - + Yes + - + Yes + Yes + Yes + Filterable (with results) + Yes + - + Yes + Yes + Yes + - + + + + + + + + + + + + + custom_attribute_set + Dropdown_Admin_%isolation% + Dropdown + default + Yes + attr_dropdown_%isolation% + Global + - + - + - + - + No + - + Yes + Yes + Yes + Filterable (with results) + Yes + - + Yes + Yes + Yes + Yes + + + + + + + + + + + + + + + + + custom_attribute_set + Price_Admin_%isolation% + Price + - + No + attr_price_%isolation% + - + 1000 + - + - + - + No + Price_StoreView + Yes + Yes + No + Filterable (with results) + Yes + - + - + - + - + - + + + + + + + + + + custom_attribute_set + Fixed_Product_Tax_Admin_%isolation% + Fixed Product Tax + - + - + attr_fpt_code_%isolation% + - + - + - + - + - + - + Fixed_Product_Tax_Storeview + - + - + - + - + - + - + - + - + - + - + + + + + + custom_attribute_set + Text_Field_Admin_%isolation% + Text Field + - + Yes + attr_textfield_%isolation% + Store View + default_value_text%isolation% + - + - + - + Yes + Area_Field%isolation% + Yes + Yes + Yes + - + - + - + - + - + - + - + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv deleted file mode 100755 index 80599840a06ed..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv +++ /dev/null @@ -1,10 +0,0 @@ -"productTemplate/dataSet";"productAttribute/data/frontend_label";"productAttribute/data/frontend_input";"productAttribute/data/options/preset";"productAttribute/data/is_required";"productAttribute/data/attribute_code";"productAttribute/data/is_global";"productAttribute/data/default_value_text";"productAttribute/data/default_value_textarea";"productAttribute/data/default_value_date/pattern";"productAttribute/data/default_value_yesno";"productAttribute/data/is_unique";"productAttribute/data/is_searchable";"productAttribute/data/is_visible_in_advanced_search";"productAttribute/data/is_comparable";"productAttribute/data/is_filterable";"productAttribute/data/is_filterable_in_search";"productAttribute/data/is_used_for_promo_rules";"productAttribute/data/is_html_allowed_on_front";"productAttribute/data/is_visible_on_front";"productAttribute/data/used_in_product_listing";"productAttribute/data/used_for_sort_by";"issue";"constraint" -"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_textfield_%isolation%";"-";"default_value_text%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm" -"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Area";"-";"Yes";"attr_textarea_%isolation%";"Store View";"-";"default_value_textarea%isolation%";"-";"-";"No";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable" -"custom_attribute_set";"Date_Admin_%isolation%";"Date";"-";"No";"attr_date_%isolation%";"-";"-";"-";"n/j/y";"-";"No";"Date_Store_View";"Yes";"Yes";"No";"-";"-";"-";"-";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsUsedPromoRules" -"custom_attribute_set";"Yes/No_Admin_%isolation%";"Yes/No";"-";"Yes";"attr_yesno_%isolation%";"Global";"-";"-";"-";"No";"-";"Yes/No_Global";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm" -"custom_attribute_set";"Multiple_Select_Admin_%isolation%";"Multiple Select";"default";"No";"attr_multiselect_%isolation%";"Website";"-";"-";"-";"-";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm" -"custom_attribute_set";"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"-";"No";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm" -"custom_attribute_set";"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"1000";"-";"-";"-";"No";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch" -"custom_attribute_set";"Fixed_Product_Tax_Admin_%isolation%";"Fixed Product Tax";"-";"-";"attr_fpt_code_%isolation%";"-";"-";"-";"-";"-";"-";"Fixed_Product_Tax_Storeview";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm" -"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_textfield_%isolation%";"Store View";"default_value_text%isolation%";"-";"-";"-";"Yes";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml index 09aef16ab0ad1..be5f52c65fbb1 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml @@ -5,17 +5,23 @@ * See COPYING.txt for license details. */ --> - - - - custom_attribute_set - attribute_type_dropdown - assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceForAttributeMapping, assertProductAttributeAbsenceInTemplateGroups, assertProductAttributeAbsenceInUnassignedAttributes - - - default - attribute_type_text_field - assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceInVariationsSearch - - + + + + custom_attribute_set + attribute_type_dropdown + + + + + + + + default + attribute_type_text_field + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml index 07256489d77f7..17302c63e5a77 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml @@ -5,13 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - custom_attribute_set - default - default - assertProductTemplateSuccessDeleteMessage, assertProductTemplateNotInGrid, assertProductNotInGrid - - + + + + custom_attribute_set + default + default + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml index b34b1b1f7c873..99a53f30a6802 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml @@ -5,17 +5,23 @@ * See COPYING.txt for license details. */ --> - - - - attribute_type_text_field - Yes - assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceInSearchOnProductForm, assertProductAttributeAbsenceForExport - - - attribute_type_dropdown - No - assertProductAttributeSuccessDeleteMessage, assertProductAttributeAbsenceInGrid, assertProductAttributeAbsenceInSearchOnProductForm, assertProductAttributeAbsenceForExport - - + + + + attribute_type_text_field + Yes + + + + + + + attribute_type_dropdown + No + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml index ea18536b07910..c8cb5c50b5ced 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml @@ -5,12 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - news_from_date - Yes - assertAbsenceDeleteAttributeButton - - + + + + news_from_date + Yes + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml index 1597fe86d0bdd..e21537c08c79a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - one_variation - assertUsedSuperAttributeImpossibleDeleteMessages, assertProductAttributeInGrid, assertConfigurableProductForm - - + + + + one_variation + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml index ef91633416a9b..bed18fc771db0 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml @@ -5,14 +5,18 @@ * See COPYING.txt for license details. */ --> - - - - ProductTemplateEdit1%isolation% - Custom-group%isolation% - custom_attribute_set - attribute_type_text_field - assertProductTemplateSuccessSaveMessage, assertProductTemplateForm, assertProductTemplateInGrid, assertProductTemplateOnProductForm, assertProductTemplateGroupOnProductForm - - + + + + ProductTemplateEdit1%isolation% + Custom-group%isolation% + custom_attribute_set + attribute_type_text_field + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml index 1e87387498d26..496e4883fca46 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml @@ -5,57 +5,59 @@ * See COPYING.txt for license details. */ --> - - - - custom_attribute_set - attribute_type_text_field - Text_Field_%isolation% - - - - - Yes - - - Global - attribute_edited%isolation% - Yes - - - Yes - Yes - Yes - - - - - Yes - Yes - Yes - Yes - Yes - Yes - assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm - - - custom_attribute_set - attribute_type_dropdown - Dropdown_%isolation% - - - default - Yes - - - Global - - - Yes - - - Yes - Yes - Yes - Filterable (with results) - Yes - No - Yes - Yes - Yes - Yes - Yes - assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm - - + + + + custom_attribute_set + attribute_type_text_field + Text_Field_%isolation% + - + - + Yes + - + Global + attribute_edited%isolation% + Yes + - + Yes + Yes + Yes + - + - + Yes + Yes + Yes + Yes + Yes + Yes + + + + + custom_attribute_set + attribute_type_dropdown + Dropdown_%isolation% + - + default + Yes + - + Global + - + Yes + - + Yes + Yes + Yes + Filterable (with results) + Yes + No + Yes + Yes + Yes + Yes + Yes + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv deleted file mode 100644 index 544ef4463d362..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest/testUpdateProductAttribute.csv +++ /dev/null @@ -1,3 +0,0 @@ -productTemplate/dataSet;productAttributeOriginal/dataSet;attribute/data/frontend_label;attribute/data/frontend_input;attribute/data/options/preset;attribute/data/is_required;attribute/data/attribute_code;attribute/data/is_global;attribute/data/default_value_text;attribute/data/is_unique;attribute/data/manage_frontend_label;attribute/data/is_searchable;attribute/data/is_visible_in_advanced_search;attribute/data/is_comparable;attribute/data/is_filterable;attribute/data/is_filterable_in_search;attribute/data/is_used_for_promo_rules;attribute/data/is_html_allowed_on_front;attribute/data/is_visible_on_front;attribute/data/used_in_product_listing;attribute/data/used_for_sort_by;isRequired;constraint -custom_attribute_set;attribute_type_text_field;Text_Field_%isolation%;-;-;Yes;-;Global;attribute_edited%isolation%;Yes;-;Yes;Yes;Yes;-;-;Yes;Yes;Yes;Yes;Yes;Yes;assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm -custom_attribute_set;attribute_type_dropdown;Dropdown_%isolation%;-;default;Yes;-;Global;-;Yes;-;Yes;Yes;Yes;Filterable (with results);Yes;No;Yes;Yes;Yes;Yes;Yes;assertProductAttributeSaveMessage, assertAddedProductAttributeOnProductForm diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml index 9ad414f26cb11..0bf843b5c6ccb 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml @@ -1,443 +1,229 @@ - + - - - high - - - - - - - low - - - - - - low - - - - - - - low - - - - - - - low - - - - - - - - - low - - - - - - - - - low - - - - - - - - low - - - - - - - - - low - - - - - - - - middle - - - - - - - low - - - - - - - low - - - - - - - low - - - - - - - low - - - - - - - low - - - - - - - low - - - low - - - high - - - - - - - - - - - low - - - - - - - low - - - - - - - high - - - - - - low - - - low - - - low - - - - - - - - - - - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - middle - - - - - - - - - - - high - - - middle - - - middle - - - - - - - - - - high - - - middle - - - middle - - - - - - - - - - high - - - middle - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - - - - low - - - - - - - - low - - - - - - - high - - - - - - high - - - - - - - - - high - - - - - - - high - - - - - - - - - - - high - - - - - - low - - - low - - - low - - - low - - - low - - - high - - - high - - - high - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - high - - - - - - low - - - - - - - high - - - high - - - high - - - high - - - high - - - low - - - low - - - low - - - high - - - - - - high - - - low - - - low - - - low - - + --> + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Fixture\Category + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Fixture\Category + Magento\Mtf\Fixture\FixtureInterface + + + Magento\CatalogSearch\Test\Page\CatalogsearchResult + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Fixture\FixtureInterface + Magento\Catalog\Test\Fixture\Category + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + Magento\Checkout\Test\Page\CheckoutCart + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + + + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Fixture\FixtureInterface + Magento\Catalog\Test\Fixture\Category + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\CatalogSearch\Test\Page\CatalogsearchResult + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex + + + + + Magento\Catalog\Test\Fixture\CatalogProductTemplate + Magento\Catalog\Test\Fixture\CatalogProductAttribute + Magento\Catalog\Test\Fixture\CatalogProductAttribute + Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex + Magento\Mtf\Fixture\FixtureFactory + + + + + + + + + + + + + + + + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Checkout\Test\Page\CheckoutCart + + + + + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Page\Product\CatalogProductView + + + + + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Page\Product\CatalogProductView + + + + + + + + + + + Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit + + + Magento\Mtf\Client\Browser + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Fixture\Category + + + Magento\Catalog\Test\Fixture\Category + Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit + Magento\Catalog\Test\Fixture\CatalogAttributeSet + Magento\Catalog\Test\Fixture\CatalogProductAttribute + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex + Magento\Catalog\Test\Fixture\CatalogAttributeSet + + + Magento\Mtf\Fixture\FixtureFactory + Magento\Catalog\Test\Fixture\CatalogAttributeSet + Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew + Magento\Catalog\Test\Fixture\CatalogProductAttribute + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew + + + + + + + + + + + + + + + + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit + + + Magento\Mtf\Fixture\FixtureInterface + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + + + + + + + + + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/page.xml deleted file mode 100644 index 5c57486c9f69f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/page.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - catalog/product/index - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex - - - catalog/product/new - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew - - - catalog/product/edit - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit - - - catalog/product/view - product - Magento\Catalog\Test\Page\Product\CatalogProductView - - - catalog/category/view - category - Magento\Catalog\Test\Page\Category\CatalogCategoryView - - - catalog/product_attribute/index - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex - - - catalog/product_attribute/new - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew - - - catalog/category/edit - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit - - - catalog/product_set/index - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex - - - catalog/product_set/edit - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit - - - catalog/category/edit - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit - - - catalog/product_set/add - adminhtml - Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetAdd - - - catalog/product_compare/index - product - Magento\Catalog\Test\Page\Product\CatalogProductCompare - - diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml index 65fef355dd543..921eb6a296258 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\CatalogRule\Test\Block\Adminhtml\Promo\GridPageActions - .page-main-actions - css selector - - - Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog - #promo_catalog_grid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml index 8b7fcb918913b..5dd34d3be1a90 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\CatalogRule\Test\Block\Adminhtml\FormPageActions - .page-main-actions - css selector - - - Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\PromoForm - [id="page:main-container"] - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml index df8a44f24cc72..01471f4c80264 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml @@ -5,29 +5,33 @@ * See COPYING.txt for license details. */ --> - - - - catalog_price_rule_priority_0 - - - catalog_price_rule_priority_2 - 100 - 40 - 60 - 40 - 100 - assertCatalogPriceRuleAppliedCatalogPage, assertCatalogPriceRuleAppliedProductPage, assertCatalogPriceRuleAppliedShoppingCart - - - catalog_price_rule_priority_0 - catalog_price_rule_priority_1_stop_further_rules - catalog_price_rule_priority_2 - 100 - 45 - 55 - 45 - 100 - assertCatalogPriceRuleAppliedCatalogPage, assertCatalogPriceRuleAppliedProductPage, assertCatalogPriceRuleAppliedShoppingCart - - + + + + catalog_price_rule_priority_0 + - + catalog_price_rule_priority_2 + 100 + 40 + 60 + 40 + 100 + + + + + + catalog_price_rule_priority_0 + catalog_price_rule_priority_1_stop_further_rules + catalog_price_rule_priority_2 + 100 + 45 + 55 + 45 + 100 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml index b71debace5163..c70fee09fd2a1 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml @@ -5,29 +5,35 @@ * See COPYING.txt for license details. */ --> - - - - CatalogPriceRule %isolation% - Catalog Price Rule Description - Active - Main Website - Wholesale - - - By Percentage of the Original Price - 50 - assertCatalogPriceRuleSuccessSaveMessage, assertCatalogPriceRuleNoticeMessage, assertCatalogPriceRuleForm, assertCatalogPriceRuleInGrid - - - CatalogPriceRule %isolation% - Catalog Price Rule Description - Inactive - Main Website - General - - - By Fixed Amount - 10 - assertCatalogPriceRuleSuccessSaveMessage, assertCatalogPriceRuleNoticeMessage, assertCatalogPriceRuleForm, assertCatalogPriceRuleInGrid - - + + + + CatalogPriceRule %isolation% + Catalog Price Rule Description + Active + Main Website + Wholesale + - + By Percentage of the Original Price + 50 + + + + + + + CatalogPriceRule %isolation% + Catalog Price Rule Description + Inactive + Main Website + General + - + By Fixed Amount + 10 + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml index 697035d1ad0b0..b4317c3c471e7 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml @@ -5,22 +5,25 @@ * See COPYING.txt for license details. */ --> - - - - rule_name%isolation% - Active - Main Website - NOT LOGGED IN - [Category|is|%category_1%] - To Percentage of the Original Price - 90 - 100 - 90 - 10 - 90 - 100 - assertCatalogPriceRuleInGrid, assertCatalogPriceRuleAppliedCatalogPage, assertCatalogPriceRuleAppliedProductPage, assertCatalogPriceRuleAppliedShoppingCart - - + + + + rule_name%isolation% + Active + Main Website + NOT LOGGED IN + [Category|is|%category_1%] + To Percentage of the Original Price + 90 + 100 + 90 + 10 + 90 + 100 + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml index 13368cf82a40e..470c2c0f8ac3b 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml @@ -5,11 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - active_catalog_price_rule_with_conditions - assertCatalogPriceRuleSuccessDeleteMessage, assertCatalogPriceRuleNotInGrid - - + + + + active_catalog_price_rule_with_conditions + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml index 0276af6a5e142..df5c383c3cf89 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml @@ -5,39 +5,45 @@ * See COPYING.txt for license details. */ --> - - - - active_catalog_price_rule_with_conditions - New Catalog Price Rule Name %isolation% - - - Inactive - - - - - - - save - - - - - - - - - - - assertCatalogPriceRuleSuccessSaveMessage, assertCatalogPriceRuleNoticeMessage, assertCatalogPriceRuleForm, assertCatalogPriceRuleInGrid - - - active_catalog_price_rule_with_conditions - New Catalog Price Rule Name %isolation% - New Catalog Price Rule Description %isolation% - Active - [Category|is|%category_1%] - By Fixed Amount - 35 - saveAndApply - 100 - 65 - 35 - 65 - 100 - assertCatalogPriceRuleSuccessSaveMessage, assertCatalogPriceRuleAppliedProductPage, assertCatalogPriceRuleForm, assertCatalogPriceRuleInGrid - - + + + + active_catalog_price_rule_with_conditions + New Catalog Price Rule Name %isolation% + - + Inactive + - + - + - + save + - + - + - + - + - + + + + + + + active_catalog_price_rule_with_conditions + New Catalog Price Rule Name %isolation% + New Catalog Price Rule Description %isolation% + Active + [Category|is|%category_1%] + By Fixed Amount + 35 + saveAndApply + 100 + 65 + 35 + 65 + 100 + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml index f107dfc9a427c..93d4c4fb6847f 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml @@ -1,76 +1,49 @@ - + - - - low - - - - - - low - - - - - - - - low - - - - - - - low - - - - - - high - - - - - - - - - low - - - - - - low - - - - - - - high - - - - - - - - high - - - - - - - - - + --> + + + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + + + Magento\CatalogRule\Test\Fixture\CatalogRule + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew + + + Magento\CatalogRule\Test\Fixture\CatalogRule + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + + + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + + + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Catalog\Test\Page\Category\CatalogCategoryView + + + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + + + Magento\CatalogRule\Test\Fixture\CatalogRule + Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex + + + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Page\Category\CatalogCategoryView + + + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Checkout\Test\Page\CheckoutCart + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/page.xml deleted file mode 100644 index d088a49234fb9..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - catalog_rule/promo_catalog/new - adminhtml - Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew - - - catalog_rule/promo_catalog/index - adminhtml - Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex - - diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchEdit.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchEdit.xml index 4b100dc433b0b..87d6b0b791a79 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchEdit.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchEdit.xml @@ -1,21 +1,13 @@ - + - - -
- Magento\CatalogSearch\Test\Block\Adminhtml\Edit\SearchTermForm - #edit_form - css selector -
- - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchIndex.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchIndex.xml index 1941ca1d0c849..7d2915299f7e2 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchIndex.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/Adminhtml/CatalogSearchIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\CatalogSearch\Test\Block\Adminhtml\Grid - #search_term_grid - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedResult.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedResult.xml index 56ded52e5ba49..5d5ec64b2d06e 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedResult.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedResult.xml @@ -1,26 +1,14 @@ - + - - - - Magento\CatalogSearch\Test\Block\Advanced\Result - .column.main - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\BottomToolbar - .//*[contains(@class,"toolbar-products")][2] - xpath - - - Magento\Catalog\Test\Block\Product\ListProduct - .search.results - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedSearch.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedSearch.xml index 272c3d9a7c285..f4e3ce23e3e95 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedSearch.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/AdvancedSearch.xml @@ -1,21 +1,13 @@ - + - - -
- Magento\CatalogSearch\Test\Block\Advanced\Form - .form.search.advanced - css selector -
- - Magento\Widget\Test\Block\WidgetView - .widget - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/CatalogsearchResult.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/CatalogsearchResult.xml index 8b47895416478..bca2d33440a57 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/CatalogsearchResult.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Page/CatalogsearchResult.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Catalog\Test\Block\Product\ListProduct - .search.results - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\BottomToolbar - .//*[contains(@class,"toolbar-products")][2] - xpath - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml index d9b3f15c206eb..6aea24a4a57c6 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml @@ -5,164 +5,164 @@ * See COPYING.txt for license details. */ --> - - - - MAGETWO-12421: Use Advanced Search to Find the Product - Yes - - - abc_dfj - abc_dfj - - - - - - - - - assertAdvancedSearchProductsResult - bamboo_plan:end_to_end,test_type:acceptance_test - - - Search product in advanced search by name - - - Yes - adc_123 - - - - - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by partial name - Yes - - - abc - - - - - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by sku - Yes - - - - - abc_dfj - - - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by partial sku - Yes - - - - - abc - - - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by partial sku and description - Yes - - - - - abc - adc_full - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by description - - - Yes - - - - - dfj_full - - - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by short description - - - - - - - - - - - dfj_short - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by partial short description - Yes - - - - - - - - - abc_short - - - - - assertAdvancedSearchProductsResult - - - Search product in advanced search by price to - Yes - Yes - - - - - - - - - - - 100 - assertAdvancedSearchProductsResult - - - Search product in advanced search by price from and price to - Yes - - - - - - - - - - - 50 - 50 - assertAdvancedSearchProductsResult - - - Search product in advanced search by name, sku, description, short description, price from and price to - Yes - - - abc_dfj - abc_dfj - adc_Full - abc_short - 49 - 500 - assertAdvancedSearchProductsResult - - - Search product in advanced search by name, sku, description, short description, price from and price to - Yes - - - abc_dfj - abc_dfj - adc_Full - abc_short - 49 - 50 - assertAdvancedSearchProductsResult - - + + + + MAGETWO-12421: Use Advanced Search to Find the Product + Yes + - + abc_dfj + abc_dfj + - + - + - + - + bamboo_plan:end_to_end,test_type:acceptance_test + + + + Search product in advanced search by name + - + Yes + adc_123 + - + - + - + - + - + + + + Search product in advanced search by partial name + Yes + - + abc + - + - + - + - + - + + + + Search product in advanced search by sku + Yes + - + - + abc_dfj + - + - + - + - + + + + Search product in advanced search by partial sku + Yes + - + - + abc + - + - + - + - + + + + Search product in advanced search by partial sku and description + Yes + - + - + abc + adc_full + - + - + - + + + + Search product in advanced search by description + - + Yes + - + - + dfj_full + - + - + - + + + + Search product in advanced search by short description + - + - + - + - + - + dfj_short + - + - + + + + Search product in advanced search by partial short description + Yes + - + - + - + - + abc_short + - + - + + + + Search product in advanced search by price to + Yes + Yes + - + - + - + - + - + 100 + + + + Search product in advanced search by price from and price to + Yes + - + - + - + - + - + 50 + 50 + + + + Search product in advanced search by name, sku, description, short description, price from and price to + Yes + - + abc_dfj + abc_dfj + adc_Full + abc_short + 49 + 500 + + + + Search product in advanced search by name, sku, description, short description, price from and price to + Yes + - + abc_dfj + abc_dfj + adc_Full + abc_short + 49 + 50 + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml index bff2219faf90f..5cf999f4e2c54 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml @@ -5,15 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::sku - Main Website/Main Website Store/Default Store View - Search Term Synonym %isolation% - http://example.com/ - No - assertSearchTermSuccessSaveMessage, assertSearchTermInGrid, assertSearchTermForm, assertSearchTermOnFrontend, assertSearchTermSynonymOnFrontend - - + + + + catalogProductSimple::sku + Main Website/Main Website Store/Default Store View + Search Term Synonym %isolation% + http://example.com/ + No + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest/test.csv deleted file mode 100644 index 57d68290ccaa9..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"searchTerm/data/query_text/value";"searchTerm/data/store_id";"searchTerm/data/synonym_for";"searchTerm/data/redirect";"searchTerm/data/display_in_terms";"constraint" -"catalogProductSimple::sku";"Main Website/Main Website Store/Default Store View";"Search Term Synonym %isolation%";"http://example.com/";"No";"assertSearchTermSuccessSaveMessage, assertSearchTermInGrid, assertSearchTermForm, assertSearchTermOnFrontend, assertSearchTermSynonymOnFrontend" diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml index 5cc26500a324a..1a86b951950f0 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml @@ -5,11 +5,14 @@ * See COPYING.txt for license details. */ --> - - - - default - assertSearchTermSuccessDeleteMessage, assertSearchTermNotInGrid, assertSearchTermNotOnFrontend, assertSearchSynonymNotOnFrontend - - + + + + default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.xml index 4688965adcb05..e2e59535ac15c 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.xml @@ -5,17 +5,20 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::sku - Main Website/Main Website Store/Default Store View - 1 - 20 - simple%isolation% - http://example.com/ - No - assertSearchTermSuccessSaveMessage, assertSearchTermForm, assertSearchTermInGrid, assertSearchTermOnFrontend - - + + + + catalogProductSimple::sku + Main Website/Main Website Store/Default Store View + 1 + 20 + simple%isolation% + http://example.com/ + No + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest/test.csv deleted file mode 100644 index 2e260a6a786e2..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"searchTerm/data/query_text/value";"searchTerm/data/store_id";"searchTerm/data/num_results";"searchTerm/data/popularity";"searchTerm/data/synonym_for";"searchTerm/data/redirect";"searchTerm/data/display_in_terms";"constraint" -"catalogProductSimple::sku";"Main Website/Main Website Store/Default Store View";1;20;"simple%isolation%";"http://example.com/";"No";"assertSearchTermSuccessSaveMessage, assertSearchTermForm, assertSearchTermInGrid, assertSearchTermOnFrontend" diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml index 8631b60499933..fa8737cfae137 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml @@ -5,11 +5,14 @@ * See COPYING.txt for license details. */ --> - - - - catalogSearchQuery::default,catalogSearchQuery::default,catalogSearchQuery::default - assertSearchTermSuccessMassDeleteMessage, assertSearchTermMassActionsNotInGrid, assertSearchTermMassActionNotOnFrontend, assertSearchSynonymMassActionNotOnFrontend - - + + + + catalogSearchQuery::default,catalogSearchQuery::default,catalogSearchQuery::default + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml index 967f373ebd94e..66bcae2e9fc84 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml @@ -5,48 +5,48 @@ * See COPYING.txt for license details. */ --> - - - - MAGETWO-12420: Use Quick Search to Find the Product - catalogProductSimple::default::sku - assertProductCanBeOpenedFromSearchResult - bamboo_plan:BAT,test_type:acceptance_test - - - Search simple product - catalogProductSimple::default::simple - assertCatalogSearchResult - - - Search virtual product - catalogProductVirtual::default::virtual - assertCatalogSearchResult - - - Search configurable product - configurableProductInjectable::default::configurable - assertCatalogSearchResult - - - Search downloadable product - downloadableProductInjectable::default::downloadable - assertCatalogSearchResult - - - Search grouped product - groupedProductInjectable::default::grouped - assertCatalogSearchResult - - - Search bundle dynamic product - bundleProduct::bundle_dynamic_product::bundle - assertCatalogSearchResult - - - Search fixed product - bundleProduct::bundle_fixed_product::bundle - assertCatalogSearchResult - - + + + + MAGETWO-12420: Use Quick Search to Find the Product + catalogProductSimple::default::sku + bamboo_plan:BAT,test_type:acceptance_test + + + + Search simple product + catalogProductSimple::default::simple + + + + Search virtual product + catalogProductVirtual::default::virtual + + + + Search configurable product + configurableProductInjectable::default::configurable + + + + Search downloadable product + downloadableProductInjectable::default::downloadable + + + + Search grouped product + groupedProductInjectable::default::grouped + + + + Search bundle dynamic product + bundleProduct::bundle_dynamic_product::bundle + + + + Search fixed product + bundleProduct::bundle_fixed_product::bundle + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml index 8235dd6e5a9ba..388e4c4e51ac5 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml @@ -5,17 +5,17 @@ * See COPYING.txt for license details. */ --> - - - - catalogProductSimple::name - - - assertSuggestSearchingResult - - - catalogProductSimple::sku - 1 - assertSuggestSearchingResult - - + + + + catalogProductSimple::name + - + + + + catalogProductSimple::sku + 1 + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml index 9a215cf30c095..efba35fa1a3a1 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml @@ -1,131 +1,80 @@ - + - - - high - - - - - - - high - - - - - - - high - - - - - - - - high - - - - - - - - high - - - - - - - high - - - - - - - - high - - - - - - high - - - - - - - - high - - - - - - high - - - - - - - high - - - - - - - - high - - - - - - - - high - - - - - - high - - - - - - high - - - - - - - high - - - - - - - high - - - - - - - + --> + + + Magento\Cms\Test\Page\CmsIndex + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + + + Magento\CatalogSearch\Test\Page\Advanced\Result + Magento\Catalog\Test\Fixture\CatalogProductSimple + + + Magento\Cms\Test\Page\CmsIndex + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit + + + Magento\Cms\Test\Page\CmsIndex + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + + + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + + + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + + + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + + + Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex + + + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\Cms\Test\Page\CmsIndex + Magento\Mtf\Client\Browser + + + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery + Magento\CatalogSearch\Test\Page\AdvancedResult + Magento\Catalog\Test\Page\Product\CatalogProductView + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/page.xml deleted file mode 100644 index 6b343cb4db68b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/page.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - catalogsearch/result - Magento\CatalogSearch\Test\Page\CatalogsearchResult - - - adminhtml - search/term - Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex - - - adminhtml - search/term/edit - Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit - - diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml index e1b9461f4971f..179fb5bfdb5ab 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCart.xml @@ -1,51 +1,19 @@ - + - - - - Magento\Checkout\Test\Block\Cart - //div[contains(@class, "column main")] - xpath - - - Magento\Checkout\Test\Block\Cart\CartEmpty - .cart-empty - css selector - - - Magento\Core\Test\Block\Messages - .messages .messages - css selector - - - Magento\Checkout\Test\Block\Cart\Shipping - .block.shipping - css selector - - - Magento\Checkout\Test\Block\Cart\Totals - #shopping-cart-totals-table - css selector - - - Magento\Catalog\Test\Block\Product\ProductList\Crosssell - //div[contains(@class, "block")][contains(@class, "crosssell")] - xpath - - - Magento\Checkout\Test\Block\Cart\DiscountCodes - .block.discount - css selector - - - Magento\Checkout\Test\Block\Onepage\Link - ul.checkout-methods-items button.primary.checkout - css selector - - - + --> + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml index 5674a3eb37f56..6ee83d6b92861 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml @@ -1,41 +1,17 @@ - + - - - - Magento\Checkout\Test\Block\Onepage\Login - #checkout-step-login - css selector - - - Magento\Checkout\Test\Block\Onepage\Billing - #checkout-step-billing - css selector - - - Magento\Checkout\Test\Block\Onepage\Shipping - #checkout-step-shipping - css selector - - - Magento\Checkout\Test\Block\Onepage\Shipping\Method - #checkout-step-shipping_method - css selector - - - Magento\Checkout\Test\Block\Onepage\Payment\Methods - #checkout-step-payment - css selector - - - Magento\Checkout\Test\Block\Onepage\Review - #checkout-step-review - css selector - - - + --> + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepageSuccess.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepageSuccess.xml index 9880cf2ca14e2..04e403b5df575 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepageSuccess.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepageSuccess.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Checkout\Test\Block\Onepage\Success - //div[contains(@class, "checkout-success")] - xpath - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml index fb7323a4bf3fd..913b7a9a664b0 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml @@ -5,47 +5,79 @@ * See COPYING.txt for license details. */ --> - - - - bundleProduct::bundle_dynamic_product - 200 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - bundleProduct::bundle_fixed_product - 756 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - catalogProductSimple::with_two_custom_option - 340 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - catalogProductVirtual::product_50_dollar - 50 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - configurableProductInjectable::default - 516 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - downloadableProductInjectable::with_two_separately_links - 46 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - groupedProductInjectable::three_simple_products - 1920 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - - catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product - 3272 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart - - + + + + bundleProduct::bundle_dynamic_product + 200 + + + + + + + + bundleProduct::bundle_fixed_product + 756 + + + + + + + + catalogProductSimple::with_two_custom_option + 340 + + + + + + + + catalogProductVirtual::product_50_dollar + 50 + + + + + + + + configurableProductInjectable::default + 516 + + + + + + + + downloadableProductInjectable::with_two_separately_links + 46 + + + + + + + + groupedProductInjectable::three_simple_products + 1920 + + + + + + + + catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product + 3272 + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest/test.csv deleted file mode 100644 index e754cc39c2c32..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest/test.csv +++ /dev/null @@ -1,9 +0,0 @@ -"productsData";"cart/data/grand_total";"constraint" -"bundleProduct::bundle_dynamic_product";"200";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"bundleProduct::bundle_fixed_product";"756";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"catalogProductSimple::with_two_custom_option";"340";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"catalogProductVirtual::product_50_dollar";"50";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"configurableProductInjectable::default";"516";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"downloadableProductInjectable::with_two_separately_links";"46";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"groupedProductInjectable::three_simple_products";"1920";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" -"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"3272";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart" diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml index 2f2b0b9fdd969..3f136ec685c54 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml @@ -5,19 +5,18 @@ * See COPYING.txt for license details. */ --> - - - - delete Simple - catalogProductSimple::default, catalogProductVirtual::default - 0 - assertProductAbsentInMiniShoppingCart, assertProductPresentInMiniShoppingCart - - - delete Simple - catalogProductSimple::default - 0 - assertCartIsEmpty - - + + + + delete Simple + catalogProductSimple::default, catalogProductVirtual::default + + + + + delete Simple + catalogProductSimple::default + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml index f740c02722fbe..37e62569f3c9e 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml @@ -5,39 +5,39 @@ * See COPYING.txt for license details. */ --> - - - - bundleProduct::bundle_dynamic_product - assertCartIsEmpty - - - bundleProduct::bundle_fixed_product - assertCartIsEmpty - - - catalogProductSimple::with_two_custom_option - assertCartIsEmpty - - - catalogProductVirtual::product_50_dollar - assertCartIsEmpty - - - configurableProductInjectable::default - assertCartIsEmpty - - - downloadableProductInjectable::with_two_separately_links - assertCartIsEmpty - - - groupedProductInjectable::three_simple_products - assertCartIsEmpty - - - catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product - assertCartIsEmpty - - + + + + bundleProduct::bundle_dynamic_product + + + + bundleProduct::bundle_fixed_product + + + + catalogProductSimple::with_two_custom_option + + + + catalogProductVirtual::product_50_dollar + + + + configurableProductInjectable::default + + + + downloadableProductInjectable::with_two_separately_links + + + + groupedProductInjectable::three_simple_products + + + + catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest/test.csv b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest/test.csv deleted file mode 100644 index 78905d9e68380..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest/test.csv +++ /dev/null @@ -1,9 +0,0 @@ -"productsData";"constraint" -"bundleProduct::bundle_dynamic_product";"assertCartIsEmpty" -"bundleProduct::bundle_fixed_product";"assertCartIsEmpty" -"catalogProductSimple::with_two_custom_option";"assertCartIsEmpty" -"catalogProductVirtual::product_50_dollar";"assertCartIsEmpty" -"configurableProductInjectable::default";"assertCartIsEmpty" -"downloadableProductInjectable::with_two_separately_links";"assertCartIsEmpty" -"groupedProductInjectable::three_simple_products";"assertCartIsEmpty" -"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"assertCartIsEmpty" diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml index 2ffb2c9a6503f..259e831f9f77d 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml @@ -5,32 +5,42 @@ * See COPYING.txt for license details. */ --> - - - - Update Simple - catalogProductSimple::with_two_custom_option - forUpdateMiniShoppingCart - assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart - - - Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart - configurableProductInjectable::default - forUpdateMiniShoppingCart - assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart - - - Update Bundle and verify previous product was updated to new one in shopping cart and mini shopping cart - bundleProduct::bundle_fixed_product - forUpdateMiniShoppingCart - assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart - - - Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart - downloadableProductInjectable::with_two_separately_links - forUpdateMiniShoppingCart - assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart - Bug: MAGETWO-24195 - - + + + + Update Simple + catalogProductSimple::with_two_custom_option + forUpdateMiniShoppingCart + + + + + Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart + configurableProductInjectable::default + forUpdateMiniShoppingCart + + + + + + + Update Bundle and verify previous product was updated to new one in shopping cart and mini shopping cart + bundleProduct::bundle_fixed_product + forUpdateMiniShoppingCart + + + + + + + Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart + downloadableProductInjectable::with_two_separately_links + forUpdateMiniShoppingCart + Bug: MAGETWO-24195 + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml index 5dcbd321a773f..51b37fa3a7b99 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml @@ -5,23 +5,29 @@ * See COPYING.txt for license details. */ --> - - - - default - 100 - 3 - 100 - 300 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertProductQtyInMiniShoppingCart, assertSubtotalInShoppingCart - - - with_two_custom_option - 50 - 11 - 65 - 715 - assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertProductQtyInMiniShoppingCart, assertSubtotalInShoppingCart - - + + + + default + 100 + 3 + 100 + 300 + + + + + + + with_two_custom_option + 50 + 11 + 65 + 715 + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml index efe5eb96e78cb..43f82a4d3625c 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml @@ -1,57 +1,25 @@ - + - - - middle - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/page.xml deleted file mode 100644 index 32b08adfac078..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/page.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - checkout/cart/index - Magento\Checkout\Test\Page\CheckoutCart - - - checkout/onepage - Magento\Checkout\Test\Page\CheckoutOnepage - - - checkout/onepage/success - Magento\Checkout\Test\Page\CheckoutOnepageSuccess - - diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml index 2e9ec905c5043..891e9931a1e54 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml @@ -5,22 +5,10 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\CheckoutAgreements\Test\Block\Adminhtml\AgreementGrid - #agreementGrid - css selector - - - + + + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml index 040987a91d66f..401dac62e9c0a 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml @@ -5,17 +5,9 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\CheckoutAgreements\Test\Block\Adminhtml\Block\Agreement\Edit\AgreementsForm - #edit_form - css selector - - - + + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml index 289402b43233b..e083ee46d7f67 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\CheckoutAgreements\Test\Block\Onepage\AgreementReview - #checkout-step-review - css selector - - - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml index cb0aaa575c9b0..12b37a78e3af5 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - \Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview - #checkout-agreements - css selector - - - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml new file mode 100644 index 0000000000000..a6e87c1407ea7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml @@ -0,0 +1,90 @@ + + + + + + Create enabled term entity with text value + catalogProductSimple::default + name%isolation% + Enabled + Text + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + + Create enabled term entity with HTML value + catalogProductSimple::default + name%isolation% + Enabled + HTML + default + test_checkbox%isolation% + <html> + Flat Rate + Fixed + checkmo + + + + + + Create enabled term entity with text value + catalogProductSimple::default + name%isolation% + Enabled + Text + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + + Create disabled term entity + catalogProductSimple::default + name%isolation% + Disabled + Text + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + + Create enabled term, check with multishipping + catalogProductSimple::default, catalogProductSimple::default + name%isolation% + Enabled + Text + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv deleted file mode 100644 index 5bbef09db6773..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv +++ /dev/null @@ -1,6 +0,0 @@ -"description";"product";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint" -"Create enabled term entity with text value";"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"Create enabled term entity with HTML value";"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"Create enabled term entity with text value";"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"Create disabled term entity";"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout" -"Create enabled term, check with multishipping";"catalogProductSimple::default, catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermRequireMessageOnMultishippingCheckout, assertOrderSuccessPlacedMessage" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml new file mode 100644 index 0000000000000..a4e333b07a2a4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml @@ -0,0 +1,21 @@ + + + + + + catalogProductSimple::default + term_enabled_text + Flat Rate + Fixed + checkmo + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest/test.csv deleted file mode 100644 index 6824357498e27..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"product";"agreement/dataSet";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint" -"catalogProductSimple::default";"term_enabled_text";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessDeleteMessage, assertTermAbsentInGrid, assertTermAbsentOnCheckout" diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml new file mode 100644 index 0000000000000..86153627af367 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml @@ -0,0 +1,59 @@ + + + + + + catalogProductSimple::default + term_disabled_text + name%isolation% + Enabled + HTML + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + + catalogProductSimple::default + term_disabled_html + name%isolation% + Enabled + Text + default + test_checkbox%isolation% + <html> + Flat Rate + Fixed + checkmo + + + + + + catalogProductSimple::default + term_enabled_text + name%isolation% + Disabled + HTML + default + test_checkbox%isolation% + TestMessage%isolation% + Flat Rate + Fixed + checkmo + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv deleted file mode 100644 index 5c9fa47f3d824..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -"product";"agreementOrigin/dataSet";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint" -"catalogProductSimple::default";"term_disabled_text";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"catalogProductSimple::default";"term_disabled_html";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"catalogProductSimple::default";"term_enabled_text";"name%isolation%";"Disabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout" diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml index b46e597fdccf3..1133653189a68 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml @@ -1,30 +1,16 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - high - - + --> + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/page.xml deleted file mode 100644 index 06e0758277d2f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - checkout/agreement/index - adminhtml - Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex - - - checkout/agreement/new - adminhtml - Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementNew - - diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml index 351b1e796b761..08f8c4802f3d2 100644 --- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml @@ -1,66 +1,22 @@ - + - - - - Magento\Catalog\Test\Block\Search - #search_mini_form - css selector - - - Magento\Theme\Test\Block\Html\Topmenu - [role="navigation"] - css selector - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Theme\Test\Block\Html\Footer - footer.page-footer - css selector - - - Magento\Theme\Test\Block\Links - .header .links - css selector - - - Magento\Store\Test\Block\Switcher - [data-ui-id="language-switcher"] - css selector - - - Magento\Checkout\Test\Block\Cart\Sidebar - [data-block="minicart"] - css selector - - - Magento\Catalog\Test\Block\Product\Compare\Sidebar - .sidebar.sidebar-additional - css selector - - - Magento\Directory\Test\Block\Currency\Switcher - .switcher.currency - css selector - - - Magento\Cms\Test\Block\Page - .page-main - css selector - - - Magento\Widget\Test\Block\WidgetView - .widget - css selector - - - + --> + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml index 9bf2659459dee..1bbb59d71184e 100644 --- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml +++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Cms\Test\Block\Page - .page-main - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductEdit.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductEdit.xml index 285034dd41230..e8732393eebfb 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductEdit.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductEdit.xml @@ -1,25 +1,17 @@ - + - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\FormPageActions - - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\ProductForm - - - - - + --> + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductNew.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductNew.xml index d4a3d693ccbec..726e414bde4a3 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductNew.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CatalogProductNew.xml @@ -1,25 +1,17 @@ - + - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\FormPageActions - - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\ProductForm - - - - - + --> + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml index 3ba30ff7b03fd..4816ed88fe18b 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Composite\Configure - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml index 077499a65b486..89f1956e0c83e 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Composite\Configure - - - - - \ No newline at end of file + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Product/CatalogProductView.xml index 19d742fbcb2ba..109db764fba5d 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Product/CatalogProductView.xml @@ -1,23 +1,15 @@ - + - - - - - - Magento\ConfigurableProduct\Test\Block\Product\View - - - - - Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions - #product-options-wrapper - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml index c9c7a44676301..aa1374088792f 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml @@ -5,75 +5,101 @@ * See COPYING.txt for license details. */ --> - - - - configurable-product-%isolation% - two_new_options - two_new_options - Configurable Product %isolation% - configurable_sku_%isolation% - - - 100 - - - default_subcategory - Configurable short description - Configurable Product description %isolation% - 2 - In Stock - custom_attribute_set_%isolation% - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately - - - configurable-product-%isolation% - two_options - two_options - Configurable Product %isolation% - configurable_sku_%isolation% - - - 100 - - - - - Configurable short description - Configurable Product description %isolation% - 2 - - - custom_attribute_set_%isolation% - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart - - - configurable-product-%isolation% - two_new_options - two_new_options_with_special_price - Configurable Product %isolation% - configurable_sku_%isolation% - - - 100 - 10 - - - Configurable short description - Configurable Product description %isolation% - 2 - In Stock - custom_attribute_set_%isolation% - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertProductSpecialPriceOnProductPage - - - configurable-product-%isolation% - two_options_with_assigned_product - two_options_with_assigned_product - Configurable Product %isolation% - configurable_sku_%isolation% - - - 100 - - - - - Configurable short description - Configurable Product description %isolation% - 2 - In Stock - custom_attribute_set_%isolation% - assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart - - + + + + configurable-product-%isolation% + two_new_options + two_new_options + Configurable Product %isolation% + configurable_sku_%isolation% + - + 100 + - + default_subcategory + Configurable short description + Configurable Product description %isolation% + 2 + In Stock + custom_attribute_set_%isolation% + + + + + + + + + + + + configurable-product-%isolation% + two_options + two_options + Configurable Product %isolation% + configurable_sku_%isolation% + - + 100 + - + - + Configurable short description + Configurable Product description %isolation% + 2 + - + custom_attribute_set_%isolation% + + + + + + + + + + configurable-product-%isolation% + two_new_options + two_new_options_with_special_price + Configurable Product %isolation% + configurable_sku_%isolation% + - + 100 + 10 + - + Configurable short description + Configurable Product description %isolation% + 2 + In Stock + custom_attribute_set_%isolation% + + + + + + + + + + + configurable-product-%isolation% + two_options_with_assigned_product + two_options_with_assigned_product + Configurable Product %isolation% + configurable_sku_%isolation% + - + 100 + - + - + Configurable short description + Configurable Product description %isolation% + 2 + In Stock + custom_attribute_set_%isolation% + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest/test.csv deleted file mode 100644 index c282092f255db..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest/test.csv +++ /dev/null @@ -1,5 +0,0 @@ -"product/data/url_key";"product/data/configurable_attributes_data/preset";"product/data/checkout_data/preset";"product/data/name";"product/data/sku";"product/data/tax_class_id";"product/data/price/value";"product/data/special_price";"product/data/category_ids/presets";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/is_in_stock";"product/data/affected_attribute_set";"constraint";"issue" -"configurable-product-%isolation%";"two_new_options";"two_new_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately";"" -"configurable-product-%isolation%";"two_options";"two_options";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"-";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";"" -"configurable-product-%isolation%";"two_new_options";"two_new_options_with_special_price";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"10";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertProductSpecialPriceOnProductPage";"" -"configurable-product-%isolation%";"two_options_with_assigned_product";"two_options_with_assigned_product";"Configurable Product %isolation%";"configurable_sku_%isolation%";"-";"100";"-";"-";"Configurable short description";"Configurable Product description %isolation%";"2";"In Stock";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart";"" diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml index 8844efdbe8499..e6662126c4549 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml @@ -5,78 +5,100 @@ * See COPYING.txt for license details. */ --> - - - - Add new option to existed Attribute - addOptions - one_new_options - two_attributes - 153 - Configurable Product %isolation% - configurable_sku_%isolation% - 99 - default_subcategory - Configurable short description - Configurable Product description %isolation% - 3 - In Stock - configurable-product-%isolation% - - - assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately - - - Add new variations - 0 - two_new_options - three_attributes - 159 - Configurable Product %isolation% - configurable_sku_%isolation% - 99 - - - Configurable short description - Configurable Product description %isolation% - 3 - In Stock - configurable-product-%isolation% - custom_attribute_set_%isolation% - assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart - - - Delete one attribute and add another - deleteLast - two_new_options - two_attributes - 112 - Configurable Product %isolation% - configurable_sku_%isolation% - 99 - default_subcategory - Configurable short description - Configurable Product description %isolation% - 3 - In Stock - configurable-product-%isolation% - - - assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertProductInCategory, assertProductInStock, assertConfigurableProductInCart, assertConfigurableAttributesAbsentOnProductPage - - - Delete attribute and add another with products qty = 0 - deleteAll - two_new_options_with_zero_products - two_attributes - Configurable Product %isolation% - configurable_sku_%isolation% - 99 - - - Configurable short description - Configurable Product description %isolation% - 3 - In Stock - configurable-product-%isolation% - - - assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableAttributesBlockIsAbsentOnProductPage, assertProductOutOfStock - - + + + + Add new option to existed Attribute + addOptions + one_new_options + two_attributes + 153 + Configurable Product %isolation% + configurable_sku_%isolation% + 99 + default_subcategory + Configurable short description + Configurable Product description %isolation% + 3 + In Stock + configurable-product-%isolation% + - + + + + + + + + + + + + Add new variations + two_new_options + three_attributes + 159 + Configurable Product %isolation% + configurable_sku_%isolation% + 99 + - + Configurable short description + Configurable Product description %isolation% + 3 + In Stock + configurable-product-%isolation% + custom_attribute_set_%isolation% + + + + + + + + + Delete one attribute and add another + deleteLast + two_new_options + two_attributes + 112 + Configurable Product %isolation% + configurable_sku_%isolation% + 99 + default_subcategory + Configurable short description + Configurable Product description %isolation% + 3 + In Stock + configurable-product-%isolation% + - + + + + + + + + + + Delete attribute and add another with products qty = 0 + deleteAll + two_new_options_with_zero_products + two_attributes + Configurable Product %isolation% + configurable_sku_%isolation% + 99 + - + Configurable short description + Configurable Product description %isolation% + 3 + In Stock + configurable-product-%isolation% + - + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest/test.csv deleted file mode 100644 index 2d4653b21fefe..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest/test.csv +++ /dev/null @@ -1,5 +0,0 @@ -"description";"attributeTypeAction";"updatedProduct/data/configurable_attributes_data/preset";"updatedProduct/data/checkout_data/preset";"updatedProduct/data/checkout_data/cartItem/price";"updatedProduct/data/name";"updatedProduct/data/sku";"updatedProduct/data/price/value";"updatedProduct/data/category_ids/presets";"updatedProduct/data/short_description";"updatedProduct/data/description";"updatedProduct/data/weight";"updatedProduct/data/quantity_and_stock_status/is_in_stock";"product/data/url_key";"updatedProduct/data/affected_attribute_set";"constraint" -"Add new option to existed Attribute";"addOptions";"one_new_options";"two_attributes";"153";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"configurable-product-%isolation%";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertProductInCategory, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately" -"Add new variations";"";"two_new_options";"three_attributes";"159";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"configurable-product-%isolation%";"custom_attribute_set_%isolation%";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart" -"Delete one attribute and add another";"deleteLast";"two_new_options";"two_attributes";"112";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"default_subcategory";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"configurable-product-%isolation%";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertProductInCategory, assertProductInStock, assertConfigurableProductInCart, assertConfigurableAttributesAbsentOnProductPage" -"Delete attribute and add another with products qty = 0";"deleteAll";"two_new_options_with_zero_products";"two_attributes";"";"Configurable Product %isolation%";"configurable_sku_%isolation%";"99";"-";"Configurable short description";"Configurable Product description %isolation%";"3";"In Stock";"configurable-product-%isolation%";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableAttributesBlockIsAbsentOnProductPage, assertProductOutOfStock" diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml index cfad5247893ce..aa199feb0da57 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml @@ -1,45 +1,21 @@ - + - - - low - - - high - - - middle - - - low - - - low - - - low - - - high - - - low - - - high - - - low - - - low - - - low - - + --> + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableIndex.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableIndex.xml index f24055a25817a..1b3e03cca8788 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Variable\Grid - #customVariablesGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableNew.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableNew.xml index 667d827260740..1608a54198016 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableNew.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Page/Adminhtml/SystemVariableNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Core\Test\Block\Adminhtml\System\Variable\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\System\Variable\Edit\VariableForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml index bff6d7f1e7c01..d4784ab7449b9 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml @@ -1,33 +1,17 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Core/Test/etc/page.xml deleted file mode 100644 index 160400977af1f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Core/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - admin/system_variable/index - adminhtml - Magento\Core\Test\Page\Adminhtml\SystemVariableIndex - - - admin/system_variable/new - adminhtml - Magento\Core\Test\Page\Adminhtml\SystemVariableNew - - diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml index f0725f5c9de40..2ab90fb8688eb 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml @@ -5,17 +5,9 @@ * See COPYING.txt for license details. */ --> - - - - Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\GridPageActions - .grid-actions - css selector - - - Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\MainPageActions - .page-main-actions - css selector - - - + + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml index cec7ec7d9b1b0..19d692b53728a 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml @@ -5,22 +5,10 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\CurrencySymbol\Test\Block\Adminhtml\System\CurrencySymbolForm - #currency-symbols-form - css selector - - - Magento\CurrencySymbol\Test\Block\Adminhtml\System\FormPageActions - .page-main-actions - css selector - - - + + + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml new file mode 100644 index 0000000000000..53c6d70d5a525 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml @@ -0,0 +1,38 @@ + + + + + + config_currency_symbols_usd_and_uah + UAH + No + custom + + + + + + config_currency_symbols_usd_and_uah + UAH + No + & + + + + + + config_currency_symbols_usd_and_uah + UAH + No + % + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest/test.csv deleted file mode 100644 index 76667d5cce30f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -"configData";"currencySymbol/data/code";"currencySymbol/data/inherit_custom_currency_symbol";"currencySymbol/data/custom_currency_symbol";"constraint" -"config_currency_symbols_usd_and_uah";"UAH";"No";"custom";"assertCurrencySymbolSuccessSaveMessage, assertCurrencySymbolOnProductPage, assertCurrencySymbolOnCatalogPage" -"config_currency_symbols_usd_and_uah";"UAH";"No";"&";"assertCurrencySymbolSuccessSaveMessage, assertCurrencySymbolOnProductPage, assertCurrencySymbolOnCatalogPage" -"config_currency_symbols_usd_and_uah";"UAH";"No";"%";"assertCurrencySymbolSuccessSaveMessage, assertCurrencySymbolOnProductPage, assertCurrencySymbolOnCatalogPage" diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml new file mode 100644 index 0000000000000..44cb9664eeecf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.xml @@ -0,0 +1,22 @@ + + + + + + config_currency_symbols_usd_and_uah + currency_symbols_uah + UAH + ₴ + Yes + - + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest/test.csv deleted file mode 100644 index 87c2b788cf8aa..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"configData";"currencySymbolOriginal/dataSet";"currencySymbol/data/code";"currencySymbolDefault";"currencySymbol/data/inherit_custom_currency_symbol";"currencySymbol/data/custom_currency_symbol";"constraint" -"config_currency_symbols_usd_and_uah";"currency_symbols_uah";"UAH";"₴";"Yes";"-";"assertCurrencySymbolSuccessSaveMessage, assertCurrencySymbolOnProductPage,assertCurrencySymbolOnCatalogPage" diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml index 78f3c53be7348..9f8506a6af54f 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml @@ -1,34 +1,25 @@ - + - - - low - - - - - - low - - - - - - - - - - low - - - - - - - - + --> + + + Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencySymbolIndex + + + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity + + + Magento\Cms\Test\Page\CmsIndex + Magento\Catalog\Test\Page\Category\CatalogCategoryView + Magento\Catalog\Test\Fixture\CatalogProductSimple + Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/page.xml deleted file mode 100644 index cb3ed49949e36..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - admin/system_currencysymbol/index - adminhtml - Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencySymbolIndex - - - admin/system_currency/index - adminhtml - Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex - - diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml index 76b9763a13eb8..ecef20f61dce3 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid - #customerGroupGrid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupNew.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupNew.xml index 3da8f64d0c9cf..1226ca87adb67 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupNew.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Customer\Test\Block\Adminhtml\Group\Edit\Form - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndex.xml index 15d9d88ba4391..63249b4149c8f 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Customer\Test\Block\Adminhtml\CustomerGrid - #customerGrid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexEdit.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexEdit.xml index fdb284341900d..fc3502719ced7 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexEdit.xml @@ -1,36 +1,16 @@ - + - - - - Magento\Theme\Test\Block\Html\Title - .page-title .title - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Customer\Test\Block\Adminhtml\Edit\FormPageActions - .page-main-actions - css selector - - - Magento\Customer\Test\Block\Adminhtml\Edit\CustomerForm - [id="page:main-container"] - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Composite\Configure - //*[@role="dialog" and ./*[@id="product_composite_configure"] and contains(@style,"display: block")] - xpath - - - + --> + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexNew.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexNew.xml index 68fc4ae4e0b91..72fddda39ee57 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexNew.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerIndexNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Customer\Test\Block\Adminhtml\Edit\CustomerForm - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountCreate.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountCreate.xml index eab236bb95c20..16e8758cf4371 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountCreate.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountCreate.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Customer\Test\Block\Form\Register - #form-validate - css selector - - - Magento\Core\Test\Block\Messages - .page.messages - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml index 5afbd96367733..c49afd72b57a3 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Customer\Test\Block\Form\CustomerForm - #form-validate - css selector - - - Magento\Core\Test\Block\Messages - .page.messages - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml index f4f95db020a16..9033239bc232a 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml @@ -1,46 +1,18 @@ - + - - - - Magento\Core\Test\Block\Messages - .page.messages - css selector - - - Magento\Customer\Test\Block\Account\Dashboard\Address - .block-dashboard-addresses - css selector - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Customer\Test\Block\Account\Links - .nav.items - css selector - - - Magento\Customer\Test\Block\Account\Dashboard\Info - .column.main - css selector - - - Magento\Catalog\Test\Block\Product\Compare\Sidebar - .block-compare - css selector - - - Magento\Customer\Test\Block\Account\AddressesAdditional - .block-addresses-list - css selector - - - + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogin.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogin.xml index f28ed919ed6cc..31ce3d0f773f5 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogin.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogin.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Core\Test\Block\Messages - .page.messages - css selector - - - Magento\Customer\Test\Block\Form\Login - #login-form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml new file mode 100644 index 0000000000000..a3b5369d874ea --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.xml @@ -0,0 +1,33 @@ + + + + + + default + 123123q + 123123a + 123123a + + + + + default + 123123 + 123123a + 123123a + + + + default + 123123q + 123123a + 123123 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv deleted file mode 100644 index b002dd32e3b58..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -"initialCustomer/dataSet";"customer/data/current_password";"customer/data/password";"customer/data/password_confirmation";"constraint"; -"default";"123123q";"123123a";"123123a";"assertCustomerInfoSuccessSavedMessage, assertCustomerPasswordChanged"; -"default";"123123";"123123a";"123123a";"assertChangePasswordFailMessage"; -"default";"123123q";"123123a";"123123";"assertWrongPassConfirmationMessage"; diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml index 7f9445dd87d40..b4e7404ae10de 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml @@ -5,118 +5,126 @@ * See COPYING.txt for license details. */ --> - - - - Main Website - General - - - John%isolation% - - - Doe%isolation% - - - JohnDoe%isolation%@example.com - - - - - - - - - - - - - - - - - - - - - - - assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm - - - Admin - Wholesale - M - John%isolation% - Jack - Doe%isolation% - S - JohnDoe%isolation%@example.com - 03/16/2004 - - - Male - - - - - - - - - - - - - - - - - assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm - Bug: MAGETWO-31689 - - - Main Website - General - - - John%isolation% - - - Doe%isolation% - - - JohnDoe%isolation%@example.com - - - - - - - Joe - Doe - 1 Main Street - Culver City - United States - California - 90230 - 3109450345 - assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm - - - Main Website - Retailer - - - John%isolation% - - - Doe%isolation% - - - JohnDoe%isolation%@example.ccc - - - - - - - - - - - - - - - - - - - - - - - assertCustomerInvalidEmail - - - Main Website - General - - - Thomas%isolation% - - - Oster%isolation% - - - Thomas%isolation%@example.com - - - 5250008057 - - - Thomas - Oster - Chmielna 113 - Bielsko-Biala - Poland - - - 43-310 - 799885616 - assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm - - + + + + Main Website + General + - + John%isolation% + - + Doe%isolation% + - + JohnDoe%isolation%@example.com + - + - + - + - + - + - + - + - + - + - + - + + + + + + Admin + Wholesale + M + John%isolation% + Jack + Doe%isolation% + S + JohnDoe%isolation%@example.com + 03/16/2004 + - + Male + - + - + - + - + - + - + - + - + Bug: MAGETWO-31689 + + + + + + Main Website + General + - + John%isolation% + - + Doe%isolation% + - + JohnDoe%isolation%@example.com + - + - + - + Joe + Doe + 1 Main Street + Culver City + United States + California + 90230 + 3109450345 + + + + + + Main Website + Retailer + - + John%isolation% + - + Doe%isolation% + - + JohnDoe%isolation%@example.ccc + - + - + - + - + - + - + - + - + - + - + - + + + + Main Website + General + - + Thomas%isolation% + - + Oster%isolation% + - + Thomas%isolation%@example.com + - + 5250008057 + - + Thomas + Oster + Chmielna 113 + Bielsko-Biala + Poland + - + 43-310 + 799885616 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv deleted file mode 100644 index 7db78a347381a..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv +++ /dev/null @@ -1,6 +0,0 @@ -"customer/data/website_id";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/firstname";"address/data/lastname";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/postcode";"address/data/telephone";"constraint";"issue" -"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"" -"Admin";"Wholesale";"M";"John%isolation%";"Jack";"Doe%isolation%";"S";"JohnDoe%isolation%@example.com";"03/16/2004";"-";"Male";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"Bug: MAGETWO-31689" -"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"Joe";"Doe";"1 Main Street";"Culver City";"United States";"California";"90230";"3109450345";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"" -"Main Website";"Retailer";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.ccc";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerInvalidEmail";"" -"Main Website";"General";"-";"Thomas%isolation%";"-";"Oster%isolation%";"-";"Thomas%isolation%@example.com";"-";"5250008057";"-";"Thomas";"Oster";"Chmielna 113";"Bielsko-Biala";"Poland";"-";"43-310 ";"799885616";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerFrontendEntityTest/testCreateCustomer.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerFrontendEntityTest/testCreateCustomer.xml index e4f8b07f0b671..57a6360c64fcc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerFrontendEntityTest/testCreateCustomer.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerFrontendEntityTest/testCreateCustomer.xml @@ -5,25 +5,29 @@ * See COPYING.txt for license details. */ --> - - - - john - doe - johndoe%isolation%@example.com - No - 123123q - 123123q - assertCustomerSuccessRegisterMessage, assertCustomerInGrid - - - john - doe - johndoe%isolation%@example.com - Yes - 123123q - 123123q - assertCustomerSuccessRegisterMessage, assertCustomerInGrid, assertCustomerForm, assertCustomerIsSubscribedToNewsletter - - + + + + john + doe + johndoe%isolation%@example.com + No + 123123q + 123123q + + + + + john + doe + johndoe%isolation%@example.com + Yes + 123123q + 123123q + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.xml index c208e94a45b1e..2656a9e17a4cc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.xml @@ -5,22 +5,26 @@ * See COPYING.txt for license details. */ --> - - - - retail_customer - GroupName%isolation% - assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm - - - retail_customer - General - assertCustomerGroupAlreadyExists - - - customer_tax_class - GroupName%isolation% - assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm - - + + + + retail_customer + GroupName%isolation% + + + + + + retail_customer + General + + + + customer_tax_class + GroupName%isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv deleted file mode 100644 index cd5ff497620b0..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest/testCreateCustomerGroup.csv +++ /dev/null @@ -1,4 +0,0 @@ -"customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint" -"retail_customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm" -"retail_customer";"General";"assertCustomerGroupAlreadyExists" -"customer_tax_class";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml index 3ef4c41b23a2a..e2ff5e9b353a6 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml @@ -5,10 +5,10 @@ * See COPYING.txt for license details. */ --> - - - - assertCustomerFailRegisterMessage - - + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml index 60ddebdae5af1..1389c2be189d7 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml @@ -5,12 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - default - US_address_default_billing,US_NY_address_billing - assertAddressDeletedFrontend, assertAddressDeletedBackend - - + + + + default + US_address_default_billing,US_NY_address_billing + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml index 7049dc2df85ff..5f41681bf7181 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml @@ -5,11 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - default - assertCustomerSuccessDeleteMessage, assertCustomerNotInGrid - - + + + + default + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml index ffaa339fcbd83..379d83c017be4 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml @@ -5,10 +5,11 @@ * See COPYING.txt for license details. */ --> - - - - assertCustomerGroupSuccessDeleteMessage, assertCustomerGroupNotInGrid - - + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml index 2261f1ef362ad..da857d1886f71 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml @@ -5,11 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - default - assertMassActionSuccessUpdateMessage, assertCustomerGroupInGrid - - + + + + default + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml index 7e8427c5d20c1..947e027066d23 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml @@ -5,13 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - default - 3 - 2 - assertCustomerMassDeleteSuccessMessage, assertCustomerMassDeleteNotInGrid, assertCustomerMassDeleteInGrid - - + + + + default + 3 + 2 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml index 2dadb024b0b23..972c00a4e2ad8 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml @@ -5,38 +5,43 @@ * See COPYING.txt for license details. */ --> - - - - Register new customer - john - doe - johndoe%isolation%@example.com - No - 123123q - 123123q - assertCustomerSuccessRegisterMessage, assertCustomerInGrid - - - Register new customer with subscribing - john - doe - johndoe%isolation%@example.com - Yes - 123123q - 123123q - assertCustomerSuccessRegisterMessage, assertCustomerInGrid, assertCustomerForm, assertCustomerIsSubscribedToNewsletter - - - MAGETWO-12394: Register Customer - john - doe - johndoe%isolation%@example.com - No - 123123q - 123123q - assertCustomerSuccessRegisterMessage, assertCustomerRedirectToDashboard - bamboo_plan:end_to_end,test_type:acceptance_test - - + + + + Register new customer + john + doe + johndoe%isolation%@example.com + No + 123123q + 123123q + + + + + Register new customer with subscribing + john + doe + johndoe%isolation%@example.com + Yes + 123123q + 123123q + + + + + + + MAGETWO-12394: Register Customer + john + doe + johndoe%isolation%@example.com + No + 123123q + 123123q + bamboo_plan:end_to_end,test_type:acceptance_test + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml index f3c8b89de9ef7..2370b2a185a75 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml @@ -5,96 +5,102 @@ * See COPYING.txt for license details. */ --> - - - - default - Wholesale - %isolation%Prefix_ - John_%isolation% - Middle Name %isolation% - Doe%isolation% - _Suffix%isolation% - JohnDoe%isolation%@example.com - 01/08/1986 - 123456789001 - Male - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid - Bug: MAGETWO-31689 - - - default - - - - - - - - - - - - - - - - - - - - - Prefix%isolation%_ - Doe%isolation% - Middle Name %isolation% - Doe%isolation% - _Suffix%isolation% - Company%isolation% - 3962 Horner Street - Dothan - United States - Alabama - - - 36303 - 334-200-4060 - 555-666-777-8910 - U1234567890 - assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid - - - default - Retailer - %isolation%Prefix_ - Jane_%isolation% - Jane Middle Name %isolation% - Doe%isolation% - _JaneSuffix%isolation% - Jane%isolation%@example.com - 01/12/2000 - 987654321 - Female - Prefix%isolation%_ - Doe%isolation% - Middle Name %isolation% - Doe%isolation% - _Suffix%isolation% - Company%isolation% - 39 Northgate Street - BICKTON - United Kingdom - - - PINMINNOCH - KA26 1PF - 999-777-111-2345 - - - 987654321 - assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid - Bug: MAGETWO-31689 - - + + + + default + Wholesale + %isolation%Prefix_ + John_%isolation% + Middle Name %isolation% + Doe%isolation% + _Suffix%isolation% + JohnDoe%isolation%@example.com + 01/08/1986 + 123456789001 + Male + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Bug: MAGETWO-31689 + + + + + + default + - + - + - + - + - + - + - + - + - + - + Prefix%isolation%_ + Doe%isolation% + Middle Name %isolation% + Doe%isolation% + _Suffix%isolation% + Company%isolation% + 3962 Horner Street + Dothan + United States + Alabama + - + 36303 + 334-200-4060 + 555-666-777-8910 + U1234567890 + + + + + + default + Retailer + %isolation%Prefix_ + Jane_%isolation% + Jane Middle Name %isolation% + Doe%isolation% + _JaneSuffix%isolation% + Jane%isolation%@example.com + 01/12/2000 + 987654321 + Female + Prefix%isolation%_ + Doe%isolation% + Middle Name %isolation% + Doe%isolation% + _Suffix%isolation% + Company%isolation% + 39 Northgate Street + BICKTON + United Kingdom + - + PINMINNOCH + KA26 1PF + 999-777-111-2345 + - + 987654321 + Bug: MAGETWO-31689 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv deleted file mode 100644 index f1e0e24884439..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv +++ /dev/null @@ -1,4 +0,0 @@ -"initialCustomer/dataSet";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/prefix";"address/data/firstname";"address/data/middlename";"address/data/lastname";"address/data/suffix";"address/data/company";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/region";"address/data/postcode";"address/data/telephone";"address/data/fax";"address/data/vat_id";"constraint";"issue" -"default";"Wholesale";"%isolation%Prefix_";"John_%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"JohnDoe%isolation%@example.com";01/08/1986;123456789001;"Male";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"Bug: MAGETWO-31689" -"default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"3962 Horner Street";"Dothan";"United States";"Alabama";"-";36303;"334-200-4060";"555-666-777-8910";"U1234567890";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"" -"default";"Retailer";"%isolation%Prefix_";"Jane_%isolation%";"Jane Middle Name %isolation%";"Doe%isolation%";"_JaneSuffix%isolation%";"Jane%isolation%@example.com";01/12/2000;987654321;"Female";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"39 Northgate Street";"BICKTON";"United Kingdom";"-";"PINMINNOCH";"KA26 1PF ";"999-777-111-2345";"-";987654321;"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"Bug: MAGETWO-31689" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity/test.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity/test.xml index 61b0a00f762e9..67b3f6bc2a1e3 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity/test.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity/test.xml @@ -5,41 +5,43 @@ * See COPYING.txt for license details. */ --> - - - - Jany %isolation% - Doe %isolation% - janydoe%isolation%@example.com - Jany %isolation% - Doe %isolation% - Company %isolation% - Some street %isolation% - City %isolation% - United States - Colorado - - - 555-888-111-999 - 161-999-8888 - 12345 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - - - Jonny %isolation% - Doe %isolation% - jonny%isolation%@example.com - John %isolation% - Doe %isolation% - Company %isolation% - Some street %isolation% - City %isolation% - United Kingdom - - - Region %isolation% - 0123456789-02134567 - 5555-874-99634 - 12345 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - - + + + + Jany %isolation% + Doe %isolation% + janydoe%isolation%@example.com + Jany %isolation% + Doe %isolation% + Company %isolation% + Some street %isolation% + City %isolation% + United States + Colorado + - + 555-888-111-999 + 161-999-8888 + 12345 + + + + + Jonny %isolation% + Doe %isolation% + jonny%isolation%@example.com + John %isolation% + Doe %isolation% + Company %isolation% + Some street %isolation% + City %isolation% + United Kingdom + - + Region %isolation% + 0123456789-02134567 + 5555-874-99634 + 12345 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml index 3f76c169e0a48..a2816fbd44bd4 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml @@ -5,80 +5,84 @@ * See COPYING.txt for license details. */ --> - - - - Update customer information and add US address - Jany %isolation% - Doe %isolation% - janydoe%isolation%@example.com - Jany %isolation% - Doe %isolation% - Company %isolation% - Some street %isolation% - City %isolation% - United States - Colorado - - - 555-888-111-999 - 161-999-8888 - 12345 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - - - Update customer information and add UK address - Jonny %isolation% - Doe %isolation% - jonny%isolation%@example.com - John %isolation% - Doe %isolation% - Company %isolation% - Some street %isolation% - City %isolation% - United Kingdom - - - Region %isolation% - 0123456789-02134567 - 5555-874-99634 - 12345 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - - - Update customer information and add France address - Jean %isolation% - Reno %isolation% - jean%isolation%@example.com - Jean %isolation% - Reno %isolation% - Magento %isolation% - 18-20 Rue Maréchal Leclerc - Quintin - France - Côtes-d'Armor - - - 555-888-111-999 - 161-999-8888 - 12345 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - - - MAGETWO-12394: Register Customer. Update address - - - - - - - John - Doe - Magento %isolation% - 6161 West Centinela Avenue - Culver City - United States - California - - - 555-55-555-55 - - - 90230 - assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses - bamboo_plan:end_to_end,test_type:acceptance_test - - + + + + Update customer information and add US address + Jany %isolation% + Doe %isolation% + janydoe%isolation%@example.com + Jany %isolation% + Doe %isolation% + Company %isolation% + Some street %isolation% + City %isolation% + United States + Colorado + - + 555-888-111-999 + 161-999-8888 + 12345 + + + + + Update customer information and add UK address + Jonny %isolation% + Doe %isolation% + jonny%isolation%@example.com + John %isolation% + Doe %isolation% + Company %isolation% + Some street %isolation% + City %isolation% + United Kingdom + - + Region %isolation% + 0123456789-02134567 + 5555-874-99634 + 12345 + + + + + Update customer information and add France address + Jean %isolation% + Reno %isolation% + jean%isolation%@example.com + Jean %isolation% + Reno %isolation% + Magento %isolation% + 18-20 Rue Maréchal Leclerc + Quintin + France + Côtes-d'Armor + - + 555-888-111-999 + 161-999-8888 + 12345 + + + + + MAGETWO-12394: Register Customer. Update address + - + - + - + John + Doe + Magento %isolation% + 6161 West Centinela Avenue + Culver City + United States + California + - + 555-55-555-55 + - + 90230 + bamboo_plan:end_to_end,test_type:acceptance_test + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.xml index 3ce28c5de62a2..7a43ebc82d41b 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.xml @@ -5,27 +5,36 @@ * See COPYING.txt for license details. */ --> - - - - retail_customer - GroupName%isolation% - assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm - - - - - General - assertCustomerGroupAlreadyExists - - - customer_tax_class - Group Name %isolation% - assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm - - - customer_tax_class - Group#Name%isolation% - assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm - - + + + + retail_customer + GroupName%isolation% + + + + + + + - + General + + + + customer_tax_class + Group Name %isolation% + + + + + + + customer_tax_class + Group#Name%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv deleted file mode 100644 index 7df3f6eeb262d..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv +++ /dev/null @@ -1,5 +0,0 @@ -"customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint" -"retail_customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm" -"-";"General ";"assertCustomerGroupAlreadyExists" -"customer_tax_class";"Group Name %isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm" -"customer_tax_class";"Group#Name%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml index 8359c1d24c0c0..0081f89c60ffe 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml @@ -1,136 +1,68 @@ - + - - - low - - - - - - low - - - - - - low - - - - - - middle - - - - - - - middle - - - - - - - middle - - - - - - - - middle - - - - - - - - low - - - low - - - low - - - low - - - low - - - high - - - - - - high - - - - - - low - - - low - - - - - - low - - - - - - low - - -
- - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + Magento\Customer\Test\Page\Adminhtml\CustomerIndex + + + Magento\Customer\Test\Page\Adminhtml\CustomerIndex + + + Magento\Customer\Test\Page\CustomerAccountCreate + + + Magento\Customer\Test\Fixture\CustomerInjectable + Magento\Customer\Test\Page\Adminhtml\CustomerIndex + + + Magento\Customer\Test\Fixture\CustomerInjectable + Magento\Customer\Test\Page\Adminhtml\CustomerIndex + + + Magento\Customer\Test\Fixture\CustomerInjectable + Magento\Customer\Test\Page\Adminhtml\CustomerIndex + Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit + + + Magento\Customer\Test\Fixture\CustomerInjectable + Magento\Customer\Test\Fixture\AddressInjectable + Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew + + + + + + + + Magento\Customer\Test\Page\CustomerAccountCreate + + + Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex + + + + Magento\Customer\Test\Page\CustomerAccountIndex + + + Magento\Customer\Test\Page\CustomerAccountIndex + + + Magento\Customer\Test\Page\CustomerAccountIndex + Magento\Customer\Test\Fixture\AddressInjectable + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/page.xml deleted file mode 100644 index c3eb571c5f836..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/page.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - customer/account/create - Magento\Customer\Test\Page\CustomerAccountCreate - - - customer/account/index - Magento\Customer\Test\Page\CustomerAccountIndex - - - customer/account/login - Magento\Customer\Test\Page\CustomerAccountLogin - - - customer/account/edit - Magento\Customer\Test\Page\CustomerAccountEdit - - - customer/index - adminhtml - Magento\Customer\Test\Page\Adminhtml\CustomerIndex - - - customer/index/new - adminhtml - Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew - - - customer/index/edit - adminhtml - Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit - - - customer/group/index - adminhtml - Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex - - - customer/group/new - adminhtml - Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew - - diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/CustomerIndexEdit.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/CustomerIndexEdit.xml index 40c7c44868fdb..c82a5dd9bcfba 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/CustomerIndexEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/CustomerIndexEdit.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\Downloadable\Test\Block\Adminhtml\Product\Composite\Configure - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/OrderCreateIndex.xml index 069942af2c241..215c7188d29b1 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\Downloadable\Test\Block\Adminhtml\Product\Composite\Configure - - - - - \ No newline at end of file + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/DownloadableCustomerProducts.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/DownloadableCustomerProducts.xml index 9629aebb2942f..43e7669061c2e 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/DownloadableCustomerProducts.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/DownloadableCustomerProducts.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Downloadable\Test\Block\Customer\Products\ListProducts - .column.main - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml index 7e8713585a703..ec478a8bde47b 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Page/Product/CatalogProductView.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\Downloadable\Test\Block\Catalog\Product\View - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml index 690d8093ea07e..37252f5665895 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml @@ -5,357 +5,421 @@ * See COPYING.txt for license details. */ --> - - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 100 - taxable_goods - 1 - In Stock - Yes - Default Category - - - - - - - - - - - - - - - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 1 - taxable_goods - 10 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - default - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 33 - taxable_goods - 10 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - - - default - default - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 55 - taxable_goods - 10 - In Stock - Yes - - - - - - - - - - - - - - - with_three_samples - with_three_links - two_options - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 100 - taxable_goods - 50 - Out of Stock - Yes - Default Category - - - - - - - - - - - - - - - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 9999 - taxable_goods - - - - - Yes - Default Category - - - - - Yes - 123 - No - 123 - - - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 98 - None - 5 - In Stock - Yes - Default Category - This is description for downloadable product - - - - - - - - - - - - - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 57 - taxable_goods - 10 - In Stock - Yes - category %isolation% - - - This is short description for downloadable product - - - - - - - - - default - with_three_links - default - catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 65 - taxable_goods - 11 - In Stock - Yes - category %isolation% - This is description for downloadable product - This is short description for downloadable product - - - - - - - - - default - with_three_links - default - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 65 - taxable_goods - 11 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - default - with_three_links - default - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 100 - taxable_goods - - - - - Yes - Default Category - - - - - - - - - - - - - - - default - - - - - - - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 10 - taxable_goods - 10 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - - - default - - - - - 5 - - - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 365 - taxable_goods - 23 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - - - default - - - - - - - default - - - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 250 - taxable_goods - 65 - In Stock - Yes - category %isolation% - - - - - - - - - - - - - - - default - - - - - - - - - default - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage - - + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 100 + taxable_goods + 1 + In Stock + Yes + Default Category + - + - + - + - + - + - + - + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 1 + taxable_goods + 10 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + default + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 33 + taxable_goods + 10 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + - + default + default + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 55 + taxable_goods + 10 + In Stock + Yes + - + - + - + - + - + - + - + with_three_samples + with_three_links + two_options + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 100 + taxable_goods + 50 + Out of Stock + Yes + Default Category + - + - + - + - + - + - + - + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 9999 + taxable_goods + - + - + Yes + Default Category + - + - + Yes + 123 + No + 123 + - + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 98 + None + 5 + In Stock + Yes + Default Category + This is description for downloadable product + - + - + - + - + - + - + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 57 + taxable_goods + 10 + In Stock + Yes + category %isolation% + - + This is short description for downloadable product + - + - + - + - + default + with_three_links + default + catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option + - + - + - + downloadableproduct-%isolation% + + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 65 + taxable_goods + 11 + In Stock + Yes + category %isolation% + This is description for downloadable product + This is short description for downloadable product + - + - + - + - + default + with_three_links + default + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 65 + taxable_goods + 11 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + default + with_three_links + default + - + - + - + - + downloadableproduct-%isolation% + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 100 + taxable_goods + - + - + Yes + Default Category + - + - + - + - + - + - + - + default + - + - + - + - + - + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 10 + taxable_goods + 10 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + - + default + - + - + 5 + - + - + downloadableproduct-%isolation% + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 365 + taxable_goods + 23 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + - + default + - + - + - + default + - + downloadableproduct-%isolation% + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 250 + taxable_goods + 65 + In Stock + Yes + category %isolation% + - + - + - + - + - + - + - + default + - + - + - + - + default + downloadableproduct-%isolation% + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv deleted file mode 100644 index 35f2819c56f33..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv +++ /dev/null @@ -1,15 +0,0 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/special_price";"product/data/group_price/preset";"product/data/tier_price/preset";"product/data/url_key";"constraint" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"taxable_goods";"1";"In Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"1";"taxable_goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"33";"taxable_goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"taxable_goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"taxable_goods";"50";"Out of Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"taxable_goods";"-";"-";"Yes";"Default Category";"-";"-";"Yes";"123";"No";"123";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"98";"None";"5";"In Stock";"Yes";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"taxable_goods";"10";"In Stock";"Yes";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"taxable_goods";"11";"In Stock";"Yes";"category %isolation%";"This is description for downloadable product";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"taxable_goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"taxable_goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"taxable_goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"taxable_goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"taxable_goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage" diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml index b8d4879c8902b..2d24863514a0a 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml @@ -5,151 +5,177 @@ * See COPYING.txt for license details. */ --> - - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 55 - taxable_goods - 10 - In Stock - Yes - - - - - - - - - - - - - - - - - with_three_samples - with_three_links - two_options - - - No - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 100 - taxable_goods - 50 - Out of Stock - Yes - - - Default Category - - - - - - - - - - - - - - - default - - - - - No - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 9999 - taxable_goods - 123 - - - Yes - - - Default Category - - - - - Yes - - - No - 123 - - - - - - - - - No - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 48 - None - 5 - In Stock - Yes - - - Default Category - This is description for downloadable product - - - - - - - - - - - - - default - - - - - No - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 54 - taxable_goods - 10 - In Stock - Yes - - - category %isolation% - - - This is short description for downloadable product - - - - - - - - - default - with_three_links - default - - - Yes - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData, assertProductInCategory - - - DownloadableProduct_%isolation% - DownloadableProduct_%isolation% - 43 - taxable_goods - 10 - In Stock - Yes - 10 - - - - - - - - - - - - - - - - - - - - - 40 - No - downloadableproduct-%isolation% - assertProductSaveMessage, assertProductInGrid, assertProductSpecialPriceOnProductPage, assertProductPage - - + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 55 + taxable_goods + 10 + In Stock + Yes + - + - + - + - + - + - + - + - + with_three_samples + with_three_links + two_options + - + No + downloadableproduct-%isolation% + + + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 100 + taxable_goods + 50 + Out of Stock + Yes + - + Default Category + - + - + - + - + - + - + - + default + - + - + No + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 9999 + taxable_goods + 123 + - + Yes + - + Default Category + - + - + Yes + - + No + 123 + - + - + - + - + No + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 48 + None + 5 + In Stock + Yes + - + Default Category + This is description for downloadable product + - + - + - + - + - + - + default + - + - + No + downloadableproduct-%isolation% + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 54 + taxable_goods + 10 + In Stock + Yes + - + category %isolation% + - + This is short description for downloadable product + - + - + - + - + default + with_three_links + default + - + Yes + downloadableproduct-%isolation% + + + + + + + + + + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + 43 + taxable_goods + 10 + In Stock + Yes + 10 + - + - + - + - + - + - + - + - + - + - + 40 + No + downloadableproduct-%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv deleted file mode 100644 index 492debf2dbefc..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv +++ /dev/null @@ -1,7 +0,0 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/weight";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/special_price";"isRequired";"product/data/url_key";"constraint" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"taxable_goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"taxable_goods";"50";"Out of Stock";"Yes";"-";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"taxable_goods";"123";"-";"Yes";"-";"Default Category";"-";"-";"Yes";"-";"No";"123";"-";"-";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"48";"None";"5";"In Stock";"Yes";"-";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"54";"taxable_goods";"10";"In Stock";"Yes";"-";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"Yes";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData, assertProductInCategory" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"43";"taxable_goods";"10";"In Stock";"Yes";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"40";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductSpecialPriceOnProductPage, assertProductPage" diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml index 6ada223124d4b..05ba0c1736515 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml @@ -1,56 +1,27 @@ - + - - - low - - - low - - - low - - - high - - - - - - - - low - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - + --> + + + + + + Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex + Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit + Magento\Mtf\Fixture\FixtureInterface + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/page.xml deleted file mode 100644 index 969162e9b25b7..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/page.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - downloadable/customer/products - Magento\Downloadable\Test\Page\DownloadableCustomerProducts - - diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php index fe543f8c3bdeb..af6c6b3a319be 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php @@ -8,7 +8,7 @@ use Magento\GiftMessage\Test\Fixture\GiftMessage; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractAssertForm; /** @@ -37,7 +37,7 @@ class AssertGiftMessageInBackendOrder extends AbstractAssertForm * Assert that message from dataSet is displayed on order(s) view page on backend. * * @param GiftMessage $giftMessage - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param array $products * @param string $orderId @@ -45,7 +45,7 @@ class AssertGiftMessageInBackendOrder extends AbstractAssertForm */ public function processAssert( GiftMessage $giftMessage, - OrderView $orderView, + SalesOrderView $orderView, OrderIndex $orderIndex, array $products, $orderId diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderCreateIndex.xml index 90e458bed1101..8cafc2974b624 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\GiftOptions - #order-giftmessage - css selector - - - Magento\GiftMessage\Test\Block\Adminhtml\Order\Create - #order-items - css selector - - - \ No newline at end of file + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderView.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderView.xml index 2662f1e5e0f87..4270f0d4106dc 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderView.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/Adminhtml/OrderView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\GiftMessage\Test\Block\Adminhtml\Order\View\GiftOptions - .order-gift-options - css selector - - - Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items - #sales_order_view_tabs_order_info_content .grid - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml index c164697f352e9..0a83605791e22 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml @@ -1,16 +1,12 @@ - + - - - - Magento\GiftMessage\Test\Block\Message\Inline - .gift-message - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml index 8dbbe0cd290a4..fbe40d388971c 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\GiftMessage\Test\Block\Message\Order\View - .block-order-details-gift-message - css selector - - - Magento\GiftMessage\Test\Block\Message\Order\Items\View - #my-orders-table - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml new file mode 100644 index 0000000000000..fa9fdb29c5d42 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml @@ -0,0 +1,45 @@ + + + + + + catalogProductSimple::default, catalogProductVirtual::default + customer_US + customer_US + login + Flat Rate + Fixed + Yes + Yes + - + John Doe + Jane Doe + text_gift_message + cashondelivery + + + + + catalogProductSimple::default, catalogProductVirtual::default + customer_US + customer_US + login + Flat Rate + Fixed + Yes + - + Yes + John Doe + Jane Doe + text_gift_message + cashondelivery + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv deleted file mode 100644 index a11cab46509db..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv +++ /dev/null @@ -1,3 +0,0 @@ -"products";"customer/dataSet";"billingAddress/dataSet";"checkoutMethod";"shipping/shipping_service";"shipping/shipping_method";"giftMessage/data/allow_gift_options";"giftMessage/data/allow_gift_messages_for_order";"giftMessage/data/allow_gift_options_for_items";"giftMessage/data/sender";"giftMessage/data/recipient";"giftMessage/data/message";"payment/method";"constraint" -"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"login";"Flat Rate";"Fixed";"Yes";"Yes";"-";"John Doe";"Jane Doe";"text_gift_message";"cashondelivery";"assertOrderSuccessPlacedMessage, assertGiftMessageInFrontendOrder" -"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"login";"Flat Rate";"Fixed";"Yes";"-";"Yes";"John Doe";"Jane Doe";"text_gift_message";"cashondelivery";"assertOrderSuccessPlacedMessage, assertGiftMessageInFrontendOrderItems" diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.xml new file mode 100644 index 0000000000000..5674e018daa44 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.xml @@ -0,0 +1,66 @@ + + + + + + catalogProductSimple::default, catalogProductVirtual::default + customer_US + customer_US + Flat Rate + Fixed + Yes + - + Yes + John Doe + Jane Doe + text_gift_message + default, default + cashondelivery + + + + + + catalogProductSimple::default, catalogProductVirtual::default + customer_US + customer_US + Flat Rate + Fixed + Yes + Yes + - + John Doe + Jane Doe + text_gift_message + - + cashondelivery + + + + + + catalogProductSimple::default, catalogProductVirtual::default + customer_US + customer_US + Flat Rate + Fixed + Yes + Yes + Yes + John Doe + Jane Doe + text_gift_message + default, default + cashondelivery + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest/test.csv deleted file mode 100644 index eceb66e4d4caf..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -"products";"customer/dataSet";"billingAddress/dataSet";"shipping/shipping_service";"shipping/shipping_method";"giftMessage/data/allow_gift_options";"giftMessage/data/allow_gift_messages_for_order";"giftMessage/data/allow_gift_options_for_items";"giftMessage/data/sender";"giftMessage/data/recipient";"giftMessage/data/message";"giftMessage/data/items/dataSets";"payment/method";"constraint" -"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"Flat Rate";"Fixed";"Yes";"-";"Yes";"John Doe";"Jane Doe";"text_gift_message";"default, default";"cashondelivery";"assertOrderSuccessCreateMessage, assertGiftMessageInBackendOrder, assertGiftMessageInFrontendOrderItems" -"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"Flat Rate";"Fixed";"Yes";"Yes";"-";"John Doe";"Jane Doe";"text_gift_message";"-";"cashondelivery";"assertOrderSuccessCreateMessage, assertGiftMessageInBackendOrder, assertGiftMessageInFrontendOrder" -"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"Flat Rate";"Fixed";"Yes";"Yes";"Yes";"John Doe";"Jane Doe";"text_gift_message";"default, default";"cashondelivery";"assertOrderSuccessCreateMessage, assertGiftMessageInBackendOrder, assertGiftMessageInFrontendOrder, assertGiftMessageInFrontendOrderItems" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml index b66455a4fd8ac..5e815fca98b20 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml @@ -1,18 +1,12 @@ - + - - - high - - - high - - - high - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesIndex.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesIndex.xml index 0a447b7f4e5fa..01fec081bd1d2 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesIndex.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Grid - #types_grid - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesNew.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesNew.xml index bbbdc4b87d388..55a401620dc6e 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesNew.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Page/Adminhtml/GoogleShoppingTypesNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\GoogleShopping\Test\Block\Adminhtml\Types\FormPageActions - .page-main-actions - css selector - - - Magento\GoogleShopping\Test\Block\Adminhtml\Types\Edit\GoogleShoppingForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml index 8736634d4f102..b3272bfd9a3b0 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml @@ -1,12 +1,10 @@ - + - - - low - - + --> + + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/page.xml deleted file mode 100644 index f7b608fb4453f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - admin/googleshopping_types/index - adminhtml - Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesIndex - - - admin/googleshopping_types/new - adminhtml - Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesNew - - diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml index 0558471561869..854ebcc4b1dd1 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/CustomerIndexEdit.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\GroupedProduct\Test\Block\Adminhtml\Product\Composite\Configure - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/OrderCreateIndex.xml index 93e74872a3325..087ba925d7675 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\GroupedProduct\Test\Block\Adminhtml\Product\Composite\Configure - - - - - \ No newline at end of file + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/CheckoutCart.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/CheckoutCart.xml index 371d07171921d..97f20f6bf4af6 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/CheckoutCart.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/CheckoutCart.xml @@ -1,18 +1,14 @@ - + - - - - - - Magento\GroupedProduct\Test\Block\Checkout\Cart - - - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Product/CatalogProductView.xml index c3707c53683ae..800801a0a3eb8 100755 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Page/Product/CatalogProductView.xml @@ -1,23 +1,15 @@ - + - - - - - - Magento\GroupedProduct\Test\Block\Catalog\Product\View - - - - - Magento\GroupedProduct\Test\Block\Catalog\Product\View - #maincontent - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml index 5bced4b227470..e7212a33a7a34 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml @@ -5,111 +5,123 @@ * See COPYING.txt for license details. */ --> - - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - This is description for grouped product - catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products - defaultSimpleProduct - This is short description for grouped product - Yes - assertProductSaveMessage, assertGroupedProductsDefaultQty - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - - - In Stock - - - - - catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products - defaultSimpleProduct - - - No - assertProductInStock, assertProductSkuAutoGenerated, assertProductSearchableBySku - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - Out of Stock - category_%isolation% - - - catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products - defaultSimpleProduct - - - No - assertProductOutOfStock - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - - - catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products - defaultSimpleProduct - - - No - assertGroupedProductsDefaultQty, assertGroupedProductForm, assertProductPage - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - - - catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice - defaultSimpleProduct - - - No - assertSpecialPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - - - catalogProductSimple::simple_with_group_price,catalogProductSimple::simple_with_group_price - defaultSimpleProduct - - - No - assertGroupedPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - - - catalogProductVirtual::virtual_product,catalogProductVirtual::virtual_product - defaultVirtualProduct - - - Yes - assertProductSaveMessage, assertGroupedProductsDefaultQty - - - test-grouped-product-%isolation% - GroupedProduct %isolation% - GroupedProduct_sku%isolation% - In Stock - category_%isolation% - - - catalogProductSimple::simple_with_tier_price,catalogProductSimple::simple_with_tier_price - defaultSimpleProduct - - - No - assertTierPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage - - + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + This is description for grouped product + catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products + defaultSimpleProduct + This is short description for grouped product + Yes + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + - + In Stock + - + - + catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products + defaultSimpleProduct + - + No + + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + Out of Stock + category_%isolation% + - + catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products + defaultSimpleProduct + - + No + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + - + catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products + defaultSimpleProduct + - + No + + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + - + catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice + defaultSimpleProduct + - + No + + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + - + catalogProductSimple::simple_with_group_price,catalogProductSimple::simple_with_group_price + defaultSimpleProduct + - + No + + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + - + catalogProductVirtual::virtual_product,catalogProductVirtual::virtual_product + defaultVirtualProduct + - + Yes + + + + + test-grouped-product-%isolation% + GroupedProduct %isolation% + GroupedProduct_sku%isolation% + In Stock + category_%isolation% + - + catalogProductSimple::simple_with_tier_price,catalogProductSimple::simple_with_tier_price + defaultSimpleProduct + - + No + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest/test.csv deleted file mode 100644 index 126e091ed4e80..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest/test.csv +++ /dev/null @@ -1,9 +0,0 @@ -"product/data/url_key";"product/data/name";"product/data/sku";"product/data/quantity_and_stock_status/is_in_stock";"product/data/category";"product/data/description";"product/data/associated/products";"product/data/associated/preset";"product/data/short_description";"isRequired";"constraint" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"This is description for grouped product";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"This is short description for grouped product";"Yes";"assertProductSaveMessage, assertGroupedProductsDefaultQty" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"-";"In Stock";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertProductInStock, assertProductSkuAutoGenerated, assertProductSearchableBySku" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"Out of Stock";"category_%isolation%";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertProductOutOfStock" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertGroupedProductsDefaultQty, assertGroupedProductForm, assertProductPage" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct";"-";"No";"assertSpecialPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_with_group_price,catalogProductSimple::simple_with_group_price";"defaultSimpleProduct";"-";"No";"assertGroupedPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductVirtual::virtual_product,catalogProductVirtual::virtual_product";"defaultVirtualProduct";"-";"Yes";"assertProductSaveMessage, assertGroupedProductsDefaultQty" -"test-grouped-product-%isolation%";"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_with_tier_price,catalogProductSimple::simple_with_tier_price";"defaultSimpleProduct";"-";"No";"assertTierPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml index c6ab484035326..350c47188a017 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml @@ -5,71 +5,79 @@ * See COPYING.txt for license details. */ --> - - - - grouped_product_out_of_stock - GroupedProduct_edited %isolation% - GroupedProduct_sku_edited %isolation% - In Stock - category_%isolation% - - - - - This is edited description for grouped product - This is edited short description for grouped product - updated-grouped-product-%isolation% - assertProductSaveMessage, assertProductInStock, assertProductPage - - - default - GroupedProduct_edited %isolation% - GroupedProduct_sku_edited %isolation% - - - - - catalogProductVirtual::default,catalogProductVirtual::product_50_dollar - defaultVirtualProduct - - - - - updated-grouped-product-%isolation% - assertProductSaveMessage, assertGroupedProductForm - - - default - GroupedProduct_edited %isolation% - GroupedProduct_sku_edited %isolation% - - - - - catalogProductSimple::simple_for_composite_products,catalogProductSimple::default - defaultSimpleProduct_without_qty - - - - - updated-grouped-product-%isolation% - assertProductSaveMessage, assertGroupedProductsDefaultQty, assertGroupedProductForm - - - default - GroupedProduct_edited %isolation% - GroupedProduct_sku_edited %isolation% - - - - - catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice - defaultSimpleProduct_with_specialPrice - - - - - updated-grouped-product-%isolation% - assertProductSaveMessage, assertSpecialPriceOnGroupedProductPage - - - default - GroupedProduct_edited %isolation% - GroupedProduct_sku_edited %isolation% - Out of Stock - - - - - - - - - - - assertProductSaveMessage, assertProductOutOfStock - - + + + + grouped_product_out_of_stock + GroupedProduct_edited %isolation% + GroupedProduct_sku_edited %isolation% + In Stock + category_%isolation% + - + - + This is edited description for grouped product + This is edited short description for grouped product + updated-grouped-product-%isolation% + + + + + + default + GroupedProduct_edited %isolation% + GroupedProduct_sku_edited %isolation% + - + - + catalogProductVirtual::default,catalogProductVirtual::product_50_dollar + defaultVirtualProduct + - + - + updated-grouped-product-%isolation% + + + + + default + GroupedProduct_edited %isolation% + GroupedProduct_sku_edited %isolation% + - + - + catalogProductSimple::simple_for_composite_products,catalogProductSimple::default + defaultSimpleProduct_without_qty + - + - + updated-grouped-product-%isolation% + + + + + + default + GroupedProduct_edited %isolation% + GroupedProduct_sku_edited %isolation% + - + - + catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice + defaultSimpleProduct_with_specialPrice + - + - + updated-grouped-product-%isolation% + + + + + default + GroupedProduct_edited %isolation% + GroupedProduct_sku_edited %isolation% + Out of Stock + - + - + - + - + - + updated-grouped-product-%isolation% + + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv deleted file mode 100644 index 1b28e2cfc5e19..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv +++ /dev/null @@ -1,6 +0,0 @@ -"originalProduct/dataSet";"product/data/name";"product/data/sku";"product/data/quantity_and_stock_status/is_in_stock";"product/data/category_ids/presets";"product/data/associated/products";"product/data/associated/preset";"product/data/description";"product/data/short_description";"product/data/url_key";"constraint" -"grouped_product_out_of_stock";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"In Stock";"category_%isolation%";"-";"-";"This is edited description for grouped product";"This is edited short description for grouped product";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertProductInStock, assertProductPage" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductVirtual::default,catalogProductVirtual::product_50_dollar";"defaultVirtualProduct";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertGroupedProductForm" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::default";"defaultSimpleProduct_without_qty";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertGroupedProductsDefaultQty, assertGroupedProductForm" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct_with_specialPrice";"-";"-";"updated-grouped-product-%isolation%";"assertProductSaveMessage, assertSpecialPriceOnGroupedProductPage" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"Out of Stock";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock" diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml index 3c92cd44791a6..6dbd36a30aaf0 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml @@ -1,30 +1,16 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml index 099638cf78bab..785d6dee5cd90 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\ImportExport\Test\Block\Adminhtml\Export\Filter - #export_filter_container - css selector - - - Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form - #base_fieldset - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml index 9616b73c7a42d..f5b8841f9ff7c 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml @@ -1,12 +1,10 @@ - + - - - high - - + --> + + + diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/page.xml deleted file mode 100644 index b17b970e66ecf..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/page.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - admin/export/index - adminhtml - Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex - - diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml index b35c32ed5a5b9..864b588b81222 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml @@ -1,51 +1,19 @@ - + - - - - Magento\Install\Test\Block\Landing - body - css selector - - - Magento\Install\Test\Block\License - body - css selector - - - Magento\Install\Test\Block\Readiness - body - css selector - - - Magento\Install\Test\Block\Database - body - css selector - - - Magento\Install\Test\Block\WebConfiguration - body - css selector - - - Magento\Install\Test\Block\CustomizeStore - body - css selector - - - Magento\Install\Test\Block\CreateAdmin - body - css selector - - - Magento\Install\Test\Block\Install - body - css selector - - - \ No newline at end of file + --> + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml index d8939ed3b3afc..680bf1a5f50a1 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml @@ -5,103 +5,114 @@ * See COPYING.txt for license details. */ --> - - - - default - - - - - - - - - - - - - - - - - - - - - - - assertSuccessInstall, assertUserSuccessLogin - install with default values - - - default - - - custom - - - - - - - - - - - - - - - - - - - assertSuccessInstall, assertUserSuccessLogin - install with custom admin path - - - default - - - - - - - - - - - Yes - 123123qa - German (Germany) - Euro (EUR) - € - Suchbegriffe - assertSuccessInstall, assertKeyCreated, assertUserSuccessLogin, assertCurrencySelected, assertLanguageSelected - install with custom encryption key and changed currency and locale - - - default - prefix1_ - - - - - - - - - - - - - Chinese (China) - - - - - - - assertSuccessInstall, assertUserSuccessLogin - install with table prefix - - - default - - - - - - - - - Yes - - - - - - - - - - - - - assertSuccessInstall, assertUserSuccessLogin, assertRewritesEnabled - install with enabled url rewrites - - - default - - - - - Yes - Yes - - - - - - - - - - - - - - - assertSuccessInstall, assertUserSuccessLogin, assertSecureUrlEnabled - install with enabled secure urls - - + + + + default + - + - + - + - + - + - + - + - + - + - + - + install with default values + + + + + default + - + custom + - + - + - + - + - + - + - + - + - + install with custom admin path + + + + + default + - + - + - + - + - + Yes + 123123qa + German (Germany) + Euro (EUR) + € + Suchbegriffe + install with custom encryption key and changed currency and locale + + + + + + + + default + prefix1_ + - + - + - + - + - + - + Chinese (China) + - + - + - + install with table prefix + + + + + default + - + - + - + - + Yes + - + - + - + - + - + - + install with enabled url rewrites + + + + + + default + - + - + Yes + Yes + - + - + - + - + - + - + - + install with enabled secure urls + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml index 744bd6de6ca24..d50ea13c01f0e 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml @@ -1,36 +1,18 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml deleted file mode 100644 index 1b86d3647d06f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - setup/ - Magento\Install\Test\Page\Install - - diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationIndex.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationIndex.xml index d42a8d3546242..54790228e89eb 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid - #integrationGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationNew.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationNew.xml index ed808dcfa0cc0..0667c8b59cf0f 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationNew.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Page/Adminhtml/IntegrationNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Integration\Test\Block\Adminhtml\Integration\Edit\IntegrationFormPageActions - .page-main-actions - css selector - - - Magento\Integration\Test\Block\Adminhtml\Integration\Edit\IntegrationForm - [id="page:main-container"] - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml index 73c5237bb65ab..aa5b70303c882 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - default_with_all_resources - assertIntegrationResourcesPopup, assertIntegrationTokensPopup, assertIntegrationSuccessActivationMessage - - + + + + default_with_all_resources + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.xml index 60e1d0b214ab1..cb6f002f83244 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.xml @@ -5,34 +5,40 @@ * See COPYING.txt for license details. */ --> - - - - Integration%isolation% - test@example.com - https://endpoint.com - https://testlink.com - All - - - assertIntegrationSuccessSaveMessage, assertIntegrationForm, assertIntegrationInGrid - - - Integration%isolation% - - - - - - - Custom - Sales - assertIntegrationSuccessSaveMessage, assertIntegrationForm, assertIntegrationInGrid - - - Integration%isolation% - - - - - - - All - - - assertIntegrationSuccessSaveMessage, assertIntegrationForm, assertIntegrationInGrid - - + + + + Integration%isolation% + test@example.com + https://endpoint.com + https://testlink.com + All + - + + + + + + Integration%isolation% + - + - + - + Custom + Sales + + + + + + Integration%isolation% + - + - + - + All + - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml index 50cc98cac0d7e..c1ea3fe41613d 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml @@ -5,10 +5,11 @@ * See COPYING.txt for license details. */ --> - - - - assertIntegrationSuccessDeleteMessage, assertIntegrationNotInGrid - - + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.xml index 2223b0576b762..32e513a405ba4 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - Re-authorize integration - assertIntegrationSuccessReauthorizeMessage, assertIntegrationForm, assertIntegrationTokensAfterReauthorize - - + + + + Re-authorize integration + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml index 837478d455c0d..7eb56aeecafc5 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml @@ -5,25 +5,29 @@ * See COPYING.txt for license details. */ --> - - - - Integration_%isolation% - - - https://endpoint.com - https://testlink.com - - - - - assertIntegrationSuccessSaveMessage, assertIntegrationForm, assertIntegrationInGrid - - - Integration_%isolation% - - - - - - - Custom - Sales - assertIntegrationSuccessSaveMessage, assertIntegrationForm, assertIntegrationInGrid - - + + + + Integration_%isolation% + - + https://endpoint.com + https://testlink.com + - + - + + + + + + Integration_%isolation% + - + - + - + Custom + Sales + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml index 934061888b568..d17edf7d3861a 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml @@ -1,80 +1,50 @@ - + - - - high - - - - - - - high - - - - - - - high - - - - - - - - low - - - - - - - high - - - - - - - high - - - - - - - high - - - - - - high - - - - - - - high - - - - - - - high - - - - - - - + --> + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Page\Adminhtml\IntegrationNew + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Fixture\Integration + + + Magento\Integration\Test\Page\Adminhtml\IntegrationIndex + Magento\Integration\Test\Page\Adminhtml\IntegrationNew + Magento\Integration\Test\Fixture\Integration + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/etc/page.xml deleted file mode 100644 index ae998c0f06b54..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - admin/integration/index - adminhtml - Magento\Integration\Test\Page\Adminhtml\IntegrationIndex - - - admin/integration/new - adminhtml - Magento\Integration\Test\Page\Adminhtml\IntegrationNew - - diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml index 82f6b8bace1ac..726065fe299d0 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Link - .action.multicheckout - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml index 8ca2bd9f3e462..30913aa57092b 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Addresses - #checkout_multishipping_form - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml index 03ab6314da4bb..cd4f4b521cbc7 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Billing - #multishipping-billing-form - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml index d4ad887f72f9b..c0f2ac317562a 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Overview - #review-order-form - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml index c950eac943f78..3583eed992b05 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Shipping - #shipping_method_form - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml index 0c4b39849c385..1d15c7fc371be 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml @@ -5,17 +5,9 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Multishipping\Test\Block\Checkout\Success - .multicheckout.success - css selector - - - Magento\Theme\Test\Block\Html\Title - .title - css selector - - - + + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml index 8b6fe6fadc257..5cd0ae6db0968 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml @@ -1,12 +1,10 @@ - + - - - high - - + --> + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/SubscriberIndex.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/SubscriberIndex.xml index dd0702e3e6a48..2024ac30ee8df 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/SubscriberIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/SubscriberIndex.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Newsletter\Test\Block\Adminhtml\Subscriber\Grid - #subscriberGrid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml index 937e3a76dc482..4ad53b7b2756c 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Newsletter\Test\Block\Adminhtml\Template\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Form - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateIndex.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateIndex.xml index 37863c5e8ad0a..6364464ecaa4d 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Newsletter\Test\Block\Adminhtml\Template\GridPageActions - .page-main-actions - css selector - - - Magento\Newsletter\Test\Block\Adminhtml\Template\Grid - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateNewIndex.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateNewIndex.xml index 956b0d0a17c45..00199dbc6d2de 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateNewIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateNewIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Newsletter\Test\Block\Adminhtml\Template\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Form - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplatePreview.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplatePreview.xml index 74b0b04d15c0b..71209881848d4 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplatePreview.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplatePreview.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Newsletter\Test\Block\Adminhtml\Template\Preview - body - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateQueue.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateQueue.xml index b0d6c20fbfad4..64d9bfbd67b66 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateQueue.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateQueue.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Newsletter\Test\Block\Adminhtml\Template\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Form - #queue_edit_form - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml index f7c8e1ba6a24b..7c3b91baeac7a 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml @@ -5,17 +5,17 @@ * See COPYING.txt for license details. */ --> - - - - default - Preview - assertNewsletterPreview - - - default - Queue Newsletter - assertNewsletterQueue - - + + + + default + Preview + + + + default + Queue Newsletter + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.xml index 156bcc00d2754..2b8c4b7d7ae7f 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.xml @@ -5,15 +5,16 @@ * See COPYING.txt for license details. */ --> - - - - TemplateName%isolation% - TemplateSubject%isolation% - SenderName%isolation% - SenderName%isolation%@example.com - Some content %isolation% - assertNewsletterSuccessCreateMessage, assertNewsletterInGrid - - + + + + TemplateName%isolation% + TemplateSubject%isolation% + SenderName%isolation% + SenderName%isolation%@example.com + Some content %isolation% + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml index 4d87f9f0e238b..1c0fcdcaf4354 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml @@ -5,15 +5,17 @@ * See COPYING.txt for license details. */ --> - - - - TemplateName%isolation% - TemplateSubject%isolation% - SenderName%isolation% - SenderName%isolation%@example.com - Some content %isolation% - assertNewsletterSuccessCreateMessage, assertNewsletterInGrid, assertNewsletterForm - - + + + + TemplateName%isolation% + TemplateSubject%isolation% + SenderName%isolation% + SenderName%isolation%@example.com + Some content %isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml index e50d979952e3f..795da9a9b9ba4 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml @@ -1,27 +1,15 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml deleted file mode 100644 index 87e17ee062a16..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - newsletter/template/index - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\templateIndex - - - newsletter/template/new/index - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\templateNewIndex - - - newsletter/template/edit - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit - - - newsletter/subscriber/index - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\SubscriberIndex - - - newsletter/queue/edit - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\TemplateQueue - - - newsletter/template/preview - adminhtml - Magento\Newsletter\Test\Page\Adminhtml\TemplatePreview - - diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/AbandonedCarts.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/AbandonedCarts.xml index 67d983b1ec919..3dab4144c353a 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/AbandonedCarts.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/AbandonedCarts.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Shopcart\Abandoned\Grid - #gridAbandoned - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml index 122e3d51f88f8..3f689845548fa 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Reports\Test\Block\Adminhtml\Viewed\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Product\Viewed\Filter - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Product\Viewed\ProductGrid - .grid - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerAccounts.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerAccounts.xml index 713254ce46d6d..b65fad7228f3e 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerAccounts.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerAccounts.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Customer\AccountsGrid - #gridAccounts - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerOrdersReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerOrdersReport.xml index 84a1cda32a1f7..18f2af59d40df 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerOrdersReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerOrdersReport.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Customer\Counts\Filter - #gridOrdersCustomer_period_date_range - css selector - - - Magento\Reports\Test\Block\Adminhtml\Customer\Counts\Grid - #gridOrdersCustomer_table - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerReportReview.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerReportReview.xml index ce6df3c2d238b..34ff5e62e4f5e 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerReportReview.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerReportReview.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Review\Customer\Grid - #customers_grid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerTotalsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerTotalsReport.xml index 038f69aa0742e..4d296d4a9c964 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerTotalsReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/CustomerTotalsReport.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Customer\Totals\Filter - #gridTotalsCustomer_period_date_range - css selector - - - Magento\Reports\Test\Block\Adminhtml\Customer\Totals\Grid - #gridTotalsCustomer_table - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/DownloadsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/DownloadsReport.xml index e1a85e3788fdd..1d94ffa05d623 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/DownloadsReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/DownloadsReport.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Product\Downloads\Grid - #downloadsGrid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/OrderedProductsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/OrderedProductsReport.xml index a238827870567..74f6c965c2d3a 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/OrderedProductsReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/OrderedProductsReport.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Product\Sold\Grid - #gridProductsSold - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductLowStock.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductLowStock.xml index 89284dc66dd16..bf8e94ada7c32 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductLowStock.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductLowStock.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Product\Lowstock\Grid - #gridLowstock - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportReview.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportReview.xml index 0a07de8dad688..7cd9e22ffbcdc 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportReview.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportReview.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Review\Products\Grid - #gridProducts - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml index a93261f3ae5f3..5d480228440f1 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Viewed\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid - .grid - css selector - - - Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form - #filter_form - css selector - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml index 5213185125500..4c441dbcd15b4 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Viewed\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid - .grid - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesCouponReportView.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesCouponReportView.xml index 52934c4f04478..9d71ccc32fce8 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesCouponReportView.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesCouponReportView.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Sales\Coupons\Filter - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\Coupons\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\Coupons\Grid - //*[@class="grid"]/.. - xpath - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml index b799da155925b..f2d085c9b2c93 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Viewed\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid - .grid - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml index 76cf83054cd6b..186a9d9f662fa 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Viewed\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid - .grid - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml index 09832c10a6db2..39eb397bf1a4d 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Filter - #filter_form - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Action - .page-main-actions - css selector - - - Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Grid - .grid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SearchIndex.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SearchIndex.xml index ebb4da2011ad3..0f58fbfc29da5 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SearchIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SearchIndex.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\SearchTermsGrid - #searchReportGrid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ShopCartProductReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ShopCartProductReport.xml index 4f2885434f518..00f54eb467b34 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ShopCartProductReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ShopCartProductReport.xml @@ -1,17 +1,12 @@ - + - - - - Magento\Reports\Test\Block\Adminhtml\Shopcart\Product\Grid - #gridProducts - css selector - - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Statistics.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Statistics.xml index 4b1d9870967ab..a41312dce8dba 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Statistics.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Statistics.xml @@ -1,16 +1,12 @@ - + - - -             - Magento\Reports\Test\Block\Adminhtml\Refresh\Statistics\Grid             - #gridRefreshStatistics             - css selector         - - - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.xml index de656c3c03b9f..395d2f02d997c 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.xml @@ -5,19 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - add product to cart as registered user and check product in Report - default - catalogProductSimple::product_100_dollar - assertAbandonedCartCustomerInfoResult - - - add two products to cart as registered user and check product in Report - default - catalogProductSimple::product_100_dollar,catalogProductSimple::product_100_dollar - assertAbandonedCartCustomerInfoResult - - + + + + add product to cart as registered user and check product in Report + default + catalogProductSimple::product_100_dollar + + + + add two products to cart as registered user and check product in Report + default + catalogProductSimple::product_100_dollar,catalogProductSimple::product_100_dollar + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest/test.csv deleted file mode 100644 index 616a10aad7566..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest/test.csv +++ /dev/null @@ -1,3 +0,0 @@ -"description";"customer/dataSet";"products";"constraint" -"add product to cart as registered user and check product in Report";"default";"catalogProductSimple::product_100_dollar";"assertAbandonedCartCustomerInfoResult" -"add two products to cart as registered user and check product in Report";"default";"catalogProductSimple::product_100_dollar,catalogProductSimple::product_100_dollar";"assertAbandonedCartCustomerInfoResult" diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml index b072470774d7c..a3bf6dbb79cfb 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml @@ -5,34 +5,37 @@ * See COPYING.txt for license details. */ --> - - - - Yes - default - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - 1 - assertProductReviewsQtyByCustomer, assertProductReportByCustomerInGrid - - - Yes - default - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - 2 - assertProductReviewsQtyByCustomer, assertProductReportByCustomerInGrid - - - No - default - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - 2 - assertProductReviewsQtyByCustomer, assertProductReportByCustomerNotInGrid - - + + + + Yes + default + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + 1 + + + + + Yes + default + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + 2 + + + + + No + default + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + 2 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml index 3d15ccad4117f..4f3064e25245a 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml @@ -5,11 +5,11 @@ * See COPYING.txt for license details. */ --> - - - - low_stock_product - assertLowStockProductInGrid - - + + + + low_stock_product + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml index 5b519deec303e..7e7149e378883 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml @@ -5,38 +5,38 @@ * See COPYING.txt for license details. */ --> - - - - default - 1 - m/d/Y - m/d/Y - Year - assertNewAccountsReportTotalResult - - - default - 1 - m/d/Y - m/d/Y - Month - assertNewAccountsReportTotalResult - - - default - 1 - m/d/Y - m/d/Y - Day - assertNewAccountsReportTotalResult - - - default - m/d/Y 12:00 a+1 day - m/d/Y 12:00 a+1 day - Day - assertNewAccountsReportTotalResult - - + + + + default + 1 + m/d/Y + m/d/Y + Year + + + + default + 1 + m/d/Y + m/d/Y + Month + + + + default + 1 + m/d/Y + m/d/Y + Day + + + + default + m/d/Y 12:00 a+1 day + m/d/Y 12:00 a+1 day + Day + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.xml index 10015399dc2b0..39d03880c795a 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.xml @@ -5,11 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - frontend_review - assertProductReviewReportIsVisibleInGrid, assertProductReviewIsAvailableForProduct - - + + + + frontend_review + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.xml index 862ee0d115508..f474078b0e999 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.xml @@ -5,19 +5,18 @@ * See COPYING.txt for license details. */ --> - - - - default - 1 - 0 - assertProductInCartResult - - - default - 2 - 1 - assertProductInCartResult - - + + + + default + 1 + + + + default + 2 + 1 + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.xml index 060f365e20036..2c9dff327b5c3 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.xml @@ -5,19 +5,21 @@ * See COPYING.txt for license details. */ --> - - - - product_with_url_key - 1 - 2 - assertSearchTermsInGrid, assertSearchTermReportForm - - - product_with_url_key - 3 - 1 - assertSearchTermsInGrid, assertSearchTermReportForm - - + + + + product_with_url_key + 1 + 2 + + + + + product_with_url_key + 3 + 1 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml index a1628ade5b4c2..05f9e844bdda9 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml @@ -5,37 +5,37 @@ * See COPYING.txt for license details. */ --> - - - - view products on front and verify they all reflected in Year report - 2, 1 - catalogProductSimple::default, catalogProductVirtual::default - Year - m/d/Y -1 year - m/d/Y - No - assertProductViewsReportTotalResult - - - view products on front and verify they all reflected in Month report - 1, 1 - downloadableProductInjectable::default, bundleProduct::bundle_dynamic_product - Month - m/d/Y - m/d/Y - No - assertProductViewsReportTotalResult - - - view products on front and verify they all reflected in Day report - 1, 1 - configurableProductInjectable::default, groupedProductInjectable::default - Day - m/d/Y -1 day - m/d/Y +1 day - Yes - assertProductViewsReportTotalResult - - + + + + view products on front and verify they all reflected in Year report + 2, 1 + catalogProductSimple::default, catalogProductVirtual::default + Year + m/d/Y -1 year + m/d/Y + No + + + + view products on front and verify they all reflected in Month report + 1, 1 + downloadableProductInjectable::default, bundleProduct::bundle_dynamic_product + Month + m/d/Y + m/d/Y + No + + + + view products on front and verify they all reflected in Day report + 1, 1 + configurableProductInjectable::default, groupedProductInjectable::default + Day + m/d/Y -1 day + m/d/Y +1 day + Yes + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml index ad1ff7a594055..2df0006a56563 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml @@ -1,84 +1,34 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml deleted file mode 100644 index e22a77ff1c719..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - reports/index/search - adminhtml - Magento\Reports\Test\Page\Adminhtml\SearchIndex - - - reports/report_product/lowstock - adminhtml - Magento\Reports\Test\Page\Adminhtml\ProductLowStock - - - reports/report_review/product - adminhtml - Magento\Reports\Test\Page\Adminhtml\ProductReportReview - - - reports/report_customer/accounts/index - adminhtml - Magento\Reports\Test\Page\Adminhtml\CustomerAccounts - - - reports/report_review/customer - adminhtml - Magento\Reports\Test\Page\Adminhtml\CustomerReportReview - - - reports/report_product/viewed/ - adminhtml - Magento\Reports\Test\Page\Adminhtml\ProductReportView - - - reports/report_shopcart/product - adminhtml - Magento\Reports\Test\Page\Adminhtml\ShopCartProductReport - - - reports/report_product/sold/ - adminhtml - Magento\Reports\Test\Page\Adminhtml\OrderedProductsReport - - - reports/report_statistics - adminhtml - Magento\Reports\Test\Page\Adminhtml\Statistics - - - reports/report_sales/coupons - adminhtml - Magento\Reports\Test\Page\Adminhtml\SalesCouponReportView - - - reports/report_customer/totals - adminhtml - Magento\Reports\Test\Page\Adminhtml\OrderTotalReport - - - reports/report_shopcart/abandoned - adminhtml - Magento\Reports\Test\Page\Adminhtml\AbandonedCarts - - - reports/report_customer/orders - adminhtml - Magento\Reports\Test\Page\Adminhtml\CustomerOrdersReport - - - reports/report_sales/tax - adminhtml - Magento\Reports\Test\Page\Adminhtml\SalesTaxReport - - - reports/report_product/downloads - adminhtml - Magento\Reports\Test\Page\Adminhtml\DownloadsReport - - - reports/report_sales/sales - adminhtml - Magento\Reports\Test\Page\Adminhtml\SalesReport - - - reports/report_sales/invoiced - adminhtml - Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport - - - reports/report_sales/refunded - adminhtml - Magento\Reports\Test\Page\Adminhtml\RefundsReport - - diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingEdit.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingEdit.xml index 345536d092fb9..0a658c9578389 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingEdit.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Review\Test\Block\Adminhtml\Rating\Edit\RatingForm - [id="page:main-container"] - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingIndex.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingIndex.xml index 538cb1c3816d8..24f923424f25d 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Review\Test\Block\Adminhtml\Rating\Grid - [id="page:main-container"] - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingNew.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingNew.xml index cc80f3ce76d1c..812e722ce563e 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingNew.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/RatingNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Review\Test\Block\Adminhtml\Rating\Edit\RatingForm - [id="page:main-container"] - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewEdit.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewEdit.xml index e30033a47f543..56e2c2a56e72f 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Review\Test\Block\Adminhtml\FormPageActions - .page-main-actions - css selector - - - Magento\Review\Test\Block\Adminhtml\ReviewForm - #edit_form - css selector - - - Magento\Review\Test\Block\Adminhtml\Product\Grid - #productGrid - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewIndex.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewIndex.xml index 863949767f799..2442a74269011 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Page/Adminhtml/ReviewIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Review\Test\Block\Adminhtml\Grid - #reviwGrid - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.xml index a13e135991caf..5197aa902749d 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.xml @@ -5,19 +5,23 @@ * See COPYING.txt for license details. */ --> - - - - productRating_%isolation% - Main Website/Main Website Store/Default Store View - Yes - assertProductRatingSuccessSaveMessage, assertProductRatingInGrid, assertProductRatingInProductPage - - - productRating_%isolation% - Main Website/Main Website Store/Default Store View - No - assertProductRatingSuccessSaveMessage, assertProductRatingInGrid, assertProductRatingNotInProductPage - - + + + + productRating_%isolation% + Main Website/Main Website Store/Default Store View + Yes + + + + + + productRating_%isolation% + Main Website/Main Website Store/Default Store View + No + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml index 76494884a4106..8f7aaf280a38a 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml @@ -5,43 +5,49 @@ * See COPYING.txt for license details. */ --> - - - - Administrator - catalogProductSimple::default - Approved - Main Website/Main Website Store/Default Store View - visibleOnDefaultWebsite - 3 - John - title %isolation% - review detail %isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductRatingInProductPage - - - Administrator - catalogProductSimple::default - Pending - Main Website/Main Website Store/Default Store View - visibleOnDefaultWebsite - 4 - Britney - title %isolation% - review detail %isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductRatingInProductPage - - - Administrator - catalogProductSimple::default - Not Approved - Main Website/Main Website Store/Default Store View - visibleOnDefaultWebsite - 5 - Michael - title %isolation% - review detail %isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductRatingInProductPage - - + + + + Administrator + catalogProductSimple::default + Approved + Main Website/Main Website Store/Default Store View + visibleOnDefaultWebsite + 3 + John + title %isolation% + review detail %isolation% + + + + + + Administrator + catalogProductSimple::default + Pending + Main Website/Main Website Store/Default Store View + visibleOnDefaultWebsite + 4 + Britney + title %isolation% + review detail %isolation% + + + + + + Administrator + catalogProductSimple::default + Not Approved + Main Website/Main Website Store/Default Store View + visibleOnDefaultWebsite + 5 + Michael + title %isolation% + review detail %isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml index 6ca0878fb7689..2e37894412547 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml @@ -5,30 +5,38 @@ * See COPYING.txt for license details. */ --> - - - - Create product review with rating - - - name_%isolation% - title_%isolation% - review_%isolation% - visibleOnDefaultWebsite - 4 - catalogProductSimple::default - assertReviewCreationSuccessMessage, assertProductReviewInGrid, assertProductRatingOnReviewPage, assertProductRatingInProductPage - - - MAGETWO-12403 - Add Product Review from Customer's Prospective - Guest - name_%isolation% - title_%isolation% - review_%isolation% - - - - - catalogProductSimple::default - assertReviewCreationSuccessMessage, assertProductReviewIsAbsentOnProductPage, assertProductReviewForm, assertSetApprovedProductReview, assertReviewLinksIsPresentOnProductPage, assertProductReviewOnProductPage - bamboo_plan:end_to_end,test_type:acceptance_test - - + + + + Create product review with rating + - + name_%isolation% + title_%isolation% + review_%isolation% + visibleOnDefaultWebsite + 4 + catalogProductSimple::default + + + + + + + MAGETWO-12403 - Add Product Review from Customer's Prospective + Guest + name_%isolation% + title_%isolation% + review_%isolation% + - + - + catalogProductSimple::default + bamboo_plan:end_to_end,test_type:acceptance_test + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.xml index 44d28d125d0f5..1089ae5401635 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - default - assertProductRatingSuccessDeleteMessage, assertProductRatingNotInGrid, assertProductRatingNotInProductPage - - + + + + default + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml index 069c3f14fe215..e6ef3a9b9a550 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml @@ -5,21 +5,25 @@ * See COPYING.txt for license details. */ --> - - - - Approved - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - assertReviewSuccessSaveMessage, assertProductReviewInGridOnCustomerPage, assertProductReviewOnProductPage - - - Not Approved - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - assertReviewSuccessSaveMessage, assertProductReviewInGridOnCustomerPage, assertProductRatingNotInProductPage - - + + + + Approved + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + + + + + + Not Approved + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.xml index c7c583df406d1..17f3fbd7cad19 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.xml @@ -5,27 +5,34 @@ * See COPYING.txt for license details. */ --> - - - - Update Status - Approved - assertProductReviewMassActionSuccessMessage, assertProductReviewInGrid, assertProductRatingInProductPage - - - Update Status - Pending - assertProductReviewMassActionSuccessMessage, assertProductReviewInGrid, assertProductRatingNotInProductPage - - - Update Status - Not Approved - assertProductReviewMassActionSuccessMessage, assertProductReviewInGrid, assertProductRatingNotInProductPage - - - Delete - - - assertProductReviewMassActionSuccessDeleteMessage, assertProductRatingNotInProductPage - - + + + + Update Status + Approved + + + + + + Update Status + Pending + + + + + + Update Status + Not Approved + + + + + + Delete + - + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.xml index 7bf148bdc21dd..6ce358b8b636d 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.xml @@ -5,23 +5,27 @@ * See COPYING.txt for license details. */ --> - - - - frontend_review - Approved - Nick%isolation% - Title %isolation% - Details %isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductReviewOnProductPage - - - frontend_review - Not Approved - Nick%isolation% - Title %isolation% - Details %isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductReviewNotOnProductPage - - + + + + frontend_review + Approved + Nick%isolation% + Title %isolation% + Details %isolation% + + + + + + frontend_review + Not Approved + Nick%isolation% + Title %isolation% + Details %isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml index 6acbc048e4073..0823927a7f0be 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml @@ -5,16 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - 3 - Approved - Main Website/Main Website Store/Default Store View - name%isolation% - title%isolation% - details%isolation% - assertProductReviewBackendSuccessSaveMessage, assertProductReviewInGrid, assertProductReviewOnProductPage, assertProductRatingInProductPage - - + + + + 3 + Approved + Main Website/Main Website Store/Default Store View + name%isolation% + title%isolation% + details%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml index 3bdbd66c92f88..f6050ef3e1fb5 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml @@ -5,14 +5,16 @@ * See COPYING.txt for license details. */ --> - - - - review_for_simple_product_with_rating - name_upd_%isolation% - title_upd_%isolation% - review_upd_%isolation% - assertReviewSuccessSaveMessage, assertProductReviewInGrid, assertProductRatingOnReviewPage - - + + + + review_for_simple_product_with_rating + name_upd_%isolation% + title_upd_%isolation% + review_upd_%isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml index 5e4a8030eff21..d09241f8906b9 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml @@ -1,81 +1,35 @@ - + - - - high - - - high - - - middle - - - middle - - - middle - - - middle - - - high - - - high - - - low - - - middle - - - middle - - - high - - - - - - high - - - - - - middle - - - middle - - - middle - - - low - - - low - - - middle - - - middle - - - low - - - low - - \ No newline at end of file + --> + + + + + + + + + + + + + + Magento\Review\Test\Page\Adminhtml\ReviewIndex + + + Magento\Review\Test\Page\Adminhtml\ReviewIndex + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Review/Test/etc/page.xml deleted file mode 100644 index e4bb507563f40..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Review/Test/etc/page.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - review/rating - adminhtml - Magento\Review\Test\Page\Adminhtml\RatingIndex - - - review/rating/new - adminhtml - Magento\Review\Test\Page\Adminhtml\RatingNew - - - review/rating/edit - adminhtml - Magento\Review\Test\Page\Adminhtml\RatingEdit - - - review/product/index - adminhtml - Magento\Review\Test\Page\Adminhtml\ReviewIndex - - - review/product/edit - adminhtml - Magento\Review\Test\Page\Adminhtml\ReviewEdit - - diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php index 16edae0465421..8476f6a782b99 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -24,12 +24,12 @@ class AssertCreditMemoButton extends AbstractConstraint /** * Assert that 'Credit Memo' button is present on order's page * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @return void */ - public function processAssert(OrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) + public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) { $orderIndex->open(); $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php index bee911273739c..b43ff086fcc5c 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php @@ -9,7 +9,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices\Grid; use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -25,14 +25,14 @@ class AssertInvoiceInInvoicesTab extends AbstractConstraint /** * Assert that invoice is present in the invoices tab of the order with corresponding amount(Grand Total) * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @param array $ids * @return void */ public function processAssert( - OrderView $orderView, + SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order, array $ids diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php index 9faaaece51231..d6ea8ceed5987 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertInvoiceSuccessCreateMessage extends AbstractConstraint /** * Assert that success message present after create invoice * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_CREATE_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php index 15582ebab7536..f2c4ec3bf358b 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertInvoiceWithShipmentSuccessMessage extends AbstractConstraint /** * Assert success message presents * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php index 27168972b0672..aaf2532fe8c19 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -24,12 +24,12 @@ class AssertNoCreditMemoButton extends AbstractConstraint /** * Assert that after refunding full amount 'Credit Memo' is not available any more * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @return void */ - public function processAssert(OrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) + public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) { $orderIndex->open(); $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php index 448ec5ef79605..dea42fd1224fd 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -24,12 +24,12 @@ class AssertNoInvoiceButton extends AbstractConstraint /** * Assert no Invoice button the order grid * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @return void */ - public function processAssert(OrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) + public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) { $orderIndex->open(); $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php index 1a2171ee10c93..cf95adc81fb83 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -25,14 +25,14 @@ class AssertOrderButtonsUnavailable extends AbstractConstraint * Assert that buttons from dataSet are not present on page * * @param OrderIndex $orderIndex - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderInjectable $order * @param string $orderButtonsUnavailable * @return void */ public function processAssert( OrderIndex $orderIndex, - OrderView $orderView, + SalesOrderView $orderView, OrderInjectable $order, $orderButtonsUnavailable ) { diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php index 5c164d1aee7ca..b8afe0589eb9d 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertOrderCancelSuccessMessage extends AbstractConstraint /** * Assert that after cancel sales order successful message appears * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_CANCEL_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php index 317e93fbb0016..54bbfd640be38 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -22,11 +22,11 @@ class AssertOrderGrandTotal extends AbstractConstraint /** * Assert that Order Grand Total is correct on order page in backend * - * @param OrderView $salesOrderView + * @param SalesOrderView $salesOrderView * @param string $grandTotal * @return void */ - public function processAssert(OrderView $salesOrderView, $grandTotal) + public function processAssert(SalesOrderView $salesOrderView, $grandTotal) { \PHPUnit_Framework_Assert::assertEquals( $grandTotal, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php index dc5d15ca4eb5c..e84bbc75f85f3 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php @@ -7,7 +7,7 @@ namespace Magento\Sales\Test\Constraint; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -26,7 +26,7 @@ class AssertOrderStatusIsCorrect extends AbstractConstraint * @param string $status * @param string $orderId * @param OrderIndex $salesOrder - * @param OrderView $salesOrderView + * @param SalesOrderView $salesOrderView * @param string|null $statusToCheck * @return void */ @@ -34,7 +34,7 @@ public function processAssert( $status, $orderId, OrderIndex $salesOrder, - OrderView $salesOrderView, + SalesOrderView $salesOrderView, $statusToCheck = null ) { $salesOrder->open(); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php index 11582827fd8b0..c598738e28422 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertOrderSuccessCreateMessage extends AbstractConstraint /** * Assert that after create sales order successful message appears * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php index 21e33cea1ef6b..9faa463dab62c 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php @@ -9,7 +9,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\CreditMemos\Grid; use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -25,14 +25,14 @@ class AssertRefundInCreditMemoTab extends AbstractConstraint /** * Assert that refund is present in the tab with ID and refunded amount(depending on full/partial refund) * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @param array $ids * @return void */ public function processAssert( - OrderView $orderView, + SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order, array $ids diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php index d619f949f4e83..899ef1f9fcd93 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertRefundSuccessCreateMessage extends AbstractConstraint /** * Assert that success create credit memo message is present on order view page * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_CREATE_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php index 46e188fe74d20..58ef319eaf2f2 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,14 +27,14 @@ class AssertReorderStatusIsCorrect extends AbstractConstraint * @param string $previousOrderStatus * @param OrderInjectable $order * @param OrderIndex $salesOrder - * @param OrderView $salesOrderView + * @param SalesOrderView $salesOrderView * @return void */ public function processAssert( $previousOrderStatus, OrderInjectable $order, OrderIndex $salesOrder, - OrderView $salesOrderView + SalesOrderView $salesOrderView ) { $salesOrder->open(); $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php index dc9aab4a6a6da..cc89376e2164f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -25,11 +25,11 @@ class AssertUnholdButton extends AbstractConstraint * Assert that 'Unhold' button present on order page * * @param OrderIndex $orderIndex - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderInjectable $order * @return void */ - public function processAssert(OrderIndex $orderIndex, OrderView $orderView, OrderInjectable $order) + public function processAssert(OrderIndex $orderIndex, SalesOrderView $orderView, OrderInjectable $order) { $orderIndex->open(); $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/CreditMemoIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/CreditMemoIndex.xml index 300c0bb9cb20f..d4fd850036a0f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/CreditMemoIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/CreditMemoIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\CreditMemo\Grid - [data-grid-id="sales_creditmemo_grid"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/InvoiceIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/InvoiceIndex.xml index 598dada096e3d..09031c3307c2f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/InvoiceIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/InvoiceIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Invoice\Grid - #sales_invoice_grid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreateIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreateIndex.xml index d6711c0e71db2..9ca28ac5ddd33 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreateIndex.xml @@ -1,46 +1,18 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\Create\Customer - #order-customer-selector - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Create\Store - #order-store-selector - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Create - [id="page:main-container"] - css selector - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Create\Coupons - #order-coupons - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities - .customer-current-activity - css selector - - - Magento\Catalog\Test\Block\Adminhtml\Product\Composite\Configure - //*[@role="dialog" and ./*[@id="product_composite_configure"] and contains(@style,"display: block")] - xpath - - - \ No newline at end of file + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml index 08bab6e84bf98..0a26cdc01f715 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\Actions - .order-totals-bottom .actions - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\Form - #edit_form - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\Totals - .creditmemo-totals - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml index dbd531c95e6f3..95487411b80a6 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Grid - #sales_order_grid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceNew.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceNew.xml index 0e70e0c165690..aa5ce7bf0110f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceNew.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form - #edit_form - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Totals - #invoice_totals - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceView.xml index ea35094d6c078..a2319ff28c6a0 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderInvoiceView.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Actions - .page-actions - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Invoice\View\Items - //div[./div[@id="invoice_item_container"]] - xpath - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusAssign.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusAssign.xml index 329fc70cb8309..94c67bc9ae4fc 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusAssign.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusAssign.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Status\Assign\AssignForm - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusEdit.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusEdit.xml index fd6fa8e1bcdf8..10cdfe94c0f6b 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusEdit.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Form - #edit_form - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusIndex.xml index 3004bfae6d5b0..659e035c39d20 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\StatusGrid - #sales_order_status_grid - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Status\GridPageActions - .page-main-actions - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusNew.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusNew.xml index 04b0be064a871..2f18b2608355f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusNew.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderStatusNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Backend\Test\Block\Widget\Form - #edit_form - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderView.xml deleted file mode 100644 index 2061a068a8037..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderView.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Magento\Sales\Test\Block\Adminhtml\Order\Actions - .page-actions - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\View\OrderForm - [id="page:main-container"] - css selector - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\View\Items - #sales_order_view_tabs_order_info_content .grid - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Totals - .order-totals - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\History - .order-comments-history - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\View\Info - .order-account-information - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info - [data-ui-id="sales-order-tabs-tab-content-order-info"] - css selector - - - diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesCreditMemoView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesCreditMemoView.xml index 9b36f317e07db..a2353d3245e96 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesCreditMemoView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesCreditMemoView.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\View\Items - .grid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesInvoiceView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesInvoiceView.xml index c3a5adde467a9..7913b781d0ed9 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesInvoiceView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesInvoiceView.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Adminhtml\Order\Invoice\View\Items - .grid - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml new file mode 100644 index 0000000000000..5e2cd98f7be0c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesOrderView.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/CreditMemoView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/CreditMemoView.xml index 7e07d73edc9e6..f2f1ac6ada7bb 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/CreditMemoView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/CreditMemoView.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Order\View - .order-details-items - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/InvoiceView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/InvoiceView.xml index 232cd1d7822d9..acea79216dcc3 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/InvoiceView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/InvoiceView.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Order\View - .order-details-items - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderHistory.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderHistory.xml index 3b0b78d22b10a..bb75da8faf780 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderHistory.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderHistory.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Order\History - #my-orders-table - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderView.xml index 8ba21c2ed9224..0846befbea55f 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/OrderView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Order\View - .column.main - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Actions - .page-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestForm.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestForm.xml index f1b504943433f..0440cfd03b3cd 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestForm.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestForm.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Sales\Test\Block\Widget\Guest\Form - #oar-widget-orders-and-returns-form - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestPrint.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestPrint.xml index a2f156213e630..66af3d42e1adb 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestPrint.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestPrint.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Order\View - .order-details-items - css selector - - - Magento\Sales\Test\Block\Order\Info - .block-order-details-view - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml index a3f0fe873cdfc..1b5cae17165e1 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Sales\Test\Block\Order\View\ActionsToolbar - .actions-toolbar - css selector - - - Magento\Sales\Test\Block\Order\View - .column.main - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php index 8485a0831ba0a..4dac16079bd85 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Test\TestStep; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\TestStep\TestStepInterface; /** @@ -18,15 +18,15 @@ class ReorderStep implements TestStepInterface /** * Order View Page * - * @var OrderView + * @var SalesOrderView */ protected $orderView; /** * @construct - * @param OrderView $orderView + * @param SalesOrderView $orderView */ - public function __construct(OrderView $orderView) + public function __construct(SalesOrderView $orderView) { $this->orderView = $orderView; } diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php index f9195c3787581..3b7b5a20fd273 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php @@ -9,7 +9,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable; use Magento\Customer\Test\Fixture\CustomerInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Fixture\FixtureFactory; use Magento\Mtf\TestStep\TestStepInterface; @@ -28,7 +28,7 @@ class SubmitOrderStep implements TestStepInterface /** * Sales order view. * - * @var OrderView + * @var SalesOrderView */ protected $orderView; @@ -42,7 +42,7 @@ class SubmitOrderStep implements TestStepInterface /** * @constructor * @param OrderCreateIndex $orderCreateIndex - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param FixtureFactory $fixtureFactory * @param CustomerInjectable $customer * @param AddressInjectable $billingAddress @@ -50,7 +50,7 @@ class SubmitOrderStep implements TestStepInterface */ public function __construct( OrderCreateIndex $orderCreateIndex, - OrderView $orderView, + SalesOrderView $orderView, FixtureFactory $fixtureFactory, CustomerInjectable $customer, AddressInjectable $billingAddress, diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml index 6b4f4c6fd6f21..a8885c6d59d81 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml @@ -1,160 +1,63 @@ - + - - - low - - - - - - high - - - - - - - high - - - high - - - - - - low - - - low - - - low - - - low - - - high - - - low - - - low - - - low - - - high - - - high - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex + + + Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex + Magento\Sales\Test\Fixture\OrderStatus + + + + Magento\Sales\Test\Page\Adminhtml\OrderStatusNew + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/page.xml deleted file mode 100644 index ffb669cf675cf..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/page.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - sales/order_status/index - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex - - - sales/order_status/new - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderStatusNew - - - sales/order_status/edit - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderStatusEdit - - - sales/order_status/assign - adminhtml - Magento\Sales\Test\Page\Adminhtml\Order\Status\Assign - - - sales/order/index - adminhtml - Magento\Sales\Test\Page\Adminhtml\OderIndex - - - sales/order/view/index - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderView - - - sales/order/history - Magento\Sales\Test\Page\OrderHistory - - - sales/order_invoice/new - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew - - - sales/order_invoice/view - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderInvoiceView - - - sales/order/invoice - Magento\Sales\Test\Page\InvoicesView - - - sales/order/view - Magento\Sales\Test\Page\OrderView - - - sales/creditmemo/view - adminhtml - Magento\Sales\Test\Page\SalesCreditMemoView - - - sales/order_creditmemo/new - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew - - - sales/creditmemo - adminhtml - Magento\Sales\Test\Page\Adminhtml\CreditMemoIndex - - - sales/invoice - adminhtml - Magento\Sales\Test\Page\Adminhtml\InvoiceIndex - - - sales/invoice/view - adminhtml - Magento\Sales\Test\Page\Adminhtml\SalesInvoiceView - - - sales/guest/form - Magento\Sales\Test\Page\SalesGuestForm - - - sales/order_create/index - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex - - - sales/guest/print - Magento\Sales\Test\Page\SalesGuestPrint - - diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php index ae61d24ecd113..2b82934d63fa4 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -24,12 +24,12 @@ class AssertNoShipButton extends AbstractConstraint /** * Assert no Ship button in the order grid * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @return void */ - public function processAssert(OrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) + public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order) { $orderIndex->open(); $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]); diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php index 76997e744f74c..78727668b0a84 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php @@ -8,7 +8,7 @@ use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -24,14 +24,14 @@ class AssertShipmentInShipmentsTab extends AbstractConstraint /** * Assert that shipment is present in the Shipments tab with correct shipped items quantity * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderIndex $orderIndex * @param OrderInjectable $order * @param array $ids * @return void */ public function processAssert( - OrderView $orderView, + SalesOrderView $orderView, OrderIndex $orderIndex, OrderInjectable $order, array $ids diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php index ce32f38f424c4..3c00c720ff65f 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php @@ -6,7 +6,7 @@ namespace Magento\Shipping\Test\Constraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractConstraint; /** @@ -27,10 +27,10 @@ class AssertShipmentSuccessCreateMessage extends AbstractConstraint /** * Assert success message presents * - * @param OrderView $orderView + * @param SalesOrderView $orderView * @return void */ - public function processAssert(OrderView $orderView) + public function processAssert(SalesOrderView $orderView) { \PHPUnit_Framework_Assert::assertEquals( self::SUCCESS_MESSAGE, diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentNew.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentNew.xml index a23c38c0805f7..44124df86a3e0 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentNew.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Shipping\Test\Block\Adminhtml\Create\Items - #ship_items_container - css selector - - - Magento\Shipping\Test\Block\Adminhtml\Form - #edit_form - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentView.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentView.xml index 79d9c14324ac1..9caca7619ca5a 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentView.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/OrderShipmentView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Shipment\View\Items - .grid - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml index cf94c52141866..beeac6205789c 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Theme\Test\Block\Html\Title - .page-title - css selector - - - Magento\Sales\Test\Block\Adminhtml\Order\Shipment\View\Items - .grid - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/ShipmentIndex.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/ShipmentIndex.xml index 5e3983689bd83..7923b31b29a3f 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/ShipmentIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/ShipmentIndex.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Shipping\Test\Block\Adminhtml\Shipment\Grid - [data-grid-id="sales_shipment_grid"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/SalesGuestPrint.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/SalesGuestPrint.xml index 1c119afbcf6bb..8938a2a32a66c 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/SalesGuestPrint.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/SalesGuestPrint.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Shipping\Test\Block\Order\Info - .block-order-details-view - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/ShipmentView.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/ShipmentView.xml index f8e644535314b..22eb7c62618d2 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/ShipmentView.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/ShipmentView.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Shipping\Test\Block\Order\Shipment - .order-details-items - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml index 0fc2f49285e0d..2dfb3c910a8bf 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml @@ -1,30 +1,16 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/page.xml deleted file mode 100644 index c8158f2a0d385..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/page.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - admin/order_shipment/new - adminhtml - Magento\Sales\Test\Page\Adminhtml\OrderShipmentNew - - - sales/shipment - adminhtml - Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex - - - order_shipment/view - adminhtml - Magento\Shipping\Test\Page\Adminhtml\OrderShipmentView - - diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapEdit.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapEdit.xml index 32f2fb3905af7..78ebe3f0f12dd 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapEdit.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.xml index 77d2973754208..6d7269e0dd9d8 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Sitemap\Test\Block\Adminhtml\SitemapGrid - #sitemapGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml index 71146712767f8..4f33714bfae86 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Page/Adminhtml/SitemapNew.xml @@ -1,21 +1,13 @@ - + - - - - Magento\Backend\Test\Block\Widget\Form - #add_sitemap_form - css selector - - - Magento\Sitemap\Test\Block\Adminhtml\SitemapPageActions - .page-main-actions - css selector - - - + --> + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml index 7abebac869f60..0f4398d6a46bf 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml @@ -5,22 +5,23 @@ * See COPYING.txt for license details. */ --> - - - - sitemap.xml - / - assertSitemapSuccessSaveMessage, assertSitemapInGrid - - - %isolation% - / - assertSitemapFailPathSaveMessage - - - sitemap.xml - /%isolation% - assertSitemapFailFolderSaveMessage - - + + + + sitemap.xml + / + + + + + %isolation% + / + + + + sitemap.xml + /%isolation% + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml index cf976065c4a0b..330ba6e357a50 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml @@ -5,11 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - default - assertSitemapSuccessDeleteMessage, assertSitemapNotInGrid - - + + + + default + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml index ad801847bf139..a783e2097f54a 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml @@ -1,36 +1,18 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/page.xml deleted file mode 100644 index c7dbb435f9307..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/page.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - admin/sitemap/index - adminhtml - Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex - - - admin/sitemap/new - adminhtml - Magento\Sitemap\Test\Page\Adminhtml\SitemapNew - - - admin/sitemap/edit - adminhtml - Magento\Sitemap\Test\Page\Adminhtml\SitemapEdit - - diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml index f820eab1c9e4f..0ccc383f7569f 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml @@ -5,28 +5,40 @@ * See COPYING.txt for license details. */ --> - - - - default - store_name_%isolation% - storecode_%isolation% - Enabled - assertStoreSuccessSaveMessage, assertStoreInGrid, assertStoreForm, assertStoreBackend, assertStoreFrontend - - - default - store_name_%isolation% - storecode_%isolation% - Disabled - assertStoreSuccessSaveMessage, assertStoreInGrid, assertStoreForm, assertStoreBackend, assertStoreNotOnFrontend - - - custom - store_name_%isolation% - storecode_%isolation% - Enabled - assertStoreSuccessSaveMessage, assertStoreInGrid, assertStoreForm, assertStoreBackend, assertStoreFrontend - - + + + + default + store_name_%isolation% + storecode_%isolation% + Enabled + + + + + + + + default + store_name_%isolation% + storecode_%isolation% + Disabled + + + + + + + + custom + store_name_%isolation% + storecode_%isolation% + Enabled + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml index 238d7cda46371..d7625a9bb94e3 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml @@ -5,19 +5,25 @@ * See COPYING.txt for license details. */ --> - - - - main_website - store_name_%isolation% - default_category - assertStoreGroupSuccessSaveMessage, assertStoreGroupInGrid, assertStoreGroupForm, assertStoreGroupOnStoreViewForm - - - custom_website - store_name_%isolation% - root_category - assertStoreGroupSuccessSaveMessage, assertStoreGroupInGrid, assertStoreGroupForm, assertStoreGroupOnStoreViewForm - - + + + + main_website + store_name_%isolation% + default_category + + + + + + + custom_website + store_name_%isolation% + root_category + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml index 81439990da4ae..bf8295ccb0a40 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml @@ -5,12 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - website_%isolation% - code_%isolation% - assertWebsiteSuccessSaveMessage, assertWebsiteInGrid, assertWebsiteForm, assertWebsiteOnStoreForm - - + + + + website_%isolation% + code_%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml index 78717f225a1ac..f379f4f9194fe 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml @@ -5,17 +5,22 @@ * See COPYING.txt for license details. */ --> - - - - custom - Yes - assertStoreSuccessDeleteAndBackupMessages, assertStoreNotInGrid, assertBackupInGrid, assertStoreNotOnFrontend - - - custom - No - assertStoreSuccessDeleteMessage, assertStoreNotInGrid, assertStoreNotOnFrontend - - + + + + custom + Yes + + + + + + + custom + No + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml index b1d50decc56cc..6c760280e74ae 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml @@ -5,17 +5,20 @@ * See COPYING.txt for license details. */ --> - - - - custom - Yes - assertStoreGroupSuccessDeleteAndBackupMessages, assertStoreGroupNotInGrid, assertBackupInGrid - - - custom - No - assertStoreGroupSuccessDeleteMessage, assertStoreGroupNotInGrid - - + + + + custom + Yes + + + + + + custom + No + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.xml index ae537fee312be..245a4438c1a7a 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.xml @@ -5,17 +5,20 @@ * See COPYING.txt for license details. */ --> - - - - custom_website - Yes - assertWebsiteSuccessDeleteAndBackupMessages, assertWebsiteNotInGrid, assertBackupInGrid - - - custom_website - No - assertWebsiteSuccessDeleteMessage, assertWebsiteNotInGrid - - + + + + custom_website + Yes + + + + + + custom_website + No + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml index ee7efdcd5b7ee..381e621f932aa 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml @@ -5,15 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - custom - default - storename_updated%isolation% - storecode_updated%isolation% - Enabled - assertStoreSuccessSaveMessage, assertStoreInGrid, assertStoreForm, assertStoreBackend, assertStoreFrontend - - + + + + custom + default + storename_updated%isolation% + storecode_updated%isolation% + Enabled + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml index 4c10bfdc648e9..56432f4a90564 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml @@ -5,21 +5,27 @@ * See COPYING.txt for license details. */ --> - - - - custom - main_website - store_name_updated_%isolation% - default_category - assertStoreGroupSuccessSaveMessage, assertStoreGroupInGrid, assertStoreGroupForm, assertStoreGroupOnStoreViewForm - - - custom - custom_website - store_name_updated_%isolation% - root_category - assertStoreGroupSuccessSaveMessage, assertStoreGroupInGrid, assertStoreGroupForm, assertStoreGroupOnStoreViewForm - - + + + + custom + main_website + store_name_updated_%isolation% + default_category + + + + + + + custom + custom_website + store_name_updated_%isolation% + root_category + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml index e6f2ff92ca204..a73d34ad5dbd7 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml @@ -5,13 +5,16 @@ * See COPYING.txt for license details. */ --> - - - - custom_website - website_upd%isolation% - code_upd%isolation% - assertWebsiteSuccessSaveMessage, assertWebsiteInGrid, assertWebsiteForm, assertWebsiteOnStoreForm - - + + + + custom_website + website_upd%isolation% + code_upd%isolation% + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml index fb085c420cf7a..0537d4e9ea774 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml @@ -1,84 +1,34 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php index f039b6f00b8e3..c8ac5237c0f8c 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php @@ -7,7 +7,7 @@ namespace Magento\Tax\Test\Constraint; use Magento\Mtf\Constraint\AbstractConstraint; -use Magento\Sales\Test\Page\Adminhtml\OrderView; +use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew; use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew; @@ -21,7 +21,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint /** * Order View Page. * - * @var OrderView + * @var SalesOrderView */ protected $orderView; @@ -76,7 +76,7 @@ abstract protected function getCreditMemoNewTotals($actualPrices); * @param array $prices * @param InjectableFixture $product * @param OrderIndex $orderIndex - * @param OrderView $orderView + * @param SalesOrderView $orderView * @param OrderInvoiceNew $orderInvoiceNew * @param OrderCreditMemoNew $orderCreditMemoNew * @return void @@ -85,7 +85,7 @@ public function processAssert( array $prices, InjectableFixture $product, OrderIndex $orderIndex, - OrderView $orderView, + SalesOrderView $orderView, OrderInvoiceNew $orderInvoiceNew, OrderCreditMemoNew $orderCreditMemoNew ) { diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateIndex.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateIndex.xml index 8951504c88767..dc474c7a7c790 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Tax\Test\Block\Adminhtml\Rate\GridPageActions - .page-main-actions - css selector - - - Magento\Tax\Test\Block\Adminhtml\Rate\Grid - #tax_rate_grid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateNew.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateNew.xml index d185da0e01aa8..190d097f4b2b4 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateNew.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRateNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Tax\Test\Block\Adminhtml\Rate\Edit\FormPageActions - .page-main-actions - css selector - - - Magento\Tax\Test\Block\Adminhtml\Rate\Edit\Form - #rate-form - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleIndex.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleIndex.xml index ae3af3e915f75..be5e415809d69 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\Tax\Test\Block\Adminhtml\Rule\Grid - #taxRuleGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleNew.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleNew.xml index d2080bc85ca76..cacce8f186d27 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleNew.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxRuleNew.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\Tax\Test\Block\Adminhtml\Rule\Edit\Form - #edit_form - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml index d6858d11ba032..e3be510af46e1 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml @@ -5,60 +5,69 @@ * See COPYING.txt for license details. */ --> - - - - TaxIdentifier%isolation% - No - - - - - * - Australia - * - 20 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm, assertTaxRateInTaxRule - - - TaxIdentifier%isolation% - Yes - 90001 - 96162 - - - United States - California - 15.5 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm, assertTaxRateInTaxRule - - - TaxIdentifier%isolation% - No - - - - - 180 - Canada - * - 25 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm, assertTaxRateInTaxRule - - - TaxIdentifier%isolation% - Yes - 7800935 - - - United Kingdom - * - assertTaxRateIsInCorrectRange - - - TaxIdentifier%isolation% - No - - - - - * - France - Val-d'Oise - 999 - assertTaxRateIsInCorrectRange - - + + + + TaxIdentifier%isolation% + No + - + - + * + Australia + * + 20 + + + + + + + TaxIdentifier%isolation% + Yes + 90001 + 96162 + - + United States + California + 15.5 + + + + + + + TaxIdentifier%isolation% + No + - + - + 180 + Canada + * + 25 + + + + + + + TaxIdentifier%isolation% + Yes + 7800935 + - + United Kingdom + * + + + + TaxIdentifier%isolation% + No + - + - + * + France + Val-d'Oise + 999 + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml index a7c69a766ad39..f6ca390833e8c 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml @@ -5,59 +5,67 @@ * See COPYING.txt for license details. */ --> - - - - TaxIdentifier%isolation% - US-CA-Rate_1 - - - - - - - - - - - - - - - - - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - - TaxIdentifier%isolation% - US-CA-Rate_1 - US-NY-Rate_1 - - - customer_tax_class - - - product_tax_class - - - 1 - 1 - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - - TaxIdentifier%isolation% - default - US-NY-Rate_1 - US-CA-Rate_1 - retail_customer - customer_tax_class - Taxable Goods - - - - - 1 - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - - TaxIdentifier%isolation% - withZipRange - US-CA-Rate_1 - - - retail_customer - customer_tax_class - Taxable Goods - product_tax_class - 1 - - - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - + + + + TaxIdentifier%isolation% + US-CA-Rate_1 + - + - + - + - + - + - + - + - + + + + + + TaxIdentifier%isolation% + US-CA-Rate_1 + US-NY-Rate_1 + - + customer_tax_class + - + product_tax_class + - + 1 + 1 + + + + + + TaxIdentifier%isolation% + default + US-NY-Rate_1 + US-CA-Rate_1 + retail_customer + customer_tax_class + Taxable Goods + - + - + 1 + + + + + + TaxIdentifier%isolation% + withZipRange + US-CA-Rate_1 + - + retail_customer + customer_tax_class + Taxable Goods + product_tax_class + 1 + - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest/testCreateTaxRule.csv b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest/testCreateTaxRule.csv deleted file mode 100644 index 802baedf2b334..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest/testCreateTaxRule.csv +++ /dev/null @@ -1,5 +0,0 @@ -"taxRule/data/code";"taxRule/data/tax_rate/dataSet/rate_0";"taxRule/data/tax_rate/dataSet/rate_1";"taxRule/data/tax_rate/dataSet/rate_2";"taxRule/data/tax_customer_class/dataSet/class_0";"taxRule/data/tax_customer_class/dataSet/class_1";"taxRule/data/tax_product_class/dataSet/class_0";"taxRule/data/tax_product_class/dataSet/class_1";"taxRule/data/priority";"taxRule/data/position";"constraint" -"TaxIdentifier%isolation%";"US-CA-Rate_1";"-";"-";"-";"-";"-";"-";"-";"-";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" -"TaxIdentifier%isolation%";"US-CA-Rate_1";"US-NY-Rate_1";"-";"customer_tax_class";"-";"product_tax_class";"-";1;1;"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" -"TaxIdentifier%isolation%";"default";"US-NY-Rate_1";"US-CA-Rate_1";"retail_customer";"customer_tax_class";"Taxable Goods";"-";"-";1;"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" -"TaxIdentifier%isolation%";"withZipRange";"US-CA-Rate_1";"-";"retail_customer";"customer_tax_class";"Taxable Goods";"product_tax_class";1;"-";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml index 34dd26f9038e6..ececcbc2fc7b2 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - default - assertTaxRateSuccessDeleteMessage, assertTaxRateNotInGrid, assertTaxRateNotInTaxRule - - + + + + default + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml index 5985e519e305a..034a9cfbee131 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml @@ -5,17 +5,19 @@ * See COPYING.txt for license details. */ --> - - - - tax_rule_with_custom_tax_classes - United States - California - 90001 - Flat Rate - Fixed - 5 - assertTaxRuleSuccessDeleteMessage, assertTaxRuleNotInGrid, assertTaxRuleIsNotApplied - - + + + + tax_rule_with_custom_tax_classes + United States + California + 90001 + Flat Rate + Fixed + 5 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml index f4fe9bcf1e2e2..ccea60b171206 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml @@ -5,77 +5,85 @@ * See COPYING.txt for license details. */ --> - - - - default - TaxIdentifier%isolation% - No - - - - - 90001 - United States - California - 100 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm - - - default - TaxIdentifier%isolation% - Yes - 90001 - 96162 - - - United States - California - 15.05 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm - - - default - TaxIdentifier%isolation% - No - - - - - * - United Kingdom - * - 777 - assertTaxRateIsInCorrectRange - - - withZipRange - TaxIdentifier%isolation% - No - - - - - 180 - Canada - * - 25 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm - - - withZipRange - TaxIdentifier%isolation% - Yes - 7800935 - - - United Kingdom - * - assertTaxRateIsInCorrectRange - - - withZipRange - TaxIdentifier%isolation% - No - - - - - * - France - Val-d'Oise - 0.1 - assertTaxRateSuccessSaveMessage, assertTaxRateInGrid, assertTaxRateForm - - + + + + default + TaxIdentifier%isolation% + No + - + - + 90001 + United States + California + 100 + + + + + + default + TaxIdentifier%isolation% + Yes + 90001 + 96162 + - + United States + California + 15.05 + + + + + + default + TaxIdentifier%isolation% + No + - + - + * + United Kingdom + * + 777 + + + + withZipRange + TaxIdentifier%isolation% + No + - + - + 180 + Canada + * + 25 + + + + + + withZipRange + TaxIdentifier%isolation% + Yes + 7800935 + - + United Kingdom + * + + + + withZipRange + TaxIdentifier%isolation% + No + - + - + * + France + Val-d'Oise + 0.1 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml index 9e87d8c69a81a..184996de026ed 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml @@ -5,75 +5,85 @@ * See COPYING.txt for license details. */ --> - - - - tax_rule_default - - - - - - - - - - - - - New Tax Rule name%isolation% - default - customer_tax_class - product_tax_class - product_tax_class - 2 - 2 - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - - tax_rule_with_custom_tax_classes - - - - - - - - - - - - - - - withZipRange - retail_customer - product_tax_class - taxable_goods - - - - - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm - - - tax_rule_with_custom_tax_classes - United States - Utah - 84001 - Flat Rate - Fixed - 5 - - - us_ut_fixed_zip_rate_20 - - - product_tax_class - - - - - - - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm, assertTaxRuleIsApplied - - - tax_rule_with_custom_tax_classes - United States - Idaho - 83201 - Flat Rate - Fixed - 5 - - - withFixedZip - - - product_tax_class - - - - - - - assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm, assertTaxRuleIsNotApplied - - + + + + tax_rule_default + - + - + - + - + - + - + New Tax Rule name%isolation% + default + customer_tax_class + product_tax_class + product_tax_class + 2 + 2 + + + + + + tax_rule_with_custom_tax_classes + - + - + - + - + - + - + - + withZipRange + retail_customer + product_tax_class + taxable_goods + - + - + + + + + + tax_rule_with_custom_tax_classes + United States + Utah + 84001 + Flat Rate + Fixed + 5 + - + us_ut_fixed_zip_rate_20 + - + product_tax_class + - + - + - + + + + + + + tax_rule_with_custom_tax_classes + United States + Idaho + 83201 + Flat Rate + Fixed + 5 + - + withFixedZip + - + product_tax_class + - + - + - + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest/testUpdateTaxRule.csv b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest/testUpdateTaxRule.csv deleted file mode 100644 index ef703c7b92e08..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest/testUpdateTaxRule.csv +++ /dev/null @@ -1,5 +0,0 @@ -"initialTaxRule/dataSet";"address/data/country_id";"address/data/region_id";"address/data/postcode";"shipping/carrier";"shipping/method";"shipping/price";"taxRule/data/code";"taxRule/data/tax_rate/dataSet/rate_0";"taxRule/data/tax_customer_class/dataSet/class_0";"taxRule/data/tax_product_class/dataSet/class_0";"taxRule/data/tax_product_class/dataSet/class_1";"taxRule/data/priority";"taxRule/data/position";"constraint" -"tax_rule_default";"-";"-";"-";"-";"-";"-";"New Tax Rule name%isolation%";"default";"customer_tax_class";"product_tax_class";"product_tax_class";"2";"2";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" -"tax_rule_with_custom_tax_classes";"-";"-";"-";"-";"-";"-";"-";"withZipRange";"retail_customer";"product_tax_class";"taxable_goods";"-";"-";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm" -"tax_rule_with_custom_tax_classes";"United States";"Utah";84001;"Flat Rate";"Fixed";5;"-";"us_ut_fixed_zip_rate_20";"-";"product_tax_class";"-";"-";"-";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm, assertTaxRuleIsApplied" -"tax_rule_with_custom_tax_classes";"United States";"Idaho";83201;"Flat Rate";"Fixed";5;"-";"withFixedZip";"-";"product_tax_class";"-";"-";"-";"assertTaxRuleSuccessSaveMessage, assertTaxRuleInGrid, assertTaxRuleForm, assertTaxRuleIsNotApplied" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml index 6776506ada7ba..87095cca23c5a 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml @@ -1,134 +1,69 @@ - + - - - low - - - - - - high - - - - - - - high - - - - - - - - high - - - - - - high - - - - - - - high - - - - - - - - low - - - low - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - high - - - - - - high - - - - - - - high - - - - - - high - - - - - - - high - - - - - - - - + --> + + + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + + + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + Magento\Tax\Test\Fixture\TaxRule + + + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + Magento\Tax\Test\Page\Adminhtml\TaxRuleNew + Magento\Tax\Test\Fixture\TaxRule + + + Magento\Tax\Test\Page\Adminhtml\TaxRateIndex + + + Magento\Tax\Test\Page\Adminhtml\TaxRateIndex + Magento\Tax\Test\Fixture\TaxRate + + + Magento\Tax\Test\Page\Adminhtml\TaxRateIndex + Magento\Tax\Test\Page\Adminhtml\TaxRateNew + Magento\Tax\Test\Fixture\TaxRate + + + + + + + + + + + + + + + + + + + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + + + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + Magento\Tax\Test\Fixture\TaxRule + + + Magento\Tax\Test\Page\Adminhtml\TaxRateIndex + + + Magento\Tax\Test\Page\Adminhtml\TaxRateIndex + Magento\Tax\Test\Fixture\TaxRate + + + Magento\Tax\Test\Fixture\TaxRate + Magento\Tax\Test\Fixture\TaxRule + Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex + Magento\Tax\Test\Page\Adminhtml\TaxRuleNew + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/page.xml deleted file mode 100644 index e3822c4360039..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/page.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - tax/rule/index - adminhtml - Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex - - - tax/rule/new - adminhtml - Magento\Tax\Test\Page\Adminhtml\TaxRuleNew - - - tax/rate/index - adminhtml - Magento\Tax\Test\Page\Adminhtml\TaxRateIndex - - - tax/rate/add - adminhtml - Magento\Tax\Test\Page\Adminhtml\TaxRateNew - - diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Page/CheckoutOnepageSuccess.xml b/dev/tests/functional/tests/app/Magento/Theme/Test/Page/CheckoutOnepageSuccess.xml index 5b95f2921b9e4..84bcca1643966 100644 --- a/dev/tests/functional/tests/app/Magento/Theme/Test/Page/CheckoutOnepageSuccess.xml +++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Page/CheckoutOnepageSuccess.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Theme\Test\Block\Html\Title - [data-ui-id="page-title"] - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteEdit.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteEdit.xml index 84ee9f6b9513f..9f7966e317c2e 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteEdit.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteEdit.xml @@ -1,46 +1,18 @@ - + - - - - Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category\Tree - [id="page:main-container"] - css selector - - - Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Edit\UrlRewriteForm - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages .messages - css selector - - - Magento\Backend\Test\Block\FormPageActions - .page-main-actions - css selector - - - Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Product\Grid - [id="productGrid"] - css selector - - - Magento\UrlRewrite\Test\Block\Adminhtml\Selector - [data-container-for="entity-type-selector"] - css selector - - - Magento\UrlRewrite\Test\Block\Adminhtml\Cms\Page\Grid - #cmsPageGrid - css selector - - - + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteIndex.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteIndex.xml index e8ed34d70b304..ee94001a140ea 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteIndex.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Page/Adminhtml/UrlRewriteIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category\Grid - #urlrewriteGrid - css selector - - - Magento\Core\Test\Block\Messages - .messages .messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml index f3eac7127d23f..b48569f0b35b8 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml @@ -5,44 +5,50 @@ * See COPYING.txt for license details. */ --> - - - - MAGETWO-12407: Add Permanent Redirect for Category - For category - Main Website/Main Website Store/Default Store View - cat%isolation%-redirect.html - Permanent (301) - End-to-end test - assertUrlRewriteSaveMessage, assertUrlRewriteCategoryRedirect - bamboo_plan:end_to_end,test_type:acceptance_test - - - Create Category URL Rewrites with no redirect - For category - Main Website/Main Website Store/Default Store View - test_request%isolation% - No - test description - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid - - - Create Category URL Rewrites with Temporary redirect - For category - Main Website/Main Website Store/Default Store View - request_path%isolation% - Temporary (302) - test description - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - - Create Category URL Rewrites with Permanent redirect - For category - Main Website/Main Website Store/Default Store View - request_path%isolation% - Permanent (301) - test description - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - + + + + MAGETWO-12407: Add Permanent Redirect for Category + For category + Main Website/Main Website Store/Default Store View + cat%isolation%-redirect.html + Permanent (301) + End-to-end test + bamboo_plan:end_to_end,test_type:acceptance_test + + + + + Create Category URL Rewrites with no redirect + For category + Main Website/Main Website Store/Default Store View + test_request%isolation% + No + test description + + + + + Create Category URL Rewrites with Temporary redirect + For category + Main Website/Main Website Store/Default Store View + request_path%isolation% + Temporary (302) + test description + + + + + + Create Category URL Rewrites with Permanent redirect + For category + Main Website/Main Website Store/Default Store View + request_path%isolation% + Permanent (301) + test description + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml index 7e2eefa9f9d1e..66352c15456c7 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml @@ -5,48 +5,51 @@ * See COPYING.txt for license details. */ --> - - - - MAGETWO-12409: Add Temporary Redirect for Product - For product - product_with_category - Main Website/Main Website Store/Default Store View - cat%isolation%/simp_redirect%isolation%.html - Temporary (302) - description_%isolation% - assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect - bamboo_plan:end_to_end,test_type:acceptance_test - - - Create Product URL Rewrites with no redirect - For product - default - Main Website/Main Website Store/Default Store View - test_%isolation%.html - No - description_%isolation% - assertUrlRewriteSaveMessage - - - Create Product URL Rewrites with Temporary redirect - For product - default - Main Website/Main Website Store/Default Store View - test_%isolation%.html - Temporary (302) - description_%isolation% - assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect - - - Create Product URL Rewrites with Permanent redirect - For product - default - Main Website/Main Website Store/Default Store View - test_%isolation%.html - Permanent (301) - description_%isolation% - assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect - - + + + + MAGETWO-12409: Add Temporary Redirect for Product + For product + product_with_category + Main Website/Main Website Store/Default Store View + cat%isolation%/simp_redirect%isolation%.html + Temporary (302) + description_%isolation% + bamboo_plan:end_to_end,test_type:acceptance_test + + + + + Create Product URL Rewrites with no redirect + For product + default + Main Website/Main Website Store/Default Store View + test_%isolation%.html + No + description_%isolation% + + + + Create Product URL Rewrites with Temporary redirect + For product + default + Main Website/Main Website Store/Default Store View + test_%isolation%.html + Temporary (302) + description_%isolation% + + + + + Create Product URL Rewrites with Permanent redirect + For product + default + Main Website/Main Website Store/Default Store View + test_%isolation%.html + Permanent (301) + description_%isolation% + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml index d8894aac7f1a4..c681c9021f032 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml @@ -5,19 +5,21 @@ * See COPYING.txt for license details. */ --> - - - - catalog/category/view/id/%category::default% - No - - - assertUrlRewriteDeletedMessage, assertPageByUrlRewriteIsNotFound - - - catalog/category/view/id/%category::default% - No - example%isolation%.html - assertUrlRewriteDeletedMessage, assertPageByUrlRewriteIsNotFound - - + + + + catalog/category/view/id/%category::default% + No + - + + + + + catalog/category/view/id/%category::default% + No + example%isolation%.html + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml index 53cbd7197ad03..b3270164cb921 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml @@ -5,11 +5,13 @@ * See COPYING.txt for license details. */ --> - - - - default - assertUrlRewriteDeletedMessage, assertUrlRewriteNotInGrid, assertPageByUrlRewriteIsNotFound - - + + + + default + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml index 212e6e9e47894..3ef97031ff8f5 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml @@ -5,12 +5,14 @@ * See COPYING.txt for license details. */ --> - - - - default_without_target - product/%catalogProductSimple::product_100_dollar% - assertUrlRewriteDeletedMessage, assertUrlRewriteNotInGrid, assertPageByUrlRewriteIsNotFound - - + + + + default_without_target + product/%catalogProductSimple::product_100_dollar% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest/test.csv deleted file mode 100644 index 58e27c235e06a..0000000000000 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"productRedirect/dataSet";"productRedirect/data/target_path/entity";"constraint" -"default_without_target";"product/%catalogProductSimple::product_100_dollar%";"assertUrlRewriteDeletedMessage, assertUrlRewriteNotInGrid, assertPageByUrlRewriteIsNotFound" diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml index 7b8367c92a663..b53dc1b10b6d5 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml @@ -5,47 +5,55 @@ * See COPYING.txt for license details. */ --> - - - - Main Website/Main Website Store/Default Store View - default_subcategory - default - - - test_request%isolation% - No - test_description_defalt - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - - Main Website/Main Website Store/Default Store View - default_subcategory - default - - - request_path%isolation%.html - Temporary (302) - test description_302 - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - - Main Website/Main Website Store/Default Store View - default_subcategory - default - - - request_path%isolation%.htm - Permanent (301) - test description_301 - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - - Main Website/Main Website Store/Default Store View - default_subcategory - default - - - request_path%isolation%.aspx - Temporary (302) - test description_%isolation% - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCategoryRedirect - - + + + + Main Website/Main Website Store/Default Store View + default_subcategory + default + - + test_request%isolation% + No + test_description_defalt + + + + + + Main Website/Main Website Store/Default Store View + default_subcategory + default + - + request_path%isolation%.html + Temporary (302) + test description_302 + + + + + + Main Website/Main Website Store/Default Store View + default_subcategory + default + - + request_path%isolation%.htm + Permanent (301) + test description_301 + + + + + + Main Website/Main Website Store/Default Store View + default_subcategory + default + - + request_path%isolation%.aspx + Temporary (302) + test description_%isolation% + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml index bf3c1aeadda1f..30d4ad382787a 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml @@ -5,25 +5,29 @@ * See COPYING.txt for license details. */ --> - - - - default - Main Website/Main Website Store/Default Store View - wishlist/%isolation% - http://www.magentocommerce.com/magento-connect/ - Permanent (301) - test_description_relative path - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteSuccessOutsideRedirect - - - custom_rewrite_wishlist - Main Website/Main Website Store/Default Store View - wishlist/%isolation% - catalogsearch/result/?q=$%catalogProductSimple::defaul%sku$ - Temporary (302) - test_description_relative path - assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCustomSearchRedirect - - + + + + default + Main Website/Main Website Store/Default Store View + wishlist/%isolation% + http://www.magentocommerce.com/magento-connect/ + Permanent (301) + test_description_relative path + + + + + + custom_rewrite_wishlist + Main Website/Main Website Store/Default Store View + wishlist/%isolation% + catalogsearch/result/?q=$%catalogProductSimple::defaul%sku$ + Temporary (302) + test_description_relative path + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml index bf41d7a11fceb..e78a230677cbe 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml @@ -5,16 +5,17 @@ * See COPYING.txt for license details. */ --> - - - - product/%catalogProductSimple::product_100_dollar% - Main Website/Main Website Store/Default Store View - test_%isolation%.html - Temporary (302) - description_%isolation% - Yes - assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect - - + + + + product/%catalogProductSimple::product_100_dollar% + Main Website/Main Website Store/Default Store View + test_%isolation%.html + Temporary (302) + description_%isolation% + Yes + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest/test.csv deleted file mode 100644 index f910d38e94936..0000000000000 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -"urlRewrite/data/target_path/entity";"urlRewrite/data/store_id";"urlRewrite/data/request_path";"urlRewrite/data/redirect_type";"urlRewrite/data/description";"isRequired";"constraint" -"product/%catalogProductSimple::product_100_dollar%";"Main Website/Main Website Store/Default Store View";"test_%isolation%.html";"Temporary (302)";"description_%isolation%";"Yes";"assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect" diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml index 2691f8e676292..39dd376f3b5a8 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml @@ -1,79 +1,46 @@ - + - - - low - - - - - - - low - - - low - - - low - - - - - - - - - low - - - - - - low - - - - - - - low - - - - - - - - low - - - low - - - - - - - low - - - - - - - - low - - - low - - - low - - + --> + + + Magento\UrlRewrite\Test\Fixture\UrlRewriteCategory + Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex + + + + + Magento\UrlRewrite\Test\Fixture\UrlRewrite + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\Mtf\Fixture\FixtureInterface + Magento\Mtf\Client\Browser + + + Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex + + + Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex + Magento\UrlRewrite\Test\Fixture\UrlRewrite + + + Magento\Catalog\Test\Page\Product\CatalogProductView + Magento\UrlRewrite\Test\Fixture\UrlRewrite + Magento\Mtf\Client\Browser + + + + Magento\UrlRewrite\Test\Fixture\UrlRewrite + Magento\Mtf\Client\Browser + + + Magento\UrlRewrite\Test\Fixture\UrlRewrite + Magento\Mtf\Client\Browser + Magento\Catalog\Test\Page\Category\CatalogCategoryView + + + + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/page.xml deleted file mode 100644 index 3fc1364f3b3f1..0000000000000 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/page.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - admin/url_rewrite/index - adminhtml - Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex - - - admin/url_rewrite/edit - adminhtml - Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit - - diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml index 39bc84aa7adde..44f2f8179c068 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserEdit.xml @@ -1,31 +1,15 @@ - + - - - - Magento\User\Test\Block\Adminhtml\User\Edit\PageActions - .page-main-actions - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\User\Test\Block\Adminhtml\User\UserForm - [id="page:main-container"] - css selector - - - Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid - [id="permissionsUserRolesGrid"] - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml index 03859420fae61..93868a2d47a88 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserIndex.xml @@ -1,31 +1,15 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\User\Test\Block\Adminhtml\UserGrid - #permissionsUserGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - Magento\Backend\Test\Block\Denied - #anchor-content - css selector - - - + --> + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleEditRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleEditRole.xml index 0558b4ae0ccf4..a12e23a791685 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleEditRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleEditRole.xml @@ -1,26 +1,14 @@ - + - - - - Magento\User\Test\Block\Adminhtml\Role\PageActions - .page-main-actions - css selector - - - Magento\User\Test\Block\Adminhtml\Role\RoleForm - [id="page:main-container"] - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleIndex.xml b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleIndex.xml index 4439a0910ea5b..d54e849192e88 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleIndex.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Page/Adminhtml/UserRoleIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Backend\Test\Block\GridPageActions - .page-main-actions - css selector - - - Magento\User\Test\Block\Adminhtml\RoleGrid - #roleGrid - css selector - - - Magento\Core\Test\Block\Messages - #messages - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml index b830f7f62ec92..fac4ab47e9232 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml @@ -5,85 +5,94 @@ * See COPYING.txt for license details. */ --> - - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - Active - Administrators - - - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - Inactive - Administrators - - - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage - %current_password% - - - - - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - Active - Administrators - username - assertUserDuplicateMessage - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - - - 123123q - 123123q - Active - Administrators - email - assertUserDuplicateMessage - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - Active - - - - - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.cim - 123123q - 123123q - Active - - - - - assertUserInvalidEmailMessage - %current_password% - - + + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + Active + Administrators + - + %current_password% + + + + + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + Inactive + Administrators + - + %current_password% + + + + + + + - + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + Active + Administrators + username + %current_password% + + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + - + 123123q + 123123q + Active + Administrators + email + %current_password% + + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + Active + - + - + %current_password% + + + + + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.cim + 123123q + 123123q + Active + - + - + %current_password% + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv deleted file mode 100644 index 9cfc5494ac9b7..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv +++ /dev/null @@ -1,7 +0,0 @@ -"user/data/username";"user/data/firstname";"user/data/lastname";"user/data/email";"user/data/password";"user/data/password_confirmation";"user/data/is_active";"user/data/role_id/dataSet";"isDuplicated";"constraint";"user/data/current_password" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin"; "%current_password%" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Inactive";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "%current_password%" -"-";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"username";"assertUserDuplicateMessage"; "%current_password%" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"-";"123123q";"123123q";"Active";"Administrators";"email";"assertUserDuplicateMessage"; "%current_password%" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"-";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "%current_password%" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.cim";"123123q";"123123q";"Active";"-";"-";"assertUserInvalidEmailMessage"; "%current_password%" diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml index d97a269cb4ff9..faa5cf7606d00 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml @@ -5,19 +5,21 @@ * See COPYING.txt for license details. */ --> - - - - AdminRole%isolation% - Custom - Sales - assertRoleSuccessSaveMessage, assertRoleInGrid - - - AdminRole%isolation% - All - - - assertRoleSuccessSaveMessage, assertRoleInGrid - - + + + + AdminRole%isolation% + Custom + Sales + + + + + AdminRole%isolation% + All + - + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml index c8a171d3c2f66..9838e668ef103 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml @@ -5,15 +5,16 @@ * See COPYING.txt for license details. */ --> - - - - 0 - assertImpossibleDeleteYourOwnAccount, assertUserInGrid - - - 1 - assertUserSuccessDeleteMessage, assertUserNotInGrid - - + + + + + + + + 1 + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml index 9ec6821d5e1a2..9925dc9e894dd 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml @@ -5,15 +5,16 @@ * See COPYING.txt for license details. */ --> - - - - 0 - assertImpossibleDeleteYourOwnRole, assertRoleInGrid - - - 1 - assertRoleSuccessDeleteMessage, assertRoleNotInGrid - - + + + + + + + + 1 + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml index b510761f9e259..40170fcd7cd6b 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml @@ -5,11 +5,11 @@ * See COPYING.txt for license details. */ --> - - - - custom_admin - assertAccessTokensErrorRevokeMessage - - + + + + custom_admin + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml index d46cd5b8482a6..4c4e9ad8cf9a5 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml @@ -5,49 +5,57 @@ * See COPYING.txt for license details. */ --> - - - - custom_admin_with_default_role - NewAdminUser%isolation% - NewFirstName%isolation% - NewLastName%isolation% - NewEmail%isolation%@example.com - 123123qa - 123123qa - - - - - 0 - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin - 123123q - - - custom_admin_with_default_role - - - - - - - - - - - - - - - role_sales - 0 - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess - 123123q - - - custom_admin_with_default_role - - - - - - - - - - - - - Inactive - - - 1 - assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage - 123123q - - + + + + custom_admin_with_default_role + NewAdminUser%isolation% + NewFirstName%isolation% + NewLastName%isolation% + NewEmail%isolation%@example.com + 123123qa + 123123qa + - + - + 123123q + + + + + + + custom_admin_with_default_role + - + - + - + - + - + - + - + role_sales + 123123q + + + + + + + + custom_admin_with_default_role + - + - + - + - + - + - + Inactive + - + 1 + 123123q + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml index 442f8a06a2316..2a1217294fea9 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml @@ -5,23 +5,30 @@ * See COPYING.txt for license details. */ --> - - - - custom_admin_with_default_role - NewAdminRole%isolation% - - - - - - - assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin - - - default - - - Custom - Sales - custom_admin - assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess - - + + + + custom_admin_with_default_role + NewAdminRole%isolation% + - + - + - + + + + + + + default + - + Custom + Sales + custom_admin + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.xml index 259b934ab3b07..bd296c38f6ada 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.xml @@ -5,15 +5,15 @@ * See COPYING.txt for license details. */ --> - - - - AdminRole%isolation% - Custom - Sales - UpdatedAdminRole%isolation% - All - assertUserSuccessLogin - - + + + + AdminRole%isolation% + Custom + Sales + UpdatedAdminRole%isolation% + All + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml index 48c9d6c75f0e8..86427918cf957 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml @@ -1,119 +1,68 @@ - + - - - low - - - - - - - - - low - - - - - - - low - - - - - - - low - - - - - - - low - - - - - - low - - - - - - low - - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - low - - - - - - - low - - - - - + --> + + + Magento\Backend\Test\Page\Adminhtml\Dashboard + Magento\Backend\Test\Page\AdminAuthLogin + Magento\User\Test\Fixture\User + Magento\User\Test\Fixture\User + + + Magento\Backend\Test\Page\AdminAuthLogin + Magento\Backend\Test\Page\Adminhtml\Dashboard + + + Magento\Backend\Test\Page\AdminAuthLogin + Magento\User\Test\Fixture\User + + + Magento\User\Test\Page\Adminhtml\UserIndex + Magento\Backend\Test\Page\Adminhtml\Dashboard + + + Magento\User\Test\Page\Adminhtml\UserRoleIndex + + + Magento\User\Test\Page\Adminhtml\UserRoleIndex + + + Magento\User\Test\Page\Adminhtml\UserIndex + Magento\User\Test\Fixture\User + + + Magento\User\Test\Page\Adminhtml\UserIndex + + + Magento\User\Test\Page\Adminhtml\UserRoleEditRole + + + Magento\User\Test\Page\Adminhtml\UserRoleIndex + + + Magento\User\Test\Page\Adminhtml\UserRoleIndex + + + Magento\User\Test\Page\Adminhtml\UserEdit + + + Magento\User\Test\Page\Adminhtml\UserIndex + + + Magento\User\Test\Page\Adminhtml\UserIndex + + + Magento\User\Test\Page\Adminhtml\UserEdit + + + Magento\User\Test\Page\Adminhtml\UserEdit + Magento\User\Test\Fixture\User + + + Magento\User\Test\Page\Adminhtml\UserEdit + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/page.xml deleted file mode 100644 index b46b87353aa27..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/etc/page.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - admin/user_role/index - adminhtml - Magento\User\Test\Page\Adminhtml\UserRoleIndex - - - admin/user_role/editrole - adminhtml - Magento\User\Test\Page\Adminhtml\UserRoleEditRole - - - admin/user - adminhtml - Magento\User\Test\Page\Adminhtml\UserIndex - - - admin/user/edit - adminhtml - Magento\User\Test\Page\Adminhtml\UserEdit - - \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml index 760db37436371..7550ab68cde7c 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Weee\Test\Block\Product\ListProduct - .products.wrapper.grid - css selector - - - + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml index a68ece8253c24..be49a88ca0d71 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml @@ -5,17 +5,9 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Weee\Test\Block\Cart - //div[contains(@class, "column main")] - xpath - - - Magento\Weee\Test\Block\Cart\Totals - #shopping-cart-totals-table - css selector - - - + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml index 690f5ba4ac2ab..533e726582549 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml @@ -5,12 +5,8 @@ * See COPYING.txt for license details. */ --> - - - - Magento\Weee\Test\Block\Product\View - #maincontent - css selector - - - + + + + + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml new file mode 100644 index 0000000000000..fc374dad9cfa4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml @@ -0,0 +1,211 @@ + + + + + + Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl + with_custom_option_and_fpt + 70.00 + 10.00 + 80.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 118.25 + 10.00 + + + + Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax + with_custom_option_and_fpt + 80.00 + 10.00 + 100.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 118.25 + 10.00 + + + + Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax + with_special_price_and_fpt + 110.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 118.25 + 10.00 + + + + Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl, + with_special_price_and_fpt + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 118.25 + 10.00 + + + + Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl + with_custom_option_and_fpt + 70.00 + 10.00 + 80.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 119.08 + 10.00 + + + + Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax + with_custom_option_and_fpt + 80.00 + 10.00 + 100.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 119.08 + 10.00 + + + + Check taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax + with_special_price_and_fpt + 110.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 110.00 + 10.00 + 119.08 + 10.00 + + + + Check taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl + with_special_price_and_fpt + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 100.00 + 10.00 + 110.00 + 119.08 + 10.00 + + + + Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl + with_special_price_and_fpt + 82.38 + 10.00 + 92.38 + 82.38 + 10.00 + 92.38 + 92.38 + 9.24 + 101.62 + 92.38 + 9.24 + 101.62 + 110.00 + 10.00 + + + + Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_incl, display_including_tax + with_special_price_and_fpt + 92.38 + 10.00 + 92.38 + 10.00 + 101.62 + 9.24 + 101.62 + 9.24 + 110.00 + 10.00 + + + + Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax + shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl + with_custom_option_and_fpt + 54.67 + 10.00 + 64.67 + 82.38 + 10.00 + 92.38 + 92.38 + 9.24 + 101.62 + 92.38 + 9.24 + 101.62 + 110.00 + 10.00 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv deleted file mode 100644 index f24d1f7af97e0..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv +++ /dev/null @@ -1,12 +0,0 @@ -"description";"configData";"productData";"prices/category_price";"prices/fpt_category";"prices/fpt_total_category";"prices/product_page_price";"prices/product_page_fpt";"prices/product_page_fpt_total";"prices/cart_item_price";"prices/cart_item_fpt";"prices/cart_item_fpt_total";"prices/cart_item_subtotal";"prices/cart_item_subtotal_fpt";"prices/cart_item_subtotal_fpt_total";"prices/grand_total";"prices/total_fpt";"constraint" -"Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied" -"Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied" -"Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_incl, display_including_tax";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied" -"Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_cat_excl_disc_on_excl,";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied" -"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied" -"Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied" -"Check taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied" -"Check taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied" -"Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl";"with_special_price_and_fpt";"82.38";"10.00";"92.38";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied" -"Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_incl, display_including_tax";"with_special_price_and_fpt";"92.38";"10.00";"";"92.38";"10.00";"";"101.62";"9.24";"";"101.62";"9.24";"";"110.00";"10.00";"assertFptApplied" -"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax";"shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl";"with_custom_option_and_fpt";"54.67";"10.00";"64.67";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied" diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml index 78372ae91b49b..fbe68bd6ea45e 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml @@ -1,12 +1,10 @@ - + - - - high - - + --> + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml index 0f5c10e5e2829..3532f30dbd293 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml @@ -1,26 +1,14 @@ - + - - - - Magento\Core\Test\Block\Messages - .messages - css selector - - - Magento\Wishlist\Test\Block\Customer\Wishlist - #wishlist-view-form - css selector - - - Magento\Wishlist\Test\Block\Customer\Wishlist\Items - .products-grid.wishlist - css selector - - - + --> + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistShare.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistShare.xml index be0e6260d7160..dba7c089ae122 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistShare.xml +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistShare.xml @@ -1,16 +1,12 @@ - + - - - - Magento\Wishlist\Test\Block\Customer\Sharing - .wishlist.share - css selector - - - + --> + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml new file mode 100644 index 0000000000000..c5133aeda2671 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml @@ -0,0 +1,53 @@ + + + + + + catalogProductSimple::default + + + + + + catalogProductVirtual::default + + + + + + downloadableProductInjectable::with_two_separately_links + + + + + + groupedProductInjectable::three_simple_products + + + + + + configurableProductInjectable::default + + + + + + bundleProduct::bundle_dynamic_product + + + + + + bundleProduct::bundle_fixed_product + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv deleted file mode 100644 index 92def772d1f25..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv +++ /dev/null @@ -1,8 +0,0 @@ -"product";"constraint" -"catalogProductSimple::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"catalogProductVirtual::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"downloadableProductInjectable::with_two_separately_links";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"groupedProductInjectable::three_simple_products";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"configurableProductInjectable::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"bundleProduct::bundle_dynamic_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist" -"bundleProduct::bundle_fixed_product";"assertAddProductToWishlistSuccessMessage, assertProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml new file mode 100644 index 0000000000000..eadbe86d985fd --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml @@ -0,0 +1,59 @@ + + + + + + catalogProductSimple::product_100_dollar + 2 + + + + + catalogProductVirtual::product_50_dollar + 1 + + + + + catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar + - + + + + + groupedProductInjectable::three_simple_products + - + + + + + downloadableProductInjectable::with_two_separately_links + - + + + + + configurableProductInjectable::default + 3 + + + + + bundleProduct::bundle_dynamic_product + 2 + + + + + bundleProduct::bundle_fixed_product + 2 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest/test.csv deleted file mode 100644 index 4ced4df743d7e..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest/test.csv +++ /dev/null @@ -1,9 +0,0 @@ -"products";"qty";"constraint" -"catalogProductSimple::product_100_dollar";"2";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"catalogProductVirtual::product_50_dollar";"1";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar";"-";"assertProductQtyInShoppingCart, assertWishlistIsEmpty" -"groupedProductInjectable::three_simple_products";"-";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"downloadableProductInjectable::with_two_separately_links";"-";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"configurableProductInjectable::default";"3";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"bundleProduct::bundle_dynamic_product";"2";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" -"bundleProduct::bundle_fixed_product";"2";"assertProductQtyInShoppingCart, assertProductsIsAbsentInWishlist" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml new file mode 100644 index 0000000000000..303970f253972 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.xml @@ -0,0 +1,31 @@ + + + + + + catalogProductSimple::with_two_custom_option + + + + configurableProductInjectable::default + + + + bundleProduct::bundle_dynamic_product + + + + downloadableProductInjectable::with_two_separately_links + + + + groupedProductInjectable::three_simple_products + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest/test.csv deleted file mode 100644 index 740881766b87f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest/test.csv +++ /dev/null @@ -1,6 +0,0 @@ -"product";"constraint" -"catalogProductSimple::with_two_custom_option";"assertProductInCustomerWishlistOnBackendGrid" -"configurableProductInjectable::default";"assertConfigurableProductInCustomerWishlistOnBackendGrid" -"bundleProduct::bundle_dynamic_product";"assertBundleProductInCustomerWishlistOnBackendGrid" -"downloadableProductInjectable::with_two_separately_links";"assertDownloadableProductInCustomerWishlistOnBackendGrid" -"groupedProductInjectable::three_simple_products";"assertGroupedProductInCustomerWishlistOnBackendGrid" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml new file mode 100644 index 0000000000000..44813340d8752 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml @@ -0,0 +1,36 @@ + + + + + + catalogProductSimple::with_two_custom_option + + + + + configurableProductInjectable::default + + + + + bundleProduct::bundle_dynamic_product + + + + + downloadableProductInjectable::with_two_separately_links + + + + + groupedProductInjectable::three_simple_products + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest/test.csv deleted file mode 100644 index 7b192fe4280b0..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest/test.csv +++ /dev/null @@ -1,6 +0,0 @@ -"product";"constraint" -"catalogProductSimple::with_two_custom_option";"assertProductIsPresentInWishlist, assertProductDetailsInWishlist" -"configurableProductInjectable::default";"assertProductIsPresentInWishlist, assertProductDetailsInWishlist" -"bundleProduct::bundle_dynamic_product";"assertProductIsPresentInWishlist, assertProductDetailsInWishlist" -"downloadableProductInjectable::with_two_separately_links";"assertProductIsPresentInWishlist, assertProductDetailsInWishlist" -"groupedProductInjectable::three_simple_products";"assertProductIsPresentInWishlist, assertProductDetailsInWishlist" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.xml new file mode 100644 index 0000000000000..921283589a7e8 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.xml @@ -0,0 +1,19 @@ + + + + + + configurableProductInjectable::default + + + + catalogProductSimple::simple_for_composite_products + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest/test.csv deleted file mode 100644 index de3b53115610c..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest/test.csv +++ /dev/null @@ -1,3 +0,0 @@ -"product";"constraint" -"configurableProductInjectable::default";"assertProductsIsAbsentInWishlist" -"catalogProductSimple::simple_for_composite_products";"assertProductsIsAbsentInWishlist" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml new file mode 100644 index 0000000000000..7468b99086011 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml @@ -0,0 +1,50 @@ + + + + + + catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar + 1 + + + + catalogProductVirtual::product_50_dollar + 1 + + + + catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar + + + + bundleProduct::bundle_dynamic_product + 1 + + + + bundleProduct::bundle_fixed_product + 1 + + + + configurableProductInjectable::default + 1 + + + + downloadableProductInjectable::with_two_separately_links + 1 + + + + groupedProductInjectable::three_simple_products + 1 + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest/test.csv deleted file mode 100644 index b516c80b40710..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest/test.csv +++ /dev/null @@ -1,9 +0,0 @@ -"products";"removedProductsIndex";"constraint" -"catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar";"1";"assertProductsIsAbsentInWishlist" -"catalogProductVirtual::product_50_dollar";"1";"assertWishlistIsEmpty" -"catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar";"";"assertWishlistIsEmpty" -"bundleProduct::bundle_dynamic_product";"1";"assertWishlistIsEmpty" -"bundleProduct::bundle_fixed_product";"1";"assertWishlistIsEmpty" -"configurableProductInjectable::default";"1";"assertWishlistIsEmpty" -"downloadableProductInjectable::with_two_separately_links";"1";"assertWishlistIsEmpty" -"groupedProductInjectable::three_simple_products";"1";"assertWishlistIsEmpty" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml new file mode 100644 index 0000000000000..92fed502151ac --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml @@ -0,0 +1,51 @@ + + + + + + catalogProductSimple::default + + + + + + catalogProductVirtual::default + + + + + + downloadableProductInjectable::with_two_separately_links + + + + + + + configurableProductInjectable::default + + + + + + + bundleProduct::bundle_dynamic_product + + + + + + + bundleProduct::bundle_fixed_product + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest/test.csv deleted file mode 100644 index d330b2779a670..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest/test.csv +++ /dev/null @@ -1,7 +0,0 @@ -"product";"constraint" -"catalogProductSimple::default";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty" -"catalogProductVirtual::default";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty" -"downloadableProductInjectable::with_two_separately_links";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty, assertProductDetailsInWishlist" -"configurableProductInjectable::default";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty, assertProductDetailsInWishlist" -"bundleProduct::bundle_dynamic_product";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty, assertProductDetailsInWishlist" -"bundleProduct::bundle_fixed_product";"assertMoveProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertCartIsEmpty, assertProductDetailsInWishlist" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml index fa1e7f3966b80..23132cdec5f24 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml @@ -5,12 +5,12 @@ * See COPYING.txt for license details. */ --> - - - - JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com - Sharing message. - assertWishlistShareMessage - - + + + + JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com + Sharing message. + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml new file mode 100644 index 0000000000000..276dc325793d0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml @@ -0,0 +1,31 @@ + + + + + + catalogProductSimple::with_two_custom_option + + + + configurableProductInjectable::default + + + + bundleProduct::bundle_dynamic_product + + + + downloadableProductInjectable::with_two_separately_links + + + + groupedProductInjectable::three_simple_products + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest/test.csv deleted file mode 100644 index 740881766b87f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest/test.csv +++ /dev/null @@ -1,6 +0,0 @@ -"product";"constraint" -"catalogProductSimple::with_two_custom_option";"assertProductInCustomerWishlistOnBackendGrid" -"configurableProductInjectable::default";"assertConfigurableProductInCustomerWishlistOnBackendGrid" -"bundleProduct::bundle_dynamic_product";"assertBundleProductInCustomerWishlistOnBackendGrid" -"downloadableProductInjectable::with_two_separately_links";"assertDownloadableProductInCustomerWishlistOnBackendGrid" -"groupedProductInjectable::three_simple_products";"assertGroupedProductInCustomerWishlistOnBackendGrid" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml index 42b4652c74b79..3290df1d7bf61 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml @@ -1,36 +1,18 @@ - + - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - - low - - + --> + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/page.xml deleted file mode 100644 index 733520475acb2..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/page.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - wishlist/index - Magento\Wishlist\Test\Page\WishlistIndex - - - wishlist/index/share - Magento\Wishlist\Test\Page\WishlistShare - - diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml index aea4b91188244..e875401e6e82d 100644 --- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml +++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml @@ -11,16 +11,16 @@ - - - - - - - - - - + + + + + + + + + +