From e233efa71ec6b717a9fc7416d221805f50028ea6 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Thu, 8 Jan 2015 17:30:12 +0200 Subject: [PATCH 01/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format --- .../Backend/Test/Fixture/GlobalSearch.xml | 5 +- .../Test/Fixture/{ => Source}/Date.php | 2 +- .../Bundle/Test/Fixture/BundleProduct.php | 42 +--- .../Bundle/Test/Fixture/BundleProduct.xml | 185 ++++++++++++------ .../Bundle/Test/Repository/BundleProduct.php | 2 + .../CreateBundleProductEntityTest/test.csv | 30 +-- .../Test/Fixture/CatalogAttributeSet.xml | 17 +- .../Catalog/Test/Fixture/CatalogCategory.xml | 25 ++- .../Test/Fixture/CatalogProductAttribute.php | 2 +- .../Test/Fixture/CatalogProductAttribute.xml | 47 +++-- .../Test/Fixture/CatalogProductSimple.php | 42 +--- .../Test/Fixture/CatalogProductSimple.xml | 105 +++++----- .../Test/Fixture/CatalogProductVirtual.php | 38 ---- .../Test/Fixture/CatalogProductVirtual.xml | 78 ++++---- .../Test/Repository/CatalogProductSimple.php | 36 ++++ .../testCreate.csv | 38 ++-- .../testCreate.csv | 16 +- .../CatalogRule/Test/Fixture/CatalogRule.xml | 35 ++-- .../CatalogRule/Test/Fixture/Conditions.php | 88 --------- .../Test/Fixture/CatalogSearchQuery.xml | 15 +- .../Magento/Checkout/Test/Fixture/Cart.xml | 9 +- .../Fixture/ConfigurableProductInjectable.php | 38 ---- .../Fixture/ConfigurableProductInjectable.xml | 107 +++++----- .../test.csv | 10 +- .../Magento/Core/Test/Fixture/ConfigData.xml | 29 ++- .../Core/Test/Fixture/SystemVariable.xml | 44 ++--- .../Test/Fixture/AddressInjectable.xml | 64 +++--- .../Test/Fixture/CustomerGroupInjectable.xml | 14 +- .../Test/Fixture/CustomerInjectable.xml | 53 +++-- .../Fixture/DownloadableProductInjectable.xml | 173 +++++++++------- .../GiftMessage/Test/Fixture/GiftMessage.xml | 35 ++-- .../Test/Fixture/GoogleShoppingAttribute.xml | 17 +- .../Test/Fixture/GroupedProductInjectable.php | 38 ---- .../Test/Fixture/GroupedProductInjectable.xml | 93 ++++----- .../CreateGroupedProductEntityTest/test.csv | 18 +- .../Test/Fixture/ImportExport.xml | 10 +- .../Magento/Install/Test/Fixture/Install.xml | 56 +++--- .../Integration/Test/Fixture/Integration.xml | 143 +++++++------- .../Newsletter/Test/Fixture/Template.xml | 76 ++++--- .../Test/Block/Adminhtml/AbstractFilter.php | 2 +- .../Block/Adminhtml/Customer/AccountsGrid.php | 2 +- .../Magento/Review/Test/Fixture/Rating.xml | 13 +- .../Review/Test/Fixture/ReviewInjectable.xml | 46 +++-- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 11 +- .../app/Magento/Store/Test/Fixture/Store.xml | 21 +- .../Magento/Store/Test/Fixture/StoreGroup.xml | 18 +- .../Magento/Store/Test/Fixture/Website.xml | 15 +- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 24 +-- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 62 +++--- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 40 ++-- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 21 +- .../User/Test/Fixture/AdminUserRole.xml | 13 +- .../app/Magento/User/Test/Fixture/User.php | 38 +--- .../app/Magento/User/Test/Fixture/User.xml | 27 +-- .../app/Magento/User/Test/Repository/User.php | 6 +- 55 files changed, 1018 insertions(+), 1216 deletions(-) rename dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/{ => Source}/Date.php (97%) delete mode 100755 dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index 141f4854740be..5869198155abc 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -4,13 +4,14 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Magento_Backend query virtual - Magento\Backend\Test\Fixture\Search\Query + Magento\Backend\Test\Fixture\GlobalSearch\Query + catalogProductSimple::default::name diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php similarity index 97% rename from dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php rename to dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php index b7b4a28cdce07..8e96c47dcb672 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ -namespace Magento\Backend\Test\Fixture; +namespace Magento\Backend\Test\Fixture\Source; use Mtf\Fixture\FixtureInterface; diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php index f57d6251fd395..7d627d8945903 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php @@ -31,44 +31,6 @@ class BundleProduct extends InjectableFixture */ protected $handlerInterface = 'Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface'; - /** - * Constructor - * - * @constructor - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - if (!isset($this->data['url_key']) && isset($this->data['name'])) { - $this->data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $this->data['name'])), '-'); - } - } - protected $dataConfig = [ 'type_id' => 'bundle', 'create_url_params' => [ @@ -495,7 +457,7 @@ public function __construct( 'default_value' => '', 'input' => 'price', 'group' => 'advanced-pricing', - 'source' => 'Magento\Backend\Test\Fixture\Date', + 'source' => 'Magento\Backend\Test\Fixture\Source\Date', ]; protected $special_to_date = [ @@ -505,7 +467,7 @@ public function __construct( 'default_value' => '', 'input' => 'price', 'group' => 'advanced-pricing', - 'source' => 'Magento\Backend\Test\Fixture\Date', + 'source' => 'Magento\Backend\Test\Fixture\Source\Date', ]; protected $tax_class_id = [ diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 55e8089bd6d61..8513c0ba27e79 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -6,11 +6,16 @@ --> Magento_Bundle - eav - catalog_product - bundle - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento\Bundle\Test\Repository\BundleProduct + Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface + + bundle + + bundle + 4 + + product + category_ids @@ -18,6 +23,8 @@ 0 text + product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds country_of_manufacture @@ -67,6 +74,7 @@ 0 textarea + product-details enable_googlecheckout @@ -88,7 +96,16 @@ 0 select + autosettings + + use_config_gift_message_available + varchar + 0 + + checkbox + autosettings + group_price decimal @@ -172,8 +189,9 @@ name varchar 1 - + BundleProduct %isolation% text + product-details news_from_date @@ -217,20 +235,47 @@ price Magento\Bundle\Test\Fixture\BundleProduct\Price + product-details + + price_from + decimal + 1 + + price + product-details + + + price_to + decimal + 1 + + price + product-details + price_type int 1 - - + Dynamic + select + product-details + + status + int + 0 + 1 + checkbox + product-details + price_view int 1 select + advanced-pricing quantity_and_stock_status @@ -238,6 +283,7 @@ 0 1 select + product-details required_options @@ -246,12 +292,23 @@ text + + use_config_manage_stock + checkbox + advanced-inventory + + + manage_stock + select + advanced-inventory + shipment_type int 1 - + select + product-details short_description @@ -259,6 +316,7 @@ 0 textarea + autosettings sku @@ -266,14 +324,32 @@ 1 text + product-details sku_type int 1 - - + Dynamic + select + product-details + + weight_type + int + 1 + Dynamic + select + product-details + + + weight + decimal + 0 + + text + product-details + small_image varchar @@ -298,38 +374,30 @@ special_from_date - decimal + data 0 price advanced-pricing - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date special_to_date - decimal + data 0 price advanced-pricing - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date - - status - int - 0 - Product online - checkbox - product-details - tax_class_id int 0 Taxable Goods - Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass select product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass thumbnail @@ -351,6 +419,8 @@ 0 text + advanced-pricing + Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions updated_at @@ -380,21 +450,8 @@ 0 4 select + autosettings - - weight - decimal - 0 - - weight - - - weight_type - int - 1 - - - id virtual @@ -404,45 +461,47 @@ virtual 1 bundle - Magento\Bundle\Test\Fixture\Bundle\BundleSelections + Magento\Bundle\Test\Fixture\BundleProduct\BundleSelections checkout_data virtual - - Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData + 1 + + Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData custom_options virtual - customer-options 0 + customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions type_id virtual + + new_variations_attribute_set_id + + + affect_bundle_product_selection + + + stock_data + advanced-inventory + + + category_id + product-details + + + website_ids + virtual + + Main Website + + websites + - - - - - - - - - - - - - - - bundle - 4 - - product - - Magento\Bundle\Test\Repository\BundleProduct - Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php index 17da93995796b..a411597d55de6 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php @@ -38,6 +38,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight_type' => '0', 'status' => 'Product online', 'shipment_type' => '1', + 'url_key' => 'bundle-dynamic-product-%isolation%', 'mtf_dataset_name' => 'BundleDynamic_sku_1073507449', 'website_ids' => ['Main Website'], ]; @@ -56,6 +57,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight_type' => '0', 'price_type' => '0', 'shipment_type' => '1', + 'url_key' => 'bundle-dynamic-product-%isolation%', 'mtf_dataset_name' => 'BundleDynamic_sku_215249172', 'website_ids' => ['Main Website'], ]; 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 index 53d0c45423592..544b8df3a6774 100644 --- 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 @@ -1,15 +1,15 @@ -"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" -"BundleProduct %isolation%";"-";"bundle_sku_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Bundle Product Dynamic Required";"-";"-";"-";"-";"-";"-";"No";"No";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage" -"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductNotSearchableBySku" -"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType" -"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage" -"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType" -"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView" -"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage" -"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory" -"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"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 Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" -"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" +"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory" +"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" +"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" +"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" +"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index b249dde29f986..309c63e8041b9 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -6,9 +6,8 @@ --> Magento_Catalog - flat - eav_attribute_set - Magento\Catalog\Model\Resource\Product\Link\Product\Collection + Magento\Catalog\Test\Repository\CatalogAttributeSet + Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface attribute_set_id @@ -28,7 +27,7 @@ attribute_set_name varchar - + Default_attribute_set_%isolation% @@ -40,7 +39,13 @@ skeleton_set - virtual + varchar + + + default + + + Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet assigned_attributes @@ -52,6 +57,4 @@ virtual - Magento\Catalog\Test\Repository\CatalogAttributeSet - Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml index 5dc07dec38da4..f29368c9b8310 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml @@ -6,9 +6,8 @@ --> Magento_Catalog - eav - catalog_category_entity - Magento\Catalog\Model\Resource\Category\Collection + Magento\Catalog\Test\Repository\CatalogCategory + Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface entity_id @@ -42,9 +41,10 @@ parent_id int - 0 - Magento\Catalog\Test\Fixture\CatalogCategory\ParentId + 2 + + Magento\Catalog\Test\Fixture\CatalogCategory\ParentId created_at @@ -64,7 +64,8 @@ path varchar - + Default Category + @@ -93,6 +94,7 @@ int + display_setting checkbox @@ -100,6 +102,7 @@ varchar 0 + display_setting multiselect @@ -107,6 +110,7 @@ varchar 0 + display_setting checkbox @@ -114,6 +118,7 @@ varchar 0 + display_setting select @@ -126,16 +131,19 @@ id virtual + name virtual general_information + Category%isolation% is_active virtual general_information + Yes is_anchor @@ -146,11 +154,13 @@ url_key virtual general_information + category%isolation% include_in_menu virtual general_information + Yes landing_page @@ -167,9 +177,8 @@ category_products virtual + category_products Magento\Catalog\Test\Fixture\CatalogCategory\CategoryProducts - Magento\Catalog\Test\Repository\CatalogCategory - Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php index c768e8d0ac681..415388661176c 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php @@ -363,7 +363,7 @@ class CatalogProductAttribute extends InjectableFixture 'attribute_code' => 'default_value_date', 'backend_type' => 'text', 'group' => 'advanced-properties', - 'source' => 'Magento\Backend\Test\Fixture\Date', + 'source' => 'Magento\Backend\Test\Fixture\Source\Date', ]; protected $default_value_yesno = [ diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index ad27b621ed4d9..354ed55b2493d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -6,12 +6,8 @@ --> Magento_Catalog - composite - - eav_attribute - catalog_eav_attribute - - Magento\Catalog\Model\Resource\Attribute + Magento\Catalog\Test\Repository\CatalogProductAttribute + Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface attribute_id @@ -33,6 +29,7 @@ + advanced-properties attribute_model @@ -73,18 +70,26 @@ frontend_input varchar - - + Text Field + select properties frontend_label varchar - + attribute_label%isolation% properties + + manage_frontend_label + varchar + + + + manage-labels + frontend_class varchar @@ -103,8 +108,8 @@ is_required smallint - 0 - + No + select properties @@ -120,6 +125,7 @@ 0 + advanced-properties note @@ -141,6 +147,7 @@ 1 + advanced-properties is_visible @@ -155,6 +162,7 @@ 0 + frontend-properties is_filterable @@ -162,6 +170,7 @@ 0 + frontend-properties is_comparable @@ -169,6 +178,7 @@ 0 + frontend-properties is_visible_on_front @@ -176,6 +186,7 @@ 0 + frontend-properties is_html_allowed_on_front @@ -183,6 +194,7 @@ 0 + frontend-properties is_used_for_price_rules @@ -190,6 +202,7 @@ 0 + frontend-properties is_filterable_in_search @@ -197,6 +210,7 @@ 0 + frontend-properties used_in_product_listing @@ -204,6 +218,7 @@ 0 + frontend-properties used_for_sort_by @@ -211,6 +226,7 @@ 0 + frontend-properties apply_to @@ -225,6 +241,7 @@ 0 + frontend-properties position @@ -253,6 +270,7 @@ + advanced-properties search_weight @@ -272,20 +290,23 @@ default_value_text text + advanced-properties default_value_textarea text + advanced-properties default_value_date text + advanced-properties + Magento\Backend\Test\Fixture\Source\Date default_value_yesno text + advanced-properties - Magento\Catalog\Test\Repository\CatalogProductAttribute - Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogAttributeEntityInterface diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php index 51e5b73d7c450..1c52b99e2427e 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php @@ -31,44 +31,6 @@ class CatalogProductSimple extends InjectableFixture */ protected $handlerInterface = 'Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface'; - /** - * Constructor - * - * @constructor - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - if (!isset($this->data['url_key']) && isset($this->data['name'])) { - $this->data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $this->data['name'])), '-'); - } - } - protected $dataConfig = [ 'type_id' => 'simple', 'create_url_params' => [ @@ -545,7 +507,7 @@ public function __construct( 'is_required' => '0', 'default_value' => '', 'input' => 'date', - 'source' => 'Magento\Backend\Test\Fixture\Date', + 'source' => 'Magento\Backend\Test\Fixture\Source\Date', ]; protected $news_to_date = [ @@ -554,7 +516,7 @@ public function __construct( 'is_required' => '0', 'default_value' => '', 'input' => 'date', - 'source' => 'Magento\Backend\Test\Fixture\Date', + 'source' => 'Magento\Backend\Test\Fixture\Source\Date', ]; protected $stock_data = [ diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 85a48583b0da8..faac0d8d11b8a 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -6,11 +6,16 @@ --> Magento_Catalog - eav - catalog_product - simple - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento\Catalog\Test\Repository\CatalogProductSimple + Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface + + simple + + simple + 4 + + product + category_ids @@ -99,7 +104,7 @@ text advanced-pricing - Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions has_options @@ -185,24 +190,10 @@ name varchar 1 - + Test simple product %isolation% text product-details - - news_from_date - datetime - 0 - - date - - - news_to_date - datetime - 0 - - date - old_id int @@ -228,17 +219,22 @@ price decimal 1 - + + 100 + price product-details - Magento\Catalog\Test\Fixture\CatalogProductSimple\Price + Magento\Catalog\Test\Fixture\CatalogProductSimple\Price quantity_and_stock_status - int + array 0 - In Stock - select + + 10 + In Stock + + product-details @@ -252,7 +248,7 @@ sku static 1 - + test_simple_sku_%isolation% text product-details @@ -314,8 +310,8 @@ 0 Taxable Goods select - Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass thumbnail @@ -338,7 +334,7 @@ text advanced-pricing - Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions updated_at @@ -374,27 +370,30 @@ weight decimal 0 - + 12 weight product-details id virtual + type_id virtual - attribute_set_id virtual - Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId + + default + - attributes + custom_attribute virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomAttribute @@ -404,12 +403,14 @@ virtual 0 customer-options - Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions website_ids virtual - Main Website + + Main Website + websites @@ -420,6 +421,22 @@ select autosettings + + news_from_date + datetime + 0 + + date + Magento\Backend\Test\Fixture\Source\Date + + + news_to_date + datetime + 0 + + date + Magento\Backend\Test\Fixture\Source\Date + stock_data virtual @@ -428,7 +445,7 @@ checkout_data virtual - + Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData @@ -468,20 +485,4 @@ Magento\Catalog\Test\Fixture\CatalogProductSimple\Fpt - - - - - - - - - - simple - 4 - - product - - Magento\Catalog\Test\Repository\CatalogProductSimple - Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php index a74bec91358b0..a8481cc09ba08 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php @@ -30,44 +30,6 @@ class CatalogProductVirtual extends InjectableFixture */ protected $handlerInterface = 'Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface'; - /** - * Constructor - * - * @constructor - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - if (!isset($data['url_key']) && isset($data['name'])) { - $data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $data['name'])), '-'); - } - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - } - protected $dataConfig = [ 'type_id' => 'virtual', 'create_url_params' => [ diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 0e02dbdf8c3ed..72d99ea6ab096 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -6,19 +6,30 @@ --> Magento_Catalog - eav - catalog_product - virtual - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento\Catalog\Test\Repository\CatalogProductVirtual + Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface + + virtual + + virtual + 4 + + product + + + is_virtual + virtual + product-details + Yes + category_ids static 0 text - Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds + Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds product-details @@ -99,7 +110,7 @@ text advanced-pricing - Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions has_options @@ -185,7 +196,7 @@ name varchar 1 - + Test virtual product %isolation% text product-details @@ -228,16 +239,21 @@ price decimal 1 - + + 100 + price product-details - Magento\Catalog\Test\Fixture\CatalogProductSimple\Price + Magento\Catalog\Test\Fixture\CatalogProductSimple\Price quantity_and_stock_status int 0 - In Stock + + 10 + In Stock + select product-details @@ -252,7 +268,7 @@ sku static 1 - + sku_test_virtual_product_%isolation% text product-details @@ -315,6 +331,7 @@ Taxable Goods select product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass thumbnail @@ -337,7 +354,7 @@ text advanced-pricing - Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions updated_at @@ -352,7 +369,7 @@ 0 text - autosettings + search-engine-optimization url_path @@ -381,10 +398,6 @@ id virtual - - is_virtual - virtual - type_id virtual @@ -392,46 +405,29 @@ attribute_set_id virtual - Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId custom_options virtual 0 customer-options - Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions + Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions website_ids virtual - Main Website + + Main Website + websites checkout_data virtual - + Magento\Catalog\Test\Fixture\CatalogProductVirtual\CheckoutData - - - - - - - - - - virtual - - - virtual - 4 - - product - - Magento\Catalog\Test\Repository\CatalogProductVirtual - Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php index 77a622769c40c..0914dfa8920b6 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php @@ -37,6 +37,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'tax_class_id' => ['dataSet' => 'Taxable Goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'order_default'], ]; @@ -69,6 +70,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'tax_class_id' => ['dataSet' => 'Taxable Goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'order_big_qty'], ]; @@ -85,6 +87,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'tax_class_id' => ['dataSet' => 'Taxable Goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'order_custom_price'], ]; @@ -100,6 +103,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'attribute_set_id' => ['dataSet' => 'default'], 'price' => ['value' => 100, 'preset' => '-'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'two_products'] ]; @@ -115,6 +119,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'attribute_set_id' => ['dataSet' => 'default'], 'price' => ['value' => 40, 'preset' => '-'], 'mtf_dataset_name' => '40_dollar_product', + 'url_key' => 'simple-product-%isolation%', 'website_ids' => ['Main Website'], ]; @@ -132,6 +137,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'category_ids' => ['presets' => 'default_subcategory'], 'mtf_dataset_name' => 'simple_with_category', 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['product_with_category'] = [ @@ -147,6 +153,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'category_ids' => ['presets' => 'default_subcategory'], 'website_ids' => ['Main Website'], 'mtf_dataset_name' => 'simple_with_category', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_for_salesrule_1'] = [ @@ -161,6 +168,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 100, 'preset' => ''], 'weight' => 100, 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', 'category_ids' => ['presets' => 'default_subcategory'] ]; @@ -193,6 +201,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 50, 'preset' => ''], 'weight' => 50, 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', 'category_ids' => ['presets' => 'default_subcategory'] ]; @@ -204,6 +213,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'special_price' => 90, 'category_ids' => ['presets' => 'default_subcategory'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['product_with_special_price'] = [ @@ -213,6 +223,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 10, 'preset' => ''], 'special_price' => 9, 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['adc_123_simple_for_advancedsearch'] = [ @@ -229,6 +240,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'status' => 'Product online', 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['product_with_weight_0_1'] = [ @@ -245,6 +257,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'status' => 'Product online', 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['product_with_weight_150_1'] = [ @@ -261,6 +274,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'status' => 'Product online', 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['abc_dfj_simple_for_advancedsearch'] = [ @@ -278,6 +292,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'short_description' => '

abc_short

', 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['100_dollar_product_for_tax_rule'] = [ @@ -292,6 +307,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 1, 'price' => ['value' => 100, 'preset' => '-'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['withSpecialPrice'] = [ @@ -301,6 +317,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'sku_simple_product_%isolation%', 'price' => ['value' => 100, 'preset' => '-'], 'weight' => 1, + 'url_key' => 'simple-product-%isolation%', 'special_price' => 9 ]; @@ -312,6 +329,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 100, 'preset' => '-'], 'weight' => 1, 'group_price' => ['preset' => 'default'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_with_group_price_and_category'] = [ @@ -324,6 +342,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'group_price' => ['preset' => 'tax_calculation'], 'category_ids' => ['presets' => 'default_subcategory'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_with_tier_price'] = [ @@ -334,6 +353,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 300, 'preset' => '-'], 'weight' => 1, 'tier_price' => ['preset' => 'default'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_with_tier_price_and_category'] = [ @@ -346,6 +366,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'tier_price' => ['preset' => 'default'], 'category_ids' => ['presets' => 'default_subcategory'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['with_two_custom_option'] = [ @@ -356,6 +377,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 300, 'preset' => '-'], 'weight' => 1, 'custom_options' => ['preset' => 'two_options'], + 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'with_two_custom_option'] ]; @@ -369,6 +391,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'], 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', 'category_ids' => ['presets' => 'default_subcategory'], ]; @@ -379,6 +402,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'sku_simple_product_%isolation%', 'price' => ['value' => 300, 'preset' => '-'], 'weight' => 1, + 'url_key' => 'simple-product-%isolation%', 'custom_options' => ['preset' => 'all_types'], ]; @@ -398,6 +422,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'attribute_set_id' => ['dataSet' => 'default'], 'price' => ['value' => 100, 'preset' => '-'], 'website_ids' => ['Main Website'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['out_of_stock'] = [ @@ -414,6 +439,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['offline'] = [ @@ -431,6 +457,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], 'status' => 'Product offline', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['not_visible_individually'] = [ @@ -447,6 +474,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'website_ids' => ['Main Website'], 'visibility' => 'Not Visible Individually', 'checkout_data' => ['preset' => 'order_default'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_with_cart_limits'] = [ @@ -467,6 +495,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'min_sale_qty' => '2', 'max_sale_qty' => '5', ], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['with_one_custom_option'] = [ @@ -478,6 +507,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 1, 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'], 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], + 'url_key' => 'simple-product-%isolation%', 'website_ids' => ['Main Website'] ]; @@ -499,6 +529,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'enable_qty_increments' => 'Yes', 'qty_increments' => '2', ], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['simple_with_tier_price_and_qty'] = [ @@ -512,6 +543,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'qty' => 25.0000, 'is_in_stock' => 'In Stock', ], + 'url_key' => 'simple-product-%isolation%', 'tier_price' => ['preset' => 'default'], 'website_ids' => ['Main Website'] ]; @@ -545,6 +577,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], 'website_ids' => ['Main Website'], 'category_ids' => ['presets' => 'default_subcategory'], + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['product_with_category_with_anchor'] = [ @@ -560,6 +593,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'category_ids' => ['presets' => 'default_anchor_subcategory'], 'website_ids' => ['Main Website'], 'mtf_dataset_name' => 'simple_with_category', + 'url_key' => 'simple-product-%isolation%', ]; $this->_data['with_custom_option_and_fpt'] = [ @@ -573,6 +607,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 1, 'custom_options' => ['preset' => 'drop_down_with_one_option_fixed_price'], 'checkout_data' => ['preset' => 'drop_down_with_one_option_fixed_price'], + 'url_key' => 'simple-product-%isolation%', 'fpt' => ['preset' => 'one_fpt_for_all_states'] ]; @@ -586,6 +621,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'price' => ['value' => 110, 'preset' => '-'], 'special_price' => 100, 'weight' => 1, + 'url_key' => 'simple-product-%isolation%', 'fpt' => ['preset' => 'one_fpt_for_all_states'] ]; } 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 index bcce9e2518fce..553e7532b6063 100644 --- 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 @@ -1,19 +1,19 @@ -"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_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_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_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_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_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_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_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_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_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage" -"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_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock" -"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_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage" -"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_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_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_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_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" +"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/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv index cbc73ef8063d8..dc44ec2e9cf81 100644 --- 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 @@ -1,8 +1,8 @@ -"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" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku" -"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory" -"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" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock" +"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/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index 26587fee40e86..0ee099bee4564 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -6,21 +6,20 @@ --> Magento_CatalogRule - eav - catalog_rule - Magento\CatalogRule\Model\Resource\Rule\Product\Price\Collection + Magento\CatalogRule\Test\Repository\CatalogRule + Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface name varchar 1 - + CatalogPriceRule %isolation% text rule_information description - + Catalog Price Rule Description text rule_information @@ -28,7 +27,7 @@ is_active smallint 1 - + Active select rule_information @@ -36,7 +35,9 @@ website_ids smallint 1 - + + Main Website + multiselect rule_information @@ -44,18 +45,12 @@ customer_group_ids smallint 1 - + + NOT LOGGED IN + multiselect rule_information - - website_ids - smallint - 1 - - multiselect - rule_information - from_date date @@ -76,7 +71,7 @@ simple_action smallint 0 - + By Percentage of the Original Price select actions @@ -84,7 +79,7 @@ discount_amount decimal 1 - + 50 text actions @@ -104,7 +99,7 @@ rule virtual - 0l + 0 conditions @@ -129,6 +124,4 @@ rule_information - Magento\CatalogRule\Test\Repository\CatalogRule - Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php deleted file mode 100755 index 20e922488d0ee..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php +++ /dev/null @@ -1,88 +0,0 @@ -params = $params; - if (isset($data['product'])) { - list($fixture, $dataSet) = explode('::', $data['product']); - $this->product = $fixtureFactory->createByCode($fixture, ['dataSet' => $dataSet]); - $this->product->persist(); - - /** @var CategoryIds $sourceCategories */ - $sourceCategories = $this->product->getDataFieldConfig('category_ids')['source']; - $this->data = $sourceCategories->getIds()[0]; - } - } - - /** - * Persist conditions - * - * @return void - */ - public function persist() - { - // - } - - /** - * Return prepared data set - * - * @param $key [optional] - * @return mixed - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function getData($key = null) - { - return $this->data; - } - - /** - * Return data set configuration settings - * - * @return string - */ - public function getDataConfig() - { - return $this->params; - } - - /** - * Get product for verification - * - * @return \Magento\Catalog\Test\Fixture\CatalogProductSimple - */ - public function getProduct() - { - return $this->product; - } -} diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index a37fef731c6f1..6fd8838674d3c 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -6,9 +6,8 @@ --> Magento_CatalogSearch - flat - search_query - Magento\Search\Model\Resource\Query\Collection + Magento\CatalogSearch\Test\Repository\CatalogSearchQuery + Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface query_id @@ -23,7 +22,7 @@ - Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\SearchData + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\QueryText num_results @@ -64,14 +63,14 @@ display_in_terms smallint - 1 + is_active smallint - 1 + @@ -85,10 +84,8 @@ updated_at timestamp - CURRENT_TIMESTAMP + - Magento\CatalogSearch\Test\Repository\CatalogSearchQuery - Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index 730a27399704b..634efabbf4f61 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -6,9 +6,8 @@ --> Magento_Checkout - flat - sales_quote - Magento\Checkout\Model\Resource\Cart + Magento\Checkout\Test\Repository\Cart + Magento\Checkout\Test\Handler\Cart\CartInterface entity_id @@ -375,10 +374,8 @@ checkout_data virtual - + Magento\Checkout\Test\Fixture\Cart\CheckoutData - Magento\Checkout\Test\Repository\Cart - Magento\Checkout\Test\Handler\Cart\CartInterface diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php index dab31db106df8..4b90448382bee 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php @@ -32,44 +32,6 @@ class ConfigurableProductInjectable extends InjectableFixture protected $handlerInterface = 'Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface'; // @codingStandardsIgnoreEnd - /** - * Constructor - * - * @constructor - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - if (!isset($data['url_key']) && isset($data['name'])) { - $data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $data['name'])), '-'); - } - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - } - protected $dataConfig = [ 'type_id' => 'configurable', 'create_url_params' => [ diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index bdac55145fac0..793a3f3482479 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -6,11 +6,16 @@ --> Magento_ConfigurableProduct - eav - catalog_product - configurable - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable + Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface + + configurable + + configurable + 4 + + product + category_ids @@ -21,14 +26,6 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - configurable_attributes_data - virtual - 0 - variations - variations - Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData - color int @@ -90,7 +87,7 @@ enable_googlecheckout int 0 - 1 + No select @@ -190,16 +187,16 @@ msrp_display_actual_price_type varchar 0 - 4 + select name varchar 1 - + Configurable Product %isolation% text - product_info_tabs_product-details + product-details news_from_date @@ -226,7 +223,7 @@ options_container varchar 0 - container2 + select @@ -240,18 +237,22 @@ price decimal 1 - + + 100 + price - product_info_tabs_product-details + product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price quantity_and_stock_status int 0 - 1 + + In Stock + select - product_info_tabs_product-details + product-details required_options @@ -272,9 +273,9 @@ sku static 1 - + sku_configurable_product_%isolation% text - product_info_tabs_product-details + product-details small_image @@ -324,8 +325,10 @@ tax_class_id int 0 - 2 + Taxable Goods select + product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass thumbnail @@ -348,6 +351,7 @@ text advanced-pricing + Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions updated_at @@ -360,7 +364,7 @@ url_key varchar 0 - + configurable-product-%isolation% text search-engine-optimization @@ -375,7 +379,7 @@ visibility int 0 - 4 + Catalog, Search select autosettings @@ -383,13 +387,14 @@ weight decimal 0 - + 1 weight - product_info_tabs_product-details + product-details is_virtual virtual + product-details id @@ -398,40 +403,58 @@ type_id virtual - + + configurable attribute_set_id - Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId virtual product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId + + default + attribute_set_name virtual - product-details + variations affected_attribute_set virtual + custom_options virtual - customer-options 0 + customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions + + configurable_attributes_data + virtual + 0 + variations + variations + Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData + + default + + website_ids virtual - Main Website + + Main Website + websites checkout_data virtual - + Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData @@ -441,18 +464,4 @@ Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts - - - - - - - - - - configurable - 4 - - product - 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 index 86da61ac30da5..c282092f255db 100644 --- 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 @@ -1,5 +1,5 @@ -"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" -"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";"" -"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";"" -"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";"" -"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";"" +"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/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index efde4b4e8547c..0ba0ecb06b37c 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -6,9 +6,8 @@ --> Magento_Core - flat - core_config_data - Magento\Core\Model\Resource\Config\Data\Collection + Magento\Core\Test\Repository\ConfigData + Magento\Core\Test\Handler\ConfigData\ConfigDataInterface
section @@ -18,38 +17,36 @@ config_id int 1 - - + + scope varchar - + default - + scope_id int - + 0 - + path varchar - + general - + value text - - - + + + - Magento\Core\Test\Repository\ConfigData - Magento\Core\Test\Handler\ConfigData\ConfigDataInterface diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index aceef486e57ed..2e484e33e4e34 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -6,61 +6,56 @@ --> Magento_Core - composite - - core_variable - core_variable_value - - Magento\Core\Model\Resource\Variable\Collection + Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface variable_id int - + 0 - + code varchar - - - + + variableCode%isolation% + name varchar - - - + + variableName%isolation% + value_id int 1 - - + + store_id smallint - + 0 - + plain_value text - - - + + plain_value + html_value text - - - + +

html_value

 + use_default_value @@ -68,5 +63,4 @@ select - Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index af62a2af116ea..9ac81d613b239 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -6,29 +6,42 @@ --> Magento_Customer - eav - customer_address - Magento\Customer\Model\Resource\Address\Collection + Magento\Customer\Test\Repository\AddressInjectable + Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface city varchar 1 - + Culver City text + + default_billing + varchar + 1 + + checkbox + + + default_shipping + varchar + 1 + + checkbox + company varchar 0 - + Magento %isolation% text country_id varchar 1 - + United States select @@ -42,16 +55,23 @@ firstname varchar 1 - + John text lastname varchar 1 - + Doe text + + email + varchar + 1 + John.Doe%isolation%@example.com + text + middlename varchar @@ -63,7 +83,7 @@ postcode varchar 0 - + 90230 text @@ -84,14 +104,14 @@ region_id int 0 - + California hidden street text 1 - + 6161 West Centinela Avenue multiline @@ -105,7 +125,7 @@ telephone varchar 1 - + 555-55-555-55 text @@ -143,25 +163,5 @@ text - - default_billing - int - 0 - - checkbox - - - default_shipping - int - 0 - - checkbox - - - email - virtual - - Magento\Customer\Test\Repository\AddressInjectable - Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 682510d637f3a..70b4373b8a6c0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -4,11 +4,10 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Magento_Customer - flat - customer_group - Magento\Customer\Model\Resource\Group\Collection + Magento\Customer\Test\Repository\CustomerGroupInjectable + Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface code @@ -21,14 +20,15 @@ tax_class varchar 1 - Retail Customer + + customer_tax_class + select + Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds customer_group_id virtual - Magento\Customer\Test\Repository\CustomerGroupInjectable - Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index 3a67710b5e305..49093fd194cee 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -6,10 +6,8 @@ --> Magento_Customer - eav - customer - Magento\Customer\Model\Resource\Customer\Collection - email + Magento\Customer\Test\Repository\CustomerInjectable + Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface
address @@ -23,6 +21,11 @@ text + + id + virtual + + created_at static @@ -30,11 +33,6 @@ date - - id - virtual - null - created_in varchar @@ -77,7 +75,7 @@ email static 1 - + John.Doe%isolation%@example.com text account_information @@ -85,7 +83,7 @@ firstname varchar 1 - + John text account_information @@ -110,7 +108,7 @@ lastname varchar 1 - + Doe text account_information @@ -175,14 +173,6 @@ text account_information - - amount_delta - varchar - 0 - - text - store_credit - website_id static @@ -191,6 +181,14 @@ select account_information + + amount_delta + static + 1 + + text + store_credit + is_subscribed virtual @@ -198,24 +196,19 @@ password virtual + + 123123q password_confirmation virtual + + 123123q - - reward_points_delta - virtual - Magento\Customer\Test\Fixture\CustomerInjectable\RewardPoints - - - store_credit - virtual - current_password virtual + - Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index c840fdbd60f34..94e9e2d6da18b 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -6,11 +6,16 @@ --> Magento_Downloadable - eav - catalog_product - downloadable - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento\Downloadable\Test\Repository\DownloadableProductInjectable + Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface + + downloadable + + downloadable + 4 + + product + category_ids @@ -67,7 +72,7 @@ description text 0 - + This is description for downloadable product textarea product-details @@ -91,6 +96,8 @@ 0 text + advanced-pricing + Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions has_options @@ -194,8 +201,9 @@ name varchar 1 - + DownloadableProduct_%isolation% text + product-details news_from_date @@ -236,10 +244,29 @@ price decimal 1 - + + 100 + price + product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price + + stock_data + text + advanced-inventory + + + quantity_and_stock_status + int + 0 + + 1 + In Stock + + select + product-details + related_tgtr_position_behavior int @@ -272,16 +299,43 @@ short_description text 0 - + This is short description for downloadable product textarea - autosetting + autosettings + + downloadable + virtual + 0 + downloadable_information + + + downloadable_items + text + 0 + + default + + text + downloadable_information + Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Links + + + downloadable_sample + text + 0 + dafault + text + downloadable_information + Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples + sku static 1 - + DownloadableProduct_%isolation% text + product-details small_image @@ -308,7 +362,8 @@ special_price decimal 0 - + 10 + advanced-pricing special_to_date @@ -323,15 +378,18 @@ 0 1 select + product-details tax_class_id int 0 - 2 - Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - product-details + + Taxable Goods + select + product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass thumbnail @@ -351,8 +409,10 @@ tier_price decimal 0 - + default text + advanced-pricing + Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions updated_at @@ -379,7 +439,7 @@ url_key varchar 0 - + downloadableproduct_%isolation% text search-engine-optimization @@ -396,6 +456,7 @@ 0 4 select + autosettings weight @@ -403,79 +464,39 @@ 0 weight + product-details + + custom_options + virtual + 0 + default + customer-options + Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions + id virtual - - inventory_manage_stock - select - - - quantity_and_stock_status - select - - - inventory_qty - text - - - stock_data_use_config_min_qty - checkbox - - - stock_data_min_qty - text - + + is_virtual + virtual + product-details + Yes + website_ids virtual - Main Website + + Main Website + websites - - downloadable_links - virtual - downloadable_information - Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Links - - - downloadable_sample - virtual - downloadable_information - Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples - checkout_data virtual - + Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\CheckoutData - - is_virtual - virtual - product-details - - - - - - - - - - - - - - - downloadable - 4 - - product - - Magento\Downloadable\Test\Repository\DownloadableProductInjectable - Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index dd8aa1f71833c..bbb7fb0c1c738 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -6,53 +6,52 @@ --> Magento_GiftMessage - flat - gift_message - Magento\GiftMessage\Model\Resource\Message\Collection - gift_message_id + Magento\GiftMessage\Test\Repository\GiftMessage gift_message_id int 1 - - + + customer_id int - + 0 - + sender varchar - - - + + John Doe + recipient varchar - - - + + Jane Doe + message text - - - + + text_%isolation% + allow_gift_options virtual + Yes allow_gift_messages_for_order virtual + Yes allow_gift_options_for_items @@ -61,7 +60,7 @@ items virtual + Magento\GiftMessage\Test\Fixture\GiftMessage\Items - Magento\GiftMessage\Test\Repository\GiftMessage diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index 945718f559221..a9bbfae56906a 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -6,9 +6,8 @@ --> Magento_GoogleShopping - flat - googleshopping_types - Magento\GoogleShopping\Model\Resource\Attribute\Collection + Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute + Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface type_id @@ -20,26 +19,26 @@ attribute_set_id smallint - Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId - + + default + + Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId target_country varchar - US + United States category varchar - + Apparel & Accessories - Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute - Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php index db361ed645bef..231f625dbd350 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php @@ -33,44 +33,6 @@ class GroupedProductInjectable extends InjectableFixture protected $handlerInterface = 'Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface'; // @codingStandardsIgnoreEnd - /** - * Constructor - * - * @constructor - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - if (!isset($this->data['url_key']) && isset($this->data['name'])) { - $this->data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $this->data['name'])), '-'); - } - } - protected $dataConfig = [ 'type_id' => 'grouped', 'create_url_params' => [ diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index 1a7fbef9f89c6..c65ecf1c4f8c6 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -5,12 +5,17 @@ */ --> - Magento_Catalog - eav - catalog_product - grouped - Magento\Catalog\Model\Resource\Product\Collection - sku + Magento_GroupedProduct + Magento\GroupedProduct\Test\Repository\GroupedProductInjectable + Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface + + grouped + + grouped + 4 + + product + category_ids @@ -18,6 +23,8 @@ 0 text + product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds country_of_manufacture @@ -40,6 +47,13 @@ select + + associated + virtual + 1 + grouped + Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Associated + custom_design_from datetime @@ -65,8 +79,9 @@ description text 0 - - textarea + This is description for grouped product + + product-details gallery @@ -142,8 +157,9 @@ name varchar 1 - + GroupedProduct_%isolation% text + product-details news_from_date @@ -184,9 +200,17 @@ quantity_and_stock_status int 0 - 1 + + 1 + In Stock + select + product-details + + stock_data + advanced-inventory + related_tgtr_position_behavior int @@ -212,15 +236,17 @@ short_description text 0 - - textarea + This is short description for grouped product + + autosettings sku static 1 - + GroupedProduct_%isolation% text + product-details small_image @@ -304,60 +330,37 @@ id virtual - - associated - virtual - grouped - 1 - Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\GroupedProducts - type_id virtual attribute_set_id - Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId virtual product-details + Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId website_ids virtual - Main Website + + Main Website + websites price virtual - 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Price + Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Price - - stock_data - advanced-inventory - checkout_data virtual - + Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData + + Taxable Goods + - - - - - - - - - - grouped - 4 - - product - - Magento\Catalog\Test\Repository\GroupedProductInjectable - Magento\Catalog\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface - 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 index 6c8d715e10f0f..126e091ed4e80 100644 --- 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 @@ -1,9 +1,9 @@ -"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" -"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" -"GroupedProduct %isolation%";"-";"In Stock";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertProductInStock, assertProductSkuAutoGenerated, assertProductSearchableBySku" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"Out of Stock";"category_%isolation%";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertProductOutOfStock" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::simple_for_composite_products";"defaultSimpleProduct";"-";"No";"assertGroupedProductsDefaultQty, assertGroupedProductForm, assertProductPage" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct";"-";"No";"assertSpecialPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_with_group_price,catalogProductSimple::simple_with_group_price";"defaultSimpleProduct";"-";"No";"assertGroupedPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductVirtual::virtual_product,catalogProductVirtual::virtual_product";"defaultVirtualProduct";"-";"Yes";"assertProductSaveMessage, assertGroupedProductsDefaultQty" -"GroupedProduct %isolation%";"GroupedProduct_sku%isolation%";"In Stock";"category_%isolation%";"-";"catalogProductSimple::simple_with_tier_price,catalogProductSimple::simple_with_tier_price";"defaultSimpleProduct";"-";"No";"assertTierPriceOnGroupedProductPage, assertGroupedProductForm, assertProductPage" +"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/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 033aac4d39a7a..45cbd608d7a16 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -6,8 +6,6 @@ --> Magento_ImportExport - flat - importexport_importdata id @@ -20,22 +18,22 @@ entity varchar - + Products behavior varchar - append + CSV - + data longtext - + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index fffac95c70386..a557a19703a36 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -6,8 +6,8 @@ --> Magento_Install - virtual - install + Magento\Install\Test\Repository\Install + Magento\Install\Test\Handler\Install\InstallInterface dbHost @@ -17,50 +17,62 @@ dbUser virtual - - dbTablePrefix - virtual - dbPassword virtual - dbname + dbName virtual web virtual - - dbTablePrefix - virtual - admin virtual - - httpsFront + + adminUsername virtual - - - https + + + adminEmail virtual - - - httpsAdmin + + + adminPassword virtual - + + + adminConfirm + virtual + apacheRewrites virtual + + dbTablePrefix + virtual + keyOwn virtual + + httpsAdmin + virtual + + + https + virtual + + + httpsFront + virtual + keyValue virtual @@ -70,10 +82,8 @@ virtual - currency + language virtual - Magento\Install\Test\Repository\Install - Magento\Install\Test\Handler\Install\InstallInterface diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 2fa6a33efd8ca..2573e7b8d18ca 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -6,184 +6,179 @@ --> Magento_Integration - composite - - integration - oauth_token - oauth_consumer - - integration - Magento\Integration\Model\Resource\Integration\Collection + Magento\Integration\Test\Repository\Integration + Magento\Integration\Test\Handler\Integration\IntegrationInterface integration_id int 1 - - + + name varchar - - - + + default_integration_%isolation% + integration_info email varchar - - - + + test_%isolation%@example.com + integration_info endpoint varchar - - - + + + integration_info status smallint - - - + + + consumer_id int - - - + + + created_at timestamp - + CURRENT_TIMESTAMP - + updated_at timestamp - - 0000-00-00 00:00:00 - + + + setup_type smallint - + 0 - + identity_link_url varchar - - - + + + integration_info entity_id int 1 - - + + admin_id int - - - + + + customer_id int - - - + + + type varchar - - - + + + token varchar - - - + + + secret varchar - - - + + + verifier varchar - - - + + + callback_url varchar - - - + + + revoked smallint - + 0 - + authorized smallint - + 0 - + user_type int - - - + + + key varchar - - - + + + rejected_callback_url varchar - - - + + + resource_access virtual api + All resources @@ -193,14 +188,12 @@ token_secret virtual - api + integration_info consumer_secret virtual - api + integration_info - Magento\Integration\Test\Repository\Integration - Magento\Integration\Test\Handler\Integration\IntegrationInterface diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index d89f2daf380cf..2c563a76836c8 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -6,96 +6,92 @@ --> Magento_Newsletter - flat - newsletter_template - Magento\Newsletter\Model\Resource\Template\Collection - template_id + Magento\Newsletter\Test\Repository\Template + Magento\Newsletter\Test\Handler\Template\TemplateInterface template_id int 1 - - + + template_code varchar - - - + + TemplateName%isolation% + template_text text - - - + + Some text %isolation% + template_text_preprocessed text - - - + + + template_styles text - - - + + + template_type int - - - + + + template_subject varchar - - - + + TemplateSubject%isolation% + template_sender_name varchar - - - + + SenderName%isolation% + template_sender_email varchar - - - + + SenderName%isolation%@example.com + template_actual smallint - + 1 - + added_at timestamp - - - + + + modified_at timestamp - - - + + + - Magento\Newsletter\Test\Repository\Template - Magento\Newsletter\Test\Handler\Newsletter\TemplateInterface diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php index df217246b10a2..1a62500a6481f 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php @@ -39,7 +39,7 @@ protected function prepareData(array $viewsReport) foreach ($viewsReport as $key => $reportFilter) { if (in_array($key, $this->dateFields)) { $date = ObjectManager::getInstance()->create( - '\Magento\Backend\Test\Fixture\Date', + '\Magento\Backend\Test\Fixture\Source\Date', ['params' => [], 'data' => ['pattern' => $reportFilter]] ); $viewsReport[$key] = $date->getData(); diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php index c5bd1a26c304e..172f08c9489e4 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php @@ -86,7 +86,7 @@ protected function prepareData(array $customersReport) continue; } $date = ObjectManager::getInstance()->create( - '\Magento\Backend\Test\Fixture\Date', + '\Magento\Backend\Test\Fixture\Source\Date', ['params' => [], 'data' => ['pattern' => $reportFilter]] ); $customersReport[$name] = $date->getData(); diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index ab38583465781..df8344fc47eb9 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -6,10 +6,8 @@ --> Magento_Review - flat - rating - Magento\Review\Model\Resource\Rating\Collection - rating_code + Magento\Review\Test\Repository\Rating + Magento\Review\Test\Handler\Rating\RatingInterface rating_id @@ -29,7 +27,7 @@ rating_code varchar - + Rating %isolation% rating_information @@ -45,7 +43,7 @@ is_active smallint - 1 + Yes rating_information @@ -53,6 +51,7 @@ stores virtual rating_information + Main Website/Main Website Store/Default Store View options @@ -60,6 +59,4 @@ rating_information - Magento\Review\Test\Repository\Rating - Magento\Review\Test\Handler\Rating\RatingInterface diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml index b55a18cb1efab..f23262b134836 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml @@ -6,12 +6,8 @@ --> Magento_Review - composite - - review - review_detail - - Magento\Review\Model\Resource\Review\Collection + Magento\Review\Test\Repository\ReviewInjectable + Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface review_id @@ -31,7 +27,9 @@ entity_id smallint - 0 + + catalogProductSimple::default + Magento\Review\Test\Fixture\ReviewInjectable\EntityId @@ -46,7 +44,7 @@ status_id smallint - 0 + Approved @@ -67,21 +65,21 @@ title varchar - + Summary review %isolation% detail text - + Text review %isolation% nickname varchar - + Guest customer %isolation% @@ -91,26 +89,32 @@ - - type - string - - - - select_stores virtual 1 - 0 + + Main Website/Main Website Store/Default Store View + multiselectgrouplist ratings virtual Magento\Review\Test\Fixture\ReviewInjectable\Ratings + + <0> + visibleOnDefaultWebsite + 4 + + + + type + string + + Administrator + + - Magento\Review\Test\Repository\ReviewInjectable - Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index fce7851f555f7..a78a0e305aded 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -6,9 +6,8 @@ --> Magento_Sitemap - flat - sitemap - Magento\Sitemap\Model\Resource\Sitemap\Collection + Magento\Sitemap\Test\Repository\Sitemap + Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface sitemap_id @@ -28,14 +27,14 @@ sitemap_filename varchar - + sitemap.xml sitemap_path varchar - + / @@ -53,6 +52,4 @@ - Magento\Sitemap\Test\Repository\Sitemap - Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index dd7aaf3968fd2..ccf0bcea20d8b 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -6,22 +6,21 @@ --> Magento_Store - flat - store - Magento\Store\Model\Resource\Store\Collection + Magento\Store\Test\Repository\Store + Magento\Store\Test\Handler\Store\StoreInterface store_id smallint 1 - + 1 code varchar - + default text @@ -35,7 +34,9 @@ group_id smallint - 0 + + default + select Magento\Store\Test\Fixture\Store\GroupId @@ -43,7 +44,7 @@ name varchar - + Default Store View text @@ -57,12 +58,8 @@ is_active smallint - 0 + Enabled select - - - Magento\Store\Test\Repository\Store - Magento\Store\Test\Handler\Store\StoreInterface diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 11edf174de463..3c40f12bfa3d4 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -6,10 +6,8 @@ --> Magento_Store - flat - store_group - Magento\Store\Model\Resource\Group\Collection - + Magento\Store\Test\Repository\StoreGroup + Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface group_id @@ -22,18 +20,24 @@ website_id virtual Magento\Store\Test\Fixture\StoreGroup\WebsiteId + + main_website + name varchar - + StoreGroup%isolation% root_category_id virtual Magento\Store\Test\Fixture\StoreGroup\CategoryId + + default_category + default_store_id @@ -43,8 +47,4 @@ - - - Magento\Store\Test\Repository\StoreGroup - Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 63ec12f637a4a..0fe22a2eed87b 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -6,30 +6,28 @@ --> Magento_Store - flat - store_website - Magento\Store\Model\Resource\Website\Collection - code + Magento\Store\Test\Repository\Website + Magento\Store\Test\Handler\Website\WebsiteInterface website_id smallint 1 - + 1 code varchar - + base name varchar - + Main Website @@ -54,7 +52,4 @@ - - - Magento\Store\Test\Repository\Website diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index e2cd00a50b587..fccc7a8691bac 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -6,39 +6,33 @@ --> Magento_Tax - flat - tax_class - Magento\Tax\Model\Resource\TaxClass\Collection - + Magento\Tax\Test\Repository\TaxClass + Magento\Tax\Test\Handler\TaxClass\TaxClassInterface class_id smallint 1 - - + + class_name varchar - - - + + Tax Class %isolation% + class_type varchar - + CUSTOMER - + id virtual - - - Magento\Tax\Test\Repository\TaxClass - Magento\Tax\Test\Handler\TaxClass\TaxClassInterface diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index 00dc9cadf43ce..cfce2a8c296f4 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -6,81 +6,75 @@ --> Magento_Tax - flat - tax_calculation_rate - Magento\Tax\Model\Resource\Calculation\Rate\Collection - code + Magento\Tax\Test\Repository\TaxRate + Magento\Tax\Test\Handler\TaxRate\TaxRateInterface tax_calculation_rate_id int 1 - - + + tax_country_id varchar - - - + + United States + tax_region_id int - - - + + California + tax_postcode varchar - - - + + * + code varchar - - - + + Tax Rate %isolation% + rate decimal - - - + + 10 + zip_is_range smallint - - - + + + zip_from int - - - + + + zip_to int - - - + + + id virtual - - - Magento\Tax\Test\Repository\TaxRate - Magento\Tax\Test\Handler\TaxRate\TaxRateInterface diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index 4912e43e124be..f12377adfa993 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -6,54 +6,56 @@ --> Magento_Tax - flat - tax_calculation_rule - Magento\Tax\Model\Resource\Calculation\Rule\Collection - code + Magento\Tax\Test\Repository\TaxRule + Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface tax_calculation_rule_id int 1 - - + + code varchar - - - + + TaxIdentifier%isolation% + priority int - - - + + + position int - - - + + + tax_rate virtual + Magento\Tax\Test\Fixture\TaxRule\TaxRate + + + US-CA-*-Rate 1 + + tax_customer_class virtual + Magento\Tax\Test\Fixture\TaxRule\TaxClass tax_product_class virtual + Magento\Tax\Test\Fixture\TaxRule\TaxClass - - - Magento\Tax\Test\Repository\TaxRule - Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index fd2e9fcb26e92..4bbeafe1f56da 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -5,11 +5,9 @@ */ --> - Magento_Backend - virtual - url_rewrite - Magento\UrlRewrite\Model\Resource\UrlRewriteCollection - request_path + Magento_UrlRewrite + Magento\UrlRewrite\Test\Repository\UrlRewrite + Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface id @@ -17,7 +15,11 @@ store_id - virtual + varchar + 1 + Main Website/Main Website Store/Default Store View + Magento\UrlRewrite\Test\Fixture\UrlRewrite\StoreId + select redirect_type @@ -29,13 +31,14 @@ request_path varchar 1 - request_path%isolation% + test_request%isolation% text entity_type varchar 0 + text @@ -43,8 +46,8 @@ varchar 1 target_path%isolation% - Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath text + Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath description @@ -53,6 +56,4 @@ text - Magento\UrlRewrite\Test\Repository\UrlRewrite - Magento\UrlRewrite\Test\Handler\UrlRewrite diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index b05e9ff5b12a3..f6e1c93b3e5d5 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -6,9 +6,8 @@ --> Magento_User - flat - authorization_role - Magento\User\Model\Resource\Role\User\Collection + Magento\User\Test\Repository\AdminUserRole + Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface role_id @@ -56,8 +55,9 @@ rolename varchar - + AdminRole%isolation% + role-info user_type @@ -69,10 +69,13 @@ resource_access virtual + role-resources + All roles_resources virtual + role-resources in_role_users @@ -81,6 +84,4 @@ Magento\User\Test\Fixture\AdminUserRole\InRoleUsers - Magento\User\Test\Repository\AdminUserRole - Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php index 57009a895ce1c..b6c4af6193feb 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php @@ -36,6 +36,7 @@ class User extends InjectableFixture 'email' => 'email%isolation%@example.com', 'password' => '123123q', 'password_confirmation' => '123123q', + 'current_password' => '%current_password%', 'is_active' => 'Active', ]; @@ -189,44 +190,9 @@ class User extends InjectableFixture 'attribute_code' => 'current_password', 'backend_type' => 'virtual', 'group' => 'user-info', + 'source' => 'Magento\User\Test\Fixture\User\CurrentPassword', ]; - /** - * Initialize dependencies. - * - * @param Config $configuration - * @param RepositoryFactory $repositoryFactory - * @param FixtureFactory $fixtureFactory - * @param HandlerFactory $handlerFactory - * @param EventManagerInterface $eventManager - * @param array $data - * @param string $dataSet - * @param bool $persist - */ - public function __construct( - Config $configuration, - RepositoryFactory $repositoryFactory, - FixtureFactory $fixtureFactory, - HandlerFactory $handlerFactory, - EventManagerInterface $eventManager, - array $data = [], - $dataSet = '', - $persist = false - ) { - $this->defaultDataSet['current_password'] = $configuration - ->getConfigParam('application/backend_user_credentials/password'); - parent::__construct( - $configuration, - $repositoryFactory, - $fixtureFactory, - $handlerFactory, - $eventManager, - $data, - $dataSet, - $persist - ); - } - public function getUserId() { return $this->getData('user_id'); diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index b6aef2d4601f8..e779b271dabe0 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -6,9 +6,8 @@ --> Magento_User - flat - admin_user - Magento\User\Model\Resource\User\Collection + Magento\User\Test\Repository\User + Magento\User\Test\Handler\User\UserInterface user_id @@ -21,36 +20,41 @@ firstname varchar - + FirstName%isolation% + user-info lastname varchar - + LastName%isolation% + user-info email varchar - + email%isolation%@example.com + user-info username varchar - + AdminUser%isolation% + user-info password varchar - + 123123q + user-info created @@ -91,7 +95,7 @@ is_active smallint - 1 + Active @@ -131,12 +135,13 @@ password_confirmation virtual + user-info + 123123q current_password virtual + user-info - Magento\User\Test\Repository\User - Magento\User\Test\Handler\User\UserInterface diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php index edb634f0dfc7f..d17271719c6bd 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php @@ -34,7 +34,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'password' => '123123q', 'password_confirmation' => '123123q', 'user_id' => 1, - 'current_password' => $superAdminPassword, + 'current_password' => '%current_password%', ]; $this->_data['custom_admin'] = [ @@ -44,7 +44,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'email' => 'email%isolation%@example.com', 'password' => '123123q', 'password_confirmation' => '123123q', - 'current_password' => $superAdminPassword, + 'current_password' => '%current_password%', ]; $this->_data['custom_admin_with_default_role'] = [ @@ -55,7 +55,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'password' => '123123q', 'password_confirmation' => '123123q', 'role_id' => ['dataSet' => 'default'], - 'current_password' => $superAdminPassword, + 'current_password' => '%current_password%', 'is_active' => 'Active', ]; } From e0c07c6a0a77e06fdd3c50f76089835f1ced9fa7 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Fri, 9 Jan 2015 14:01:18 +0200 Subject: [PATCH 02/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format - Add default value --- .../Bundle/Test/Fixture/BundleProduct.xml | 31 +++++++++-------- .../Test/Fixture/CatalogAttributeSet.xml | 7 ++-- .../Catalog/Test/Fixture/CatalogCategory.xml | 13 +++++--- .../Test/Fixture/CatalogProductAttribute.xml | 12 +++++-- .../Test/Fixture/CatalogProductSimple.xml | 33 +++++++++++-------- .../Test/Fixture/CatalogProductVirtual.xml | 27 ++++++++------- .../CatalogRule/Test/Fixture/CatalogRule.xml | 7 ++-- .../Test/Fixture/CatalogSearchQuery.xml | 13 +++++--- .../Magento/Checkout/Test/Fixture/Cart.xml | 7 ++-- .../Fixture/ConfigurableProductInjectable.xml | 31 +++++++++-------- .../Magento/Core/Test/Fixture/ConfigData.xml | 7 ++-- .../Core/Test/Fixture/SystemVariable.xml | 8 ++++- .../Test/Fixture/AddressInjectable.xml | 7 ++-- .../Test/Fixture/CustomerGroupInjectable.xml | 7 ++-- .../Test/Fixture/CustomerInjectable.xml | 16 +++++---- .../Fixture/DownloadableProductInjectable.xml | 27 ++++++++------- .../GiftMessage/Test/Fixture/GiftMessage.xml | 6 +++- .../Test/Fixture/GoogleShoppingAttribute.xml | 7 ++-- .../Test/Fixture/GroupedProductInjectable.xml | 27 ++++++++------- .../Test/Fixture/ImportExport.xml | 2 ++ .../Magento/Install/Test/Fixture/Install.xml | 6 ++-- .../Integration/Test/Fixture/Integration.xml | 12 +++++-- .../Newsletter/Test/Fixture/Template.xml | 8 +++-- .../Magento/Review/Test/Fixture/Rating.xml | 8 +++-- .../Review/Test/Fixture/ReviewInjectable.xml | 14 +++++--- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 7 ++-- .../app/Magento/Store/Test/Fixture/Store.xml | 7 ++-- .../Magento/Store/Test/Fixture/StoreGroup.xml | 8 +++-- .../Magento/Store/Test/Fixture/Website.xml | 8 +++-- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 8 +++-- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 8 +++-- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 8 +++-- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 8 +++-- .../User/Test/Fixture/AdminUserRole.xml | 7 ++-- .../app/Magento/User/Test/Fixture/User.xml | 7 ++-- 35 files changed, 279 insertions(+), 140 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 8513c0ba27e79..80e21913a4b7b 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -6,16 +6,21 @@ --> Magento_Bundle - Magento\Bundle\Test\Repository\BundleProduct - Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface - - bundle - - bundle - 4 - - product - + eav + catalog_product + bundle + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\Bundle\Test\Repository\BundleProduct + Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface + + bundle + + bundle + 4 + + product + category_ids @@ -379,7 +384,7 @@ price advanced-pricing - Magento\Backend\Test\Fixture\Source\Date + Magento\Backend\Test\Fixture\Date special_to_date @@ -388,7 +393,7 @@ price advanced-pricing - Magento\Backend\Test\Fixture\Source\Date + Magento\Backend\Test\Fixture\Date tax_class_id @@ -467,7 +472,7 @@ checkout_data virtual 1 - + null Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 309c63e8041b9..660e9ec8e4070 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -6,8 +6,11 @@ --> Magento_Catalog - Magento\Catalog\Test\Repository\CatalogAttributeSet - Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface + flat + eav_attribute_set + Magento\Catalog\Model\Resource\Product\Link\Product\Collection + Magento\Catalog\Test\Repository\CatalogAttributeSet + Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface attribute_set_id diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml index f29368c9b8310..33cec042952b1 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml @@ -6,8 +6,11 @@ --> Magento_Catalog - Magento\Catalog\Test\Repository\CatalogCategory - Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface + eav + catalog_category_entity + Magento\Catalog\Model\Resource\Category\Collection + Magento\Catalog\Test\Repository\CatalogCategory + Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface entity_id @@ -43,7 +46,7 @@ 2 - + null Magento\Catalog\Test\Fixture\CatalogCategory\ParentId @@ -65,7 +68,7 @@ varchar Default Category - + null @@ -131,7 +134,7 @@ id virtual - + null name diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index 354ed55b2493d..cddcc640fc3fd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -6,8 +6,14 @@ --> Magento_Catalog - Magento\Catalog\Test\Repository\CatalogProductAttribute - Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface + composite + + eav_attribute + catalog_eav_attribute + + Magento\Catalog\Model\Resource\Attribute + Magento\Catalog\Test\Repository\CatalogProductAttribute + Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface attribute_id @@ -301,7 +307,7 @@ default_value_date text advanced-properties - Magento\Backend\Test\Fixture\Source\Date + Magento\Backend\Test\Fixture\Date default_value_yesno diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index faac0d8d11b8a..766c5cad69bee 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -6,16 +6,21 @@ --> Magento_Catalog - Magento\Catalog\Test\Repository\CatalogProductSimple - Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface - - simple - - simple - 4 - - product - + eav + catalog_product + simple + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\Catalog\Test\Repository\CatalogProductSimple + Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface + + simple + + simple + 4 + + product + category_ids @@ -377,7 +382,7 @@ id virtual - + null type_id @@ -427,7 +432,7 @@ 0 date - Magento\Backend\Test\Fixture\Source\Date + Magento\Backend\Test\Fixture\Date news_to_date @@ -435,7 +440,7 @@ 0 date - Magento\Backend\Test\Fixture\Source\Date + Magento\Backend\Test\Fixture\Date stock_data @@ -445,7 +450,7 @@ checkout_data virtual - + null Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 72d99ea6ab096..279aa9685069c 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -6,16 +6,21 @@ --> Magento_Catalog - Magento\Catalog\Test\Repository\CatalogProductVirtual - Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface - - virtual - - virtual - 4 - - product - + eav + catalog_product + virtual + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\Catalog\Test\Repository\CatalogProductVirtual + Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface + + virtual + + virtual + 4 + + product + is_virtual @@ -426,7 +431,7 @@ checkout_data virtual - + null Magento\Catalog\Test\Fixture\CatalogProductVirtual\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index 0ee099bee4564..f7ab4176f8d57 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -6,8 +6,11 @@ --> Magento_CatalogRule - Magento\CatalogRule\Test\Repository\CatalogRule - Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface + eav + catalog_rule + Magento\CatalogRule\Model\Resource\Rule\Product\Price\Collection + Magento\CatalogRule\Test\Repository\CatalogRule + Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface name diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index 6fd8838674d3c..2f32a150dc990 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -6,8 +6,11 @@ --> Magento_CatalogSearch - Magento\CatalogSearch\Test\Repository\CatalogSearchQuery - Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface + flat + search_query + Magento\Search\Model\Resource\Query\Collection + Magento\CatalogSearch\Test\Repository\CatalogSearchQuery + Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface query_id @@ -63,14 +66,14 @@ display_in_terms smallint - + null is_active smallint - + null @@ -84,7 +87,7 @@ updated_at timestamp - + null diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index 634efabbf4f61..b200425b4f247 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -6,8 +6,11 @@ --> Magento_Checkout - Magento\Checkout\Test\Repository\Cart - Magento\Checkout\Test\Handler\Cart\CartInterface + flat + sales_quote + Magento\Checkout\Model\Resource\Cart + Magento\Checkout\Test\Repository\Cart + Magento\Checkout\Test\Handler\Cart\CartInterface entity_id diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 793a3f3482479..2dac494c65f73 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -6,16 +6,21 @@ --> Magento_ConfigurableProduct - Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable - Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface - - configurable - - configurable - 4 - - product - + eav + catalog_product + configurable + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable + Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface + + configurable + + configurable + 4 + + product + category_ids @@ -403,7 +408,7 @@ type_id virtual - + null configurable @@ -423,7 +428,7 @@ affected_attribute_set virtual - + null custom_options @@ -454,7 +459,7 @@ checkout_data virtual - + null Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index 0ba0ecb06b37c..1d92052df51b8 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -6,8 +6,11 @@ --> Magento_Core - Magento\Core\Test\Repository\ConfigData - Magento\Core\Test\Handler\ConfigData\ConfigDataInterface + flat + core_config_data + Magento\Core\Model\Resource\Config\Data\Collection + Magento\Core\Test\Repository\ConfigData + Magento\Core\Test\Handler\ConfigData\ConfigDataInterface
section diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 2e484e33e4e34..6b98a48610398 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -6,7 +6,13 @@ --> Magento_Core - Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface + composite + + core_variable + core_variable_value + + Magento\Core\Model\Resource\Variable\Collection + Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface variable_id diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index 9ac81d613b239..14ee41a0b8ee0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -6,8 +6,11 @@ --> Magento_Customer - Magento\Customer\Test\Repository\AddressInjectable - Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface + eav + customer_address + Magento\Customer\Model\Resource\Address\Collection + Magento\Customer\Test\Repository\AddressInjectable + Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface city diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 70b4373b8a6c0..140260dd19330 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -6,8 +6,11 @@ --> Magento_Customer - Magento\Customer\Test\Repository\CustomerGroupInjectable - Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface + flat + customer_group + Magento\Customer\Model\Resource\Group\Collection + Magento\Customer\Test\Repository\CustomerGroupInjectable + Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface code diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index 49093fd194cee..be5c779937234 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -6,8 +6,12 @@ --> Magento_Customer - Magento\Customer\Test\Repository\CustomerInjectable - Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface + eav + customer + Magento\Customer\Model\Resource\Customer\Collection + email + Magento\Customer\Test\Repository\CustomerInjectable + Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface
address @@ -24,7 +28,7 @@ id virtual - + null created_at @@ -196,19 +200,19 @@ password virtual - + null 123123q password_confirmation virtual - + null 123123q current_password virtual - + null diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 94e9e2d6da18b..4f6288174ec21 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -6,16 +6,21 @@ --> Magento_Downloadable - Magento\Downloadable\Test\Repository\DownloadableProductInjectable - Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface - - downloadable - - downloadable - 4 - - product - + eav + catalog_product + downloadable + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\Downloadable\Test\Repository\DownloadableProductInjectable + Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface + + downloadable + + downloadable + 4 + + product + category_ids @@ -495,7 +500,7 @@ checkout_data virtual - + null Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index bbb7fb0c1c738..cf1a00a1775ad 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -6,7 +6,11 @@ --> Magento_GiftMessage - Magento\GiftMessage\Test\Repository\GiftMessage + flat + gift_message + Magento\GiftMessage\Model\Resource\Message\Collection + gift_message_id + Magento\GiftMessage\Test\Repository\GiftMessage gift_message_id diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index a9bbfae56906a..5df0d8e9c680e 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -6,8 +6,11 @@ --> Magento_GoogleShopping - Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute - Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface + flat + googleshopping_types + Magento\GoogleShopping\Model\Resource\Attribute\Collection + Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute + Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface type_id diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index c65ecf1c4f8c6..e7121b5f9e37f 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -6,16 +6,21 @@ --> Magento_GroupedProduct - Magento\GroupedProduct\Test\Repository\GroupedProductInjectable - Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface - - grouped - - grouped - 4 - - product - + eav + catalog_product + grouped + Magento\Catalog\Model\Resource\Product\Collection + sku + Magento\GroupedProduct\Test\Repository\GroupedProductInjectable + Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface + + grouped + + grouped + 4 + + product + category_ids @@ -356,7 +361,7 @@ checkout_data virtual - + null Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 45cbd608d7a16..8a372f861530f 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -6,6 +6,8 @@ --> Magento_ImportExport + flat + importexport_importdata id diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index a557a19703a36..44e054c70c444 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -6,8 +6,10 @@ --> Magento_Install - Magento\Install\Test\Repository\Install - Magento\Install\Test\Handler\Install\InstallInterface + virtual + install + Magento\Install\Test\Repository\Install + Magento\Install\Test\Handler\Install\InstallInterface dbHost diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 2573e7b8d18ca..b59d9a8224117 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -6,8 +6,16 @@ --> Magento_Integration - Magento\Integration\Test\Repository\Integration - Magento\Integration\Test\Handler\Integration\IntegrationInterface + composite + + integration + oauth_token + oauth_consumer + + integration + Magento\Integration\Model\Resource\Integration\Collection + Magento\Integration\Test\Repository\Integration + Magento\Integration\Test\Handler\Integration\IntegrationInterface integration_id diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 2c563a76836c8..512ec3a45dd88 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -6,8 +6,12 @@ --> Magento_Newsletter - Magento\Newsletter\Test\Repository\Template - Magento\Newsletter\Test\Handler\Template\TemplateInterface + flat + newsletter_template + Magento\Newsletter\Model\Resource\Template\Collection + template_id + Magento\Newsletter\Test\Repository\Template + Magento\Newsletter\Test\Handler\Template\TemplateInterface template_id diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index df8344fc47eb9..335f2d04df884 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -6,8 +6,12 @@ --> Magento_Review - Magento\Review\Test\Repository\Rating - Magento\Review\Test\Handler\Rating\RatingInterface + flat + rating + Magento\Review\Model\Resource\Rating\Collection + rating_code + Magento\Review\Test\Repository\Rating + Magento\Review\Test\Handler\Rating\RatingInterface rating_id diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml index f23262b134836..f40cb8f899962 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml @@ -6,8 +6,14 @@ --> Magento_Review - Magento\Review\Test\Repository\ReviewInjectable - Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface + composite + + review + review_detail + + Magento\Review\Model\Resource\Review\Collection + Magento\Review\Test\Repository\ReviewInjectable + Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface review_id @@ -103,10 +109,10 @@ virtual Magento\Review\Test\Fixture\ReviewInjectable\Ratings - <0> + visibleOnDefaultWebsite 4 - + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index a78a0e305aded..dac7e316eff83 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -6,8 +6,11 @@ --> Magento_Sitemap - Magento\Sitemap\Test\Repository\Sitemap - Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface + flat + sitemap + Magento\Sitemap\Model\Resource\Sitemap\Collection + Magento\Sitemap\Test\Repository\Sitemap + Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface sitemap_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index ccf0bcea20d8b..2cc0419474ea8 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -6,8 +6,11 @@ --> Magento_Store - Magento\Store\Test\Repository\Store - Magento\Store\Test\Handler\Store\StoreInterface + flat + store + Magento\Store\Model\Resource\Store\Collection + Magento\Store\Test\Repository\Store + Magento\Store\Test\Handler\Store\StoreInterface store_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 3c40f12bfa3d4..cc208e67c1229 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -6,8 +6,12 @@ --> Magento_Store - Magento\Store\Test\Repository\StoreGroup - Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface + flat + store_group + Magento\Store\Model\Resource\Group\Collection + + Magento\Store\Test\Repository\StoreGroup + Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface group_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 0fe22a2eed87b..35a220fe77c42 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -6,8 +6,12 @@ --> Magento_Store - Magento\Store\Test\Repository\Website - Magento\Store\Test\Handler\Website\WebsiteInterface + flat + store_website + Magento\Store\Model\Resource\Website\Collection + code + Magento\Store\Test\Repository\Website + Magento\Store\Test\Handler\Website\WebsiteInterface website_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index fccc7a8691bac..eeff468816958 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -6,8 +6,12 @@ --> Magento_Tax - Magento\Tax\Test\Repository\TaxClass - Magento\Tax\Test\Handler\TaxClass\TaxClassInterface + flat + tax_class + Magento\Tax\Model\Resource\TaxClass\Collection + + Magento\Tax\Test\Repository\TaxClass + Magento\Tax\Test\Handler\TaxClass\TaxClassInterface class_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index cfce2a8c296f4..ebfaad754fd8b 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -6,8 +6,12 @@ --> Magento_Tax - Magento\Tax\Test\Repository\TaxRate - Magento\Tax\Test\Handler\TaxRate\TaxRateInterface + flat + tax_calculation_rate + Magento\Tax\Model\Resource\Calculation\Rate\Collection + code + Magento\Tax\Test\Repository\TaxRate + Magento\Tax\Test\Handler\TaxRate\TaxRateInterface tax_calculation_rate_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index f12377adfa993..80e281d29311e 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -6,8 +6,12 @@ --> Magento_Tax - Magento\Tax\Test\Repository\TaxRule - Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface + flat + tax_calculation_rule + Magento\Tax\Model\Resource\Calculation\Rule\Collection + code + Magento\Tax\Test\Repository\TaxRule + Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface tax_calculation_rule_id diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index 4bbeafe1f56da..3c58338761be6 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -6,8 +6,12 @@ --> Magento_UrlRewrite - Magento\UrlRewrite\Test\Repository\UrlRewrite - Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface + virtual + url_rewrite + Magento\UrlRewrite\Model\Resource\UrlRewriteCollection + request_path + Magento\UrlRewrite\Test\Repository\UrlRewrite + Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface id diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index f6e1c93b3e5d5..04262f49cfa04 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -6,8 +6,11 @@ --> Magento_User - Magento\User\Test\Repository\AdminUserRole - Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface + flat + authorization_role + Magento\User\Model\Resource\Role\User\Collection + Magento\User\Test\Repository\AdminUserRole + Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface role_id diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index e779b271dabe0..11000dfaebdfe 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -6,8 +6,11 @@ --> Magento_User - Magento\User\Test\Repository\User - Magento\User\Test\Handler\User\UserInterface + flat + admin_user + Magento\User\Model\Resource\User\Collection + Magento\User\Test\Repository\User + Magento\User\Test\Handler\User\UserInterface user_id From c6d9285e38d5fbb12b4b1b875fc392fc64c63181 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Fri, 9 Jan 2015 17:12:25 +0200 Subject: [PATCH 03/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 repositories to new format --- .../BundleProduct/BundleSelections.php | 26 +- .../Fixture/BundleProduct/CheckoutData.php | 30 +- .../Bundle/Test/Repository/BundleProduct.php | 8 +- .../Bundle/Test/Repository/BundleProduct.xml | 129 +++ .../CreateBundleProductEntityTest/test.csv | 28 +- .../CatalogProductVirtual/CheckoutData.php | 2 +- .../Test/Repository/CatalogAttributeSet.xml | 27 + .../Test/Repository/CatalogCategory.xml | 49 + .../Repository/CatalogProductAttribute.xml | 113 +++ .../Test/Repository/CatalogProductSimple.php | 42 +- .../Test/Repository/CatalogProductSimple.xml | 908 ++++++++++++++++++ .../Test/Repository/CatalogProductVirtual.php | 16 +- .../Test/Repository/CatalogProductVirtual.xml | 120 +++ .../Catalog/Test/Repository/Category.xml | 28 + .../testCreate.csv | 4 +- .../testCreate.csv | 2 +- .../UpdateVirtualProductEntityTest/test.csv | 10 +- .../Test/Repository/CatalogRule.xml | 99 ++ .../Test/Repository/CatalogSearchQuery.xml | 17 + .../test.csv | 4 +- .../test.csv | 4 +- .../ConfigurableProductInjectable.php | 14 +- .../ConfigurableProductInjectable.xml | 206 ++++ .../Core/Test/Repository/SystemVariable.xml | 16 + .../Test/Repository/AddressInjectable.xml | 229 +++++ .../Repository/CustomerGroupInjectable.php | 12 +- .../Repository/CustomerGroupInjectable.xml | 40 + .../Test/Repository/CustomerInjectable.xml | 111 +++ .../testCreateCustomerGroup.csv | 4 +- .../UpdateCustomerGroupEntityTest/test.csv | 2 +- .../Fixture/DownloadableProductInjectable.php | 2 +- .../Fixture/DownloadableProductInjectable.xml | 2 +- .../DownloadableProductInjectable.php | 6 +- .../DownloadableProductInjectable.xml | 85 ++ .../test.csv | 26 +- .../test.csv | 10 +- .../Test/Repository/GiftMessage.xml | 13 + .../Repository/GoogleShoppingAttribute.xml | 15 + .../Test/Fixture/GroupedProductInjectable.php | 2 +- .../Test/Fixture/GroupedProductInjectable.xml | 2 +- .../GroupedProductInjectable/Associated.php | 10 +- .../Repository/GroupedProductInjectable.php | 8 +- .../Repository/GroupedProductInjectable.xml | 115 +++ .../UpdateGroupedProductEntityTest/test.csv | 2 +- .../Test/Repository/Integration.xml | 26 + .../Newsletter/Test/Repository/Template.xml | 15 + .../AbandonedCartsReportEntityTest/test.csv | 4 +- .../Magento/Review/Test/Repository/Rating.xml | 22 + .../Magento/Review/Test/Repository/Review.xml | 14 + .../Test/Repository/ReviewInjectable.xml | 38 + .../Sitemap/Test/Repository/Sitemap.xml | 12 + .../Magento/Store/Test/Repository/Store.xml | 41 + .../Store/Test/Repository/StoreGroup.xml | 27 + .../Magento/Store/Test/Repository/Website.xml | 22 + .../Test/Constraint/AssertTaxRuleApplying.php | 2 +- .../app/Magento/Tax/Test/Fixture/TaxRule.php | 2 +- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 2 +- .../Magento/Tax/Test/Repository/TaxClass.php | 4 +- .../Magento/Tax/Test/Repository/TaxClass.xml | 36 +- .../Magento/Tax/Test/Repository/TaxRate.php | 4 +- .../Magento/Tax/Test/Repository/TaxRate.xml | 141 ++- .../Magento/Tax/Test/Repository/TaxRule.php | 20 +- .../Magento/Tax/Test/Repository/TaxRule.xml | 140 +++ .../testCreateTaxRule.csv | 8 +- .../testUpdateTaxRule.csv | 2 +- .../UrlRewrite/Test/Repository/UrlRewrite.xml | 26 + .../test.csv | 2 +- .../test.csv | 2 +- .../User/Test/Repository/AdminUserRole.xml | 42 + .../app/Magento/User/Test/Repository/User.php | 3 - .../app/Magento/User/Test/Repository/User.xml | 40 + 71 files changed, 3099 insertions(+), 196 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml create mode 100644 dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml create mode 100644 dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml create mode 100644 dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml create mode 100644 dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml create mode 100644 dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml create mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml create mode 100644 dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml create mode 100644 dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml create mode 100644 dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml create mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml create mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml create mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml create mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml create mode 100644 dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php index 3ca0fa24a11c2..f41415395fbd1 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php @@ -147,7 +147,7 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], ], ], @@ -184,7 +184,7 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], ], ], @@ -221,7 +221,7 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], ], ], @@ -339,19 +339,19 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], ], ], @@ -453,19 +453,19 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], ], ], @@ -529,11 +529,11 @@ protected function getPreset($name) 'products' => [ [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product' + 'catalogProductSimple::product_100_dollar' ], ], ], diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php index d6c32c22620a0..3b8a0bba1604b 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php @@ -32,7 +32,7 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], ], @@ -45,7 +45,7 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], ], @@ -64,7 +64,7 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], ], @@ -102,14 +102,14 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], [ 'title' => 'Radio Button Option', 'type' => 'Radio Buttons', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], ], @@ -122,7 +122,7 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], ], @@ -185,7 +185,7 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], ], @@ -204,28 +204,28 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], [ 'title' => 'Radio Button Option', 'type' => 'Radio Buttons', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], [ 'title' => 'Checkbox Option', 'type' => 'Checkbox', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], [ 'title' => 'Multiple Select Option', 'type' => 'Multiple', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], ], @@ -276,28 +276,28 @@ protected function getPreset($name) 'title' => 'Drop-down Option', 'type' => 'Drop-down', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ], ], [ 'title' => 'Radio Button Option', 'type' => 'Radio Buttons', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], [ 'title' => 'Checkbox Option', 'type' => 'Checkbox', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], [ 'title' => 'Multiple Select Option', 'type' => 'Multiple', 'value' => [ - 'name' => '100_dollar_product', + 'name' => 'product_100_dollar', ] ], ], diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php index a411597d55de6..39065ce345817 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php @@ -32,7 +32,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) ], 'short_description' => '', 'description' => '', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'sku_type' => '0', 'price_type' => '0', 'weight_type' => '0', @@ -52,7 +52,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) ], 'short_description' => '', 'description' => '', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'sku_type' => '0', 'weight_type' => '0', 'price_type' => '0', @@ -74,7 +74,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) ], 'weight_type' => 'Dynamic', 'shipment_type' => 'Separately', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'stock_data' => [ 'manage_stock' => 'Yes', @@ -95,7 +95,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku_type' => 'Fixed', 'price_type' => 'Fixed', 'price' => ['value' => 750.00, 'preset' => 'default_fixed'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 666.0000, 'is_in_stock' => 'In Stock', diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml new file mode 100644 index 0000000000000..0d60c6411c9fa --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -0,0 +1,129 @@ + + + + + BundleDynamic_sku_10735074493 + BundleDynamic 1073507449 + + 1 + 2 + + + + + taxable_goods + + 0 + 0 + 0 + Product online + 1 + bundle-dynamic-product-%isolation% + BundleDynamic_sku_1073507449 + + Main Website + + + + BundleDynamic_sku_215249172 + BundleDynamic 215249172 + + 3 + 4 + + + + + taxable_goods + + 0 + 0 + 0 + 1 + bundle-dynamic-product-%isolation% + BundleDynamic_sku_215249172 + + Main Website + + + + Bundle dynamic product %isolation% + sku_bundle_dynamic_product_%isolation% + Dynamic + Dynamic + + - + default_dynamic + + + 666 + In Stock + + Dynamic + Separately + + taxable_goods + + + Main Website + + + Yes + Yes + Yes + In Stock + + bundle-dynamic-product-%isolation% + Catalog, Search + + default_dynamic + + Default + + default_dynamic + + + + Bundle fixed product %isolation% + sku_bundle_fixed_product_%isolation% + Fixed + Fixed + + 750 + default_fixed + + + taxable_goods + + + 666 + In Stock + + 1 + Fixed + Product online + Together + + Main Website + + + Yes + Yes + Yes + In Stock + + bundle-fixed-product-%isolation% + Catalog, Search + + default_fixed + + Default + + default_fixed + + + 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 index 544b8df3a6774..4879de57fde4d 100644 --- 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 @@ -1,15 +1,15 @@ "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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductVirtual::50_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType" -"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"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::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage" -"bundle-product-%isolation%";"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"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";"-";"-";"-";"-";"-";"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/Catalog/Test/Fixture/CatalogProductVirtual/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual/CheckoutData.php index 8c5a12fc4e924..b0c54702eca08 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual/CheckoutData.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual/CheckoutData.php @@ -26,7 +26,7 @@ protected function getPreset($name) 'order_default' => [ 'qty' => 1, ], - '50_dollar_product' => [ + 'product_50_dollar' => [ 'qty' => 1, 'cartItem' => [ 'price' => 50, diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml new file mode 100644 index 0000000000000..7ad7d69268c8e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml @@ -0,0 +1,27 @@ + + + + + Default + 4 + + + Custom_attribute_set%isolation% + + default + + + + Custom_attribute_set%isolation% + + default + + + attribute_type_fpt + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml new file mode 100644 index 0000000000000..542088cd6b815 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml @@ -0,0 +1,49 @@ + + + + + Default Category + 1 + Yes + 2 + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + + Yes + Yes + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + + Yes + Yes + Yes + + + RootCategory%isolation% + root-category-%isolation% + 1 + Yes + Yes + + + RootSubCategory%isolation% + root-sub-category-%isolation% + + root_category + + Yes + Yes + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml new file mode 100644 index 0000000000000..6dc7db23f64dd --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml @@ -0,0 +1,113 @@ + + + + + attribute_text%isolation% + attribute_text%isolation% + Text Field + No + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + No + white + option_1_%isolation% + + + No + green + option_2_%isolation% + + + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + No + white + option_1_%isolation% + + + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + + + color_%isolation% + color_%isolation% + Dropdown + No + Yes + + + Yes + black + black_%isolation% + + + No + white + white_%isolation% + + + + + size_%isolation% + size_%isolation% + Dropdown + No + Yes + + + Yes + xl + xl_%isolation% + + + No + xxl + xxl_%isolation% + + + + + fpt_%isolation% + Fixed Product Tax + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php index 0914dfa8920b6..e5d920258cd9c 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php @@ -34,7 +34,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'url_key' => 'simple-product-%isolation%', @@ -67,7 +67,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'url_key' => 'simple-product-%isolation%', @@ -84,16 +84,16 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'url_key' => 'simple-product-%isolation%', 'checkout_data' => ['preset' => 'order_custom_price'], ]; - $this->_data['100_dollar_product'] = [ - 'sku' => '100_dollar_product%isolation%', - 'name' => '100_dollar_product%isolation%', + $this->_data['product_100_dollar'] = [ + 'sku' => 'product_100_dollar%isolation%', + 'name' => 'product_100_dollar%isolation%', 'type_id' => 'simple', 'quantity_and_stock_status' => [ 'qty' => 666.0000, @@ -107,9 +107,9 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'checkout_data' => ['preset' => 'two_products'] ]; - $this->_data['40_dollar_product'] = [ - 'sku' => '40_dollar_product%isolation%', - 'name' => '40_dollar_product%isolation%', + $this->_data['product_40_dollar'] = [ + 'sku' => 'product_40_dollar%isolation%', + 'name' => 'product_40_dollar%isolation%', 'type_id' => 'simple', 'quantity_and_stock_status' => [ 'qty' => 666.0000, @@ -118,7 +118,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 1, 'attribute_set_id' => ['dataSet' => 'default'], 'price' => ['value' => 40, 'preset' => '-'], - 'mtf_dataset_name' => '40_dollar_product', + 'mtf_dataset_name' => 'product_40_dollar', 'url_key' => 'simple-product-%isolation%', 'website_ids' => ['Main Website'], ]; @@ -177,7 +177,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'simple_for_composite_products%isolation%', 'price' => ['value' => 560, 'preset' => '-'], 'attribute_set_id' => ['dataSet' => 'default'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 111, 'is_in_stock' => 'In Stock', @@ -281,7 +281,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'name' => 'abc_dfj_%isolation%', 'sku' => 'abc_dfj', 'price' => ['value' => 50.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 666.0000, 'is_in_stock' => 'In Stock', @@ -295,9 +295,9 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'url_key' => 'simple-product-%isolation%', ]; - $this->_data['100_dollar_product_for_tax_rule'] = [ - 'sku' => '100_dollar_product%isolation%', - 'name' => '100_dollar_product%isolation%', + $this->_data['product_100_dollar_for_tax_rule'] = [ + 'sku' => 'product_100_dollar%isolation%', + 'name' => 'product_100_dollar%isolation%', 'attribute_set_id' => ['dataSet' => 'default'], 'type_id' => 'simple', 'quantity_and_stock_status' => [ @@ -435,7 +435,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'Out of Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], @@ -452,7 +452,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], @@ -470,7 +470,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Not Visible Individually', 'checkout_data' => ['preset' => 'order_default'], @@ -487,7 +487,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], @@ -521,7 +521,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], @@ -558,7 +558,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'website_ids' => ['Main Website'], 'visibility' => 'Catalog, Search', 'checkout_data' => ['preset' => 'order_default'], diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml new file mode 100644 index 0000000000000..b65fdaa5cfccf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -0,0 +1,908 @@ + + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + No + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_default + + + + Simple Product %isolation% + sku_simple_product_%isolation% + No + 1 + + 25 + In Stock + + simple-product-%isolation% + + 560 + - + + + Main Website + + Catalog, Search + + order_default + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + 1 + + 1000 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_big_qty + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_custom_price + + + + product_100_dollar%isolation% + product_100_dollar%isolation% + simple + + 666 + In Stock + + 1 + + default + + + 100 + - + + + Main Website + + simple-product-%isolation% + + two_products + + + + product_40_dollar%isolation% + product_40_dollar%isolation% + simple + + 666 + In Stock + + 1 + + default + + + 40 + - + + product_40_dollar + simple-product-%isolation% + + Main Website + + + + MAGETWO-23036_%isolation% + simple_with_category %isolation% + + default + + simple + + 666 + In Stock + + 1 + + 100 + MAGETWO-23036 + + + default_subcategory + + simple_with_category + + Main Website + + simple-product-%isolation% + + + simple_product_with_category_%isolation% + Simple product with category %isolation% + + 666 + In Stock + + 1 + + default + + + 100 + + + + default_subcategory + + + Main Website + + simple_with_category + simple-product-%isolation% + + + + default + + simple + + 666 + In Stock + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + + + 100 + + Main Website + + simple-product-%isolation% + + default_subcategory + + + + simple_for_composite_products%isolation% + simple_for_composite_products%isolation% + + 560 + - + + + default + + + taxable_goods + + + 111 + In Stock + + 1 + 1 + + Main Website + + + Yes + 111 + In Stock + + simple-for-composite-products%isolation% + Catalog, Search + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 50 + + + 50 + + Main Website + + simple-product-%isolation% + + default_subcategory + + + + simple_product_with_special_price_and_category%isolation% + Simple product with special price and category %isolation% + + default + + + 100 + + + 90 + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple_product_with_special_price_and_category%isolation% + Simple with Special Price 1$ off %isolation% + + default + + + 10 + + + 9 + + Main Website + + simple-product-%isolation% + + + adc_123_%isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 1 +

dfj_full

 + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + Simple with Weight 0.1 %isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 0.1 +

Simple with Weight 0.1

 + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + Simple with Weight 150.1 %isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 150.1 +

Simple with Weight 150.1

 + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + abc_dfj_%isolation% + abc_dfj + + 50 + - + + + taxable_goods + + + 666 + In Stock + + 1 +

adc_Full

 + Product online +

abc_short

 + + Main Website + + Catalog, Search + simple-product-%isolation% + + + product_100_dollar%isolation% + product_100_dollar%isolation% + + default + + simple + + 25 + In Stock + + 1 + + 100 + - + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + simple-product-%isolation% + 9 + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + + default + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + + tax_calculation + + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + default + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + default + + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + two_options + + simple-product-%isolation% + + with_two_custom_option + + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + drop_down_with_one_option_percent_price + + + drop_down_with_one_option_percent_price + + + Main Website + + + default_subcategory + + simple-product-%isolation% + + + simple + + default + + Simple Product With Custom Option %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + simple-product-%isolation% + + all_types + + + + low_stock_product%isolation% + low_stock_product%isolation% + simple + + 1 + In Stock + + + No + 2 + + 1 + + default + + + 100 + - + + + Main Website + + simple-product-%isolation% + + + + default + + Simple Product out of stock %isolation% + sku_simple_product_out_of_stock%isolation% + 1 + + 25 + Out of Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + simple-product-%isolation% + + + + default + + Simple Product offline %isolation% + sku_simple_product_offline_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + Product offline + simple-product-%isolation% + + + + default + + Simple Product not visible %isolation% + sku_simple_product_not_visible_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Not Visible Individually + + order_default + + simple-product-%isolation% + + + + default + + Simple Product with cart limit %isolation% + sku_simple_product_with_cart_limit_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + + 2 + 5 + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + drop_down_with_one_option_percent_price + + + drop_down_with_one_option_percent_price + + simple-product-%isolation% + + Main Website + + + + + default + + Simple Product with qty increments %isolation% + sku_simple_product_with_qty_increments_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + + Yes + 2 + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + 25 + In Stock + + simple-product-%isolation% + + default + + + Main Website + + + + + default + + Simple Product with msrp %isolation% + sku_simple_product_with_msrp_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + 600 + Before Order Confirmation + + + simple_product_with_category_%isolation% + Simple product with category %isolation% + + 666 + In Stock + + 1 + + default + + + 100 + + + + default_anchor_subcategory + + + Main Website + + simple_with_category + simple-product-%isolation% + + + simple + + default + + + default_subcategory + + + Main Website + + Simple Product With Fpt %isolation% + sku_simple_product_%isolation% + + 70 + - + + 1 + + drop_down_with_one_option_fixed_price + + + drop_down_with_one_option_fixed_price + + simple-product-%isolation% + + one_fpt_for_all_states + + + + simple + + default + + + default_subcategory + + + Main Website + + Simple Product With Fpt %isolation% + sku_simple_product_%isolation% + + 110 + - + + 100 + 1 + simple-product-%isolation% + + one_fpt_for_all_states + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php index 7112e6f9cd134..0d93b5fce71f6 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php @@ -24,7 +24,7 @@ class CatalogProductVirtual extends AbstractRepository public function __construct(array $defaultConfig = [], array $defaultData = []) { $this->_data['default'] = [ - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'status' => 'Product online', 'website_ids' => ['Main Website'], 'is_virtual' => 'Yes', @@ -42,7 +42,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) ]; $this->_data['virtual_big_qty'] = [ - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'status' => 'Product online', 'website_ids' => ['Main Website'], 'is_virtual' => 'Yes', @@ -60,7 +60,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) ]; $this->_data['virtual_for_sales'] = [ - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'status' => 'Product online', 'website_ids' => ['Main Website'], 'is_virtual' => 'Yes', @@ -77,10 +77,10 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'checkout_data' => ['preset' => 'order_custom_price'], ]; - $this->_data['50_dollar_product'] = [ - 'name' => '50_dollar_product %isolation%', - 'sku' => '50_dollar_product_%isolation%', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + $this->_data['product_50_dollar'] = [ + 'name' => 'product_50_dollar %isolation%', + 'sku' => 'product_50_dollar_%isolation%', + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'status' => 'Product online', 'website_ids' => ['Main Website'], 'is_virtual' => 'Yes', @@ -92,7 +92,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'is_in_stock' => 'In Stock', ], 'price' => ['value' => 50.00, 'preset' => '-'], - 'checkout_data' => ['preset' => '50_dollar_product'], + 'checkout_data' => ['preset' => 'product_50_dollar'], ]; } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml new file mode 100644 index 0000000000000..9ec91452dc7ac --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml @@ -0,0 +1,120 @@ + + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 666 + In Stock + + + 10 + - + + + order_default + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 1000 + In Stock + + + 10 + - + + + order_big_qty + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 666 + In Stock + + + 10 + - + + + order_custom_price + + + + product_50_dollar %isolation% + product_50_dollar_%isolation% + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + + 111 + In Stock + + + 50 + - + + + product_50_dollar + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml new file mode 100644 index 0000000000000..8be6b6c395a43 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + Yes + 1 + display_setting + select + + + + + 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 index 553e7532b6063..9ddc8f5a79c00 100644 --- 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 @@ -13,7 +13,7 @@ "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%";"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/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv index dc44ec2e9cf81..ba028895faf44 100644 --- 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 @@ -1,7 +1,7 @@ "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%";"-";"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" 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 index c7ce0a25c7ea6..0999bff07cc58 100644 --- 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 @@ -1,12 +1,12 @@ "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";"constraint" "VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku" +"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"taxable_goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" +"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" "VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku" +"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"taxable_goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" +"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" "VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" "VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku" diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml new file mode 100644 index 0000000000000..0db3d81236cbc --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -0,0 +1,99 @@ + + + + + Active Catalog Rule + Rule Description + Active + + Main Website + + + NOT LOGGED IN + General + Wholesale + Retailer + + 3/25/14 + 3/29/14 + 1 + By Percentage of the Original Price + 50 + + + Inactive Catalog Price Rule + Inactive + + Main Website + + + NOT LOGGED IN + + By Percentage of the Original Price + 50 + + + Active Catalog Rule with conditions %isolation% + Rule Description + Active + + Main Website + + + NOT LOGGED IN + General + Wholesale + Retailer + + [Category|is|2] + By Percentage of the Original Price + 10 + + + catalog_price_rule_priority_0 + -50% of price, Priority = 0 + Active + + Main Website + + + NOT LOGGED IN + + 0 + By Percentage of the Original Price + 50 + + + catalog_price_rule_priority_1_stop_further_rules + Priority 1, -5 By fixed amount + Active + + Main Website + + + NOT LOGGED IN + + 1 + By Fixed Amount + 5 + Yes + + + catalog_price_rule_priority_2 + Priority 2, -10 By fixed amount + Active + + Main Website + + + NOT LOGGED IN + + 2 + By Fixed Amount + 10 + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml new file mode 100644 index 0000000000000..7f26066d75825 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml @@ -0,0 +1,17 @@ + + + + + + Query text %isolation% + + Main Website/Main Website Store/Default Store View + Synonym word %isolation% + http://example.com/ + No + + 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 index 632334968d951..d5bcec10813bb 100644 --- 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 @@ -2,8 +2,8 @@ "bundleProduct::bundle_dynamic_product";"200";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"" "bundleProduct::bundle_fixed_product";"756";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-28350" "catalogProductSimple::with_two_custom_option";"340";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"" -"catalogProductVirtual::50_dollar_product";"50";"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";"Bug: MAGETWO-24195" "groupedProductInjectable::three_simple_products";"1920";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"" -"catalogProductSimple::with_two_custom_option, catalogProductVirtual::50_dollar_product, 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";"Bug: MAGETWO-28350" +"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";"Bug: MAGETWO-28350" 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 index a1d9b4beef900..1ab5c0a0b3724 100644 --- 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 @@ -2,8 +2,8 @@ "bundleProduct::bundle_dynamic_product";"assertCartIsEmpty";"" "bundleProduct::bundle_fixed_product";"assertCartIsEmpty";"Bug: MAGETWO-28350" "catalogProductSimple::with_two_custom_option";"assertCartIsEmpty";"" -"catalogProductVirtual::50_dollar_product";"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::50_dollar_product, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProductInjectable::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"assertCartIsEmpty";"Bug: MAGETWO-28350" +"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";"Bug: MAGETWO-28350" diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php index 882d87fa3c65d..13dc36fb25ae9 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php @@ -31,7 +31,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'default'], 'quantity_and_stock_status' => [ @@ -49,7 +49,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'size'], 'quantity_and_stock_status' => [ @@ -67,7 +67,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'color_and_size'], 'quantity_and_stock_status' => [ @@ -85,7 +85,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'one_variation'], 'quantity_and_stock_status' => [ @@ -103,7 +103,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'default'], 'quantity_and_stock_status' => [ @@ -121,7 +121,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'with_one_option'], 'quantity_and_stock_status' => [ @@ -139,7 +139,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'weight' => 30.0000, 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-configurable-product-%isolation%', 'configurable_attributes_data' => ['preset' => 'with_out_of_stock_item'], 'quantity_and_stock_status' => [ diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml new file mode 100644 index 0000000000000..c39563d8be508 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -0,0 +1,206 @@ + + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + default + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product with size %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + size + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product with color and size %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + color_and_size + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + test-configurable-product-%isolation% + + one_variation + + + In Stock + + + Main Website + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + No + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + default + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 10 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + with_one_option + + + In Stock + + + Main Website + + + default + + + with_one_option + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + test-configurable-product-%isolation% + + with_out_of_stock_item + + + In Stock + + + Main Website + + + default + + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml new file mode 100644 index 0000000000000..3aadbbc94ae7c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -0,0 +1,16 @@ + + + + + + variableCode%isolation% + variableName%isolation% +

variableName%isolation%

 + variableName%isolation% + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml new file mode 100644 index 0000000000000..367a08944fbf2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml @@ -0,0 +1,229 @@ + + + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + Yes + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + No + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6262 Fifth Avenue + New York + New York + 90230 + United States + 555-55-555-55 + No + No + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + No + + + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + Yes + + + John + Doe + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 3222 Cliffside Drive + Binghamton + New York + 13901 + United States + 607-481-7802 + Yes + Yes + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 7700 W. Parmer Lane Bldg. D + Austin + Texas + 78729 + United States + 512-691-4400 + Yes + Yes + + + John + Doe + JohnDoe_%isolation%@example.com + Magento %isolation% + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + 555-55-555-55 + + + Jane + Doe + JaneDoe_%isolation%@example.com + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + 444-44-444-44 + + + John + Doe + Magento %isolation% + John.Doe%isolation%@example.com + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + + + Billy + Holiday + Magento %isolation% + b.holliday@example.net + New York + 727 5th Ave + 10022 + United States + New York + 777-77-77-77 + + + John + Doe + Magento %isolation% + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + + + Jan + Jansen + Magento %isolation% + Berlin + Augsburger Strabe 41 + 10789 + Germany + Berlin + 333-33-333-33 + + + Jane + Doe + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + + + Jane + Doe + Magento %isolation% + Manchester + 42 King Street West + M3 2WY + United Kingdom + Manchester + 444-44-444-44 + + + Jane + Doe + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + 584451913 + + + Dmytro + Aponasenko + Culver City + 1 Main St + 90230 + United States + Culver City + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php index f32756c1ba3af..9df632a573e02 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php @@ -24,30 +24,30 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) $this->_data['General'] = [ 'customer_group_id' => '1', 'customer_group_code' => 'General', - 'tax_class_id' => ['dataSet' => 'Retail Customer'], + 'tax_class_id' => ['dataSet' => 'retail_customer'], ]; $this->_data['Retailer'] = [ 'customer_group_id' => '3', 'customer_group_code' => 'Retailer', - 'tax_class_id' => ['dataSet' => 'Retail Customer'], + 'tax_class_id' => ['dataSet' => 'retail_customer'], ]; $this->_data['Wholesale'] = [ 'customer_group_id' => '2', 'customer_group_code' => 'Wholesale', - 'tax_class_id' => ['dataSet' => 'Retail Customer'], + 'tax_class_id' => ['dataSet' => 'retail_customer'], ]; - $this->_data['All Customer Groups'] = [ + $this->_data['All_Customer_Groups'] = [ 'customer_group_id' => '0', 'customer_group_code' => 'All Customer Groups', ]; - $this->_data['NOT LOGGED IN'] = [ + $this->_data['NOT_LOGGED_IN'] = [ 'customer_group_id' => '0', 'customer_group_code' => 'NOT LOGGED IN', - 'tax_class_id' => ['dataSet' => 'Retail Customer'], + 'tax_class_id' => ['dataSet' => 'retail_customer'], ]; } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml new file mode 100644 index 0000000000000..85158b45b07f9 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml @@ -0,0 +1,40 @@ + + + + + 1 + General + + retail_customer + + + + 3 + Retailer + + retail_customer + + + + 2 + Wholesale + + retail_customer + + + + 0 + All Customer Groups + + + 0 + NOT LOGGED IN + + retail_customer + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml new file mode 100644 index 0000000000000..e93be99b511ee --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -0,0 +1,111 @@ + + + + + John + Doe + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + + General + + + + John + Doe + + Retailer + + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + 501 + + + Main Website + John + Doe + JohnDoe_%isolation%@example.com + + + John + Doe + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q +
+ US_address +
+ + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + + + Jane + Doe + JaneDoe_%isolation%@example.com + 123123q + 123123q + + + John + Doe%isolation% + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q +
+ US_address_NY +
+ + + John + Doe%isolation% + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q +
+ US_address_TX +
+ + 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 index 215d04ed45753..cd5ff497620b0 100644 --- 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 @@ -1,4 +1,4 @@ "customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint" -"Retail Customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm" -"Retail Customer";"General";"assertCustomerGroupAlreadyExists" +"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/UpdateCustomerGroupEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest/test.csv index 111f6ac2661aa..7df3f6eeb262d 100644 --- 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 @@ -1,5 +1,5 @@ "customerGroup/data/tax_class_id/dataSet";"customerGroup/data/customer_group_code";"constraint" -"Retail Customer";"GroupName%isolation%";"assertCustomerGroupSuccessSaveMessage, assertCustomerGroupInGrid, assertCustomerGroupOnCustomerForm, assertCustomerGroupForm" +"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/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php index 1e61caaeb5e3f..47c71ad7c9ff6 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php @@ -42,7 +42,7 @@ class DownloadableProductInjectable extends InjectableFixture 'sku' => 'DownloadableProduct_%isolation%', 'url_key' => 'downloadableproduct_%isolation%', 'price' => ['value' => 100.00], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'description' => 'This is description for downloadable product', 'short_description' => 'This is short description for downloadable product', 'quantity_and_stock_status' => [ diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 4f6288174ec21..e40082a51626e 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -390,7 +390,7 @@ int 0 - Taxable Goods + taxable_goods select product-details diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php index 65b604c6bb427..0997489ff8aeb 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php @@ -28,7 +28,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'sku_test_downloadable_product_%isolation%', 'price' => ['value' => 280.00, 'preset' => '-'], 'type_id' => 'downloadable', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 90.0000, 'is_in_stock' => 'In Stock', @@ -46,7 +46,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'downloadable_product_%isolation%', 'url_key' => 'downloadable-product-%isolation%', 'price' => ['value' => '20'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 1111, 'is_in_stock' => 'In Stock', @@ -62,7 +62,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'sku' => 'downloadable_product_%isolation%', 'url_key' => 'downloadable-product-%isolation%', 'price' => ['value' => '20'], - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'quantity_and_stock_status' => [ 'qty' => 1111, 'is_in_stock' => 'In Stock', diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml new file mode 100644 index 0000000000000..9e66214d283a0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml @@ -0,0 +1,85 @@ + + + + + Test downloadable product %isolation% + sku_test_downloadable_product_%isolation% + + 280 + - + + downloadable + + taxable_goods + + + 90 + In Stock + + Product online + Catalog, Search + test-downloadable-product-%isolation% + Yes + + default + + + Main Website + + + default + + + + Downloadable product %isolation% + downloadable_product_%isolation% + downloadable-product-%isolation% + + 20 + + + taxable_goods + + + 1111 + In Stock + + Product online + Catalog, Search + Yes + + with_two_separately_links + + + with_two_separately_links + + + + Downloadable product %isolation% + downloadable_product_%isolation% + downloadable-product-%isolation% + + 20 + + + taxable_goods + + + 1111 + In Stock + + Product online + Catalog, Search + Yes + + with_two_separately_links + + + with_two_bought_links + + + 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 index 486f051573ba4..35f2819c56f33 100644 --- 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 @@ -1,15 +1,15 @@ "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%";"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%";"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/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv index c808ff7aad0bd..492debf2dbefc 100644 --- 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 @@ -1,7 +1,7 @@ "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%";"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%";"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/GiftMessage/Test/Repository/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml new file mode 100644 index 0000000000000..db5aee61da723 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml @@ -0,0 +1,13 @@ + + + + + John Doe + Jane Doe + text_%isolation% + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml new file mode 100644 index 0000000000000..e9b8fbaa3a914 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -0,0 +1,15 @@ + + + + + United States + + default + + Apparel & Accessories + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php index 231f625dbd350..dd1ad4bcad2ba 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php @@ -45,7 +45,7 @@ class GroupedProductInjectable extends InjectableFixture protected $defaultDataSet = [ 'name' => 'GroupedProduct_%isolation%', 'sku' => 'GroupedProduct_%isolation%', - 'tax_class' => 'Taxable Goods', + 'tax_class' => 'taxable_goods', 'description' => 'This is description for grouped product', 'short_description' => 'This is short description for grouped product', 'quantity_and_stock_status' => [ diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index e7121b5f9e37f..10322bb5c91dc 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -365,7 +365,7 @@ Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData - Taxable Goods + taxable_goods diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php index 4acbb546fef53..7d9f93b2d8fa6 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php @@ -128,7 +128,7 @@ protected function getPreset($name) ], 'products' => [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], ], 'defaultSimpleProduct_without_qty' => [ @@ -148,7 +148,7 @@ protected function getPreset($name) ], 'products' => [ 'catalogProductSimple::default', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_100_dollar', ], ], 'defaultSimpleProduct_with_specialPrice' => [ @@ -188,7 +188,7 @@ protected function getPreset($name) ], 'products' => [ 'catalogProductVirtual::default', - 'catalogProductVirtual::50_dollar_product', + 'catalogProductVirtual::product_50_dollar', ], ], 'three_simple_products' => [ @@ -214,8 +214,8 @@ protected function getPreset($name) ], 'products' => [ 'catalogProductSimple::default', - 'catalogProductSimple::40_dollar_product', - 'catalogProductSimple::100_dollar_product', + 'catalogProductSimple::product_40_dollar', + 'catalogProductSimple::product_100_dollar', ], ], ]; diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php index 81d65286ed967..36fafaf9a5ba7 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php @@ -30,7 +30,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'associated' => ['preset' => 'defaultSimpleProduct'], 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-grouped-product-%isolation%', 'quantity_and_stock_status' => [ 'is_in_stock' => 'In Stock', @@ -46,7 +46,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'associated' => ['preset' => 'defaultSimpleProduct'], 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-grouped-product-%isolation%', 'quantity_and_stock_status' => [ 'is_in_stock' => 'Out of Stock', @@ -63,7 +63,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'associated' => ['preset' => 'defaultSimpleProduct'], 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-grouped-product-%isolation%', 'quantity_and_stock_status' => [ 'is_in_stock' => 'In Stock', @@ -79,7 +79,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'associated' => ['preset' => 'three_simple_products'], 'status' => 'Product online', 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'tax_class_id' => ['dataSet' => 'taxable_goods'], 'url_key' => 'test-grouped-product-%isolation%', 'quantity_and_stock_status' => [ 'is_in_stock' => 'In Stock', diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml new file mode 100644 index 0000000000000..f6c6440725e64 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml @@ -0,0 +1,115 @@ + + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + Out of Stock + + + Main Website + + + default + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + - + starting-560 + + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + + Grouped product %isolation% + grouped_product_%isolation% + + default + + + three_simple_products + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + three_simple_products + + + 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 index 892b7ef86617a..d70a99531218b 100644 --- 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 @@ -1,6 +1,6 @@ "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";"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";"assertProductSaveMessage, assertProductInStock, assertProductPage" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductVirtual::default,catalogProductVirtual::50_dollar_product";"defaultVirtualProduct";"-";"-";"assertProductSaveMessage, assertGroupedProductForm" +"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductVirtual::default,catalogProductVirtual::product_50_dollar";"defaultVirtualProduct";"-";"-";"assertProductSaveMessage, assertGroupedProductForm" "default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::default";"defaultSimpleProduct_without_qty";"-";"-";"assertProductSaveMessage, assertGroupedProductsDefaultQty, assertGroupedProductForm" "default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct_with_specialPrice";"-";"-";"assertProductSaveMessage, assertSpecialPriceOnGroupedProductPage" "default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"Out of Stock";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock" diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml new file mode 100644 index 0000000000000..9bd77785063a5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml @@ -0,0 +1,26 @@ + + + + + default_integration_%isolation% + test_%isolation%@example.com + All + + Dashboard + Sales + Products + Customers + My Account + Marketing + Content + Reports + Stores + System + Global Search + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml new file mode 100644 index 0000000000000..4fe81e819373f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml @@ -0,0 +1,15 @@ + + + + + Newsletter Template %isolation% + Newsletter Subject %isolation% + Sender Name %isolation% + support%isolation%@example.com + Template Content %isolation% + + 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 index 2c61b4ec2b3b9..616a10aad7566 100644 --- 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 @@ -1,3 +1,3 @@ "description";"customer/dataSet";"products";"constraint" -"add product to cart as registered user and check product in Report";"default";"catalogProductSimple::100_dollar_product";"assertAbandonedCartCustomerInfoResult" -"add two products to cart as registered user and check product in Report";"default";"catalogProductSimple::100_dollar_product,catalogProductSimple::100_dollar_product";"assertAbandonedCartCustomerInfoResult" +"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/Review/Test/Repository/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml new file mode 100644 index 0000000000000..c286d175a4731 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml @@ -0,0 +1,22 @@ + + + + + Rating %isolation% + + Main Website/Main Website Store/Default Store View + + Yes + + + productRating_%isolation% + + Main Website/Main Website Store/Default Store View + + Yes + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml new file mode 100644 index 0000000000000..f5bc36c22b421 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml new file mode 100644 index 0000000000000..774654e4972cc --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml @@ -0,0 +1,38 @@ + + + + + Approved + + Main Website/Main Website Store/Default Store View + + nickname_%isolation% + title_%isolation% + review_detail_%isolation% + + + visibleOnDefaultWebsite + 5 + + + + catalogProductSimple::default + + + + Pending + + Main Website/Main Website Store/Default Store View + + nickname_%isolation% + title_%isolation% + review_detail_%isolation% + + catalogProductSimple::default + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml new file mode 100644 index 0000000000000..e44c3b0a3cd9e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml @@ -0,0 +1,12 @@ + + + + + sitemap.xml + / + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml new file mode 100644 index 0000000000000..42843a54e789d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -0,0 +1,41 @@ + + + + + + default + + Default Store View + base + Enabled + 1 + + + + default + + Custom_Store_%isolation% + code_%isolation% + Enabled + + + 1 + Default Store View + + + All Store Views + 0 + + + + default + + DE%isolation% + de%isolation% + Enabled + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml new file mode 100644 index 0000000000000..58eb41629b543 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml @@ -0,0 +1,27 @@ + + + + + + main_website + + Main Website Store + 1 + + default_category + + + + + main_website + + store_name_%isolation% + + default_category + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml new file mode 100644 index 0000000000000..793e909ba715a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml @@ -0,0 +1,22 @@ + + + + + All Websites + 0 + + + Main Website + base + 0 + 1 + + + Web_Site_%isolation% + code_%isolation% + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php index 170a2c3466930..d68ff9228e94f 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php @@ -125,7 +125,7 @@ public function processAssert( $this->productSimple = $fixtureFactory->createByCode( 'catalogProductSimple', [ - 'dataSet' => '100_dollar_product_for_tax_rule', + 'dataSet' => 'product_100_dollar_for_tax_rule', 'data' => [ 'tax_class_id' => ['tax_product_class' => $taxProductClass], ] diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php index 075122218f8ee..0f4a65a7ad4fb 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php @@ -26,7 +26,7 @@ class TaxRule extends InjectableFixture 'code' => 'TaxIdentifier%isolation%', 'tax_rate' => [ 'dataSet' => [ - 'US-CA-*-Rate 1', + 'US-CA-Rate_1', ], ], ]; diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index 80e281d29311e..8ce3d872654eb 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -47,7 +47,7 @@ Magento\Tax\Test\Fixture\TaxRule\TaxRate - US-CA-*-Rate 1 + US-CA-Rate_1 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php index 8259ce2fc65a4..ea387781fdff5 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php @@ -20,7 +20,7 @@ class TaxClass extends AbstractRepository */ public function __construct(array $defaultConfig = [], array $defaultData = []) { - $this->_data['Taxable Goods'] = [ + $this->_data['taxable_goods'] = [ 'class_id' => '2', 'class_name' => 'Taxable Goods', 'class_type' => 'PRODUCT', @@ -28,7 +28,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'mtf_dataset_name' => 'Taxable Goods', ]; - $this->_data['Retail Customer'] = [ + $this->_data['retail_customer'] = [ 'class_id' => '3', 'class_name' => 'Retail Customer', 'class_type' => 'CUSTOMER', diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml index 74135ada444b1..4c81b7be4223a 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml @@ -5,18 +5,34 @@ */ --> - + 2 - - + Taxable Goods + PRODUCT 2 - - - + Taxable Goods + + 3 - - + Retail Customer + CUSTOMER 3 - - + Retail Customer + + + Customer Tax Class %isolation% + CUSTOMER + + + Product Tax Class %isolation% + PRODUCT + + + None + PRODUCT + 0 + + + All + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php index 931139c023371..b74ddad8c7ed4 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php @@ -22,7 +22,7 @@ class TaxRate extends AbstractRepository */ public function __construct(array $defaultConfig = [], array $defaultData = []) { - $this->_data['US-CA-*-Rate 1'] = [ + $this->_data['US-CA-Rate_1'] = [ 'tax_calculation_rate_id' => '1', 'tax_country_id' => 'US', 'tax_region_id' => '12', @@ -36,7 +36,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'mtf_dataset_name' => 'US-CA-*-Rate 1', ]; - $this->_data['US-NY-*-Rate 1'] = [ + $this->_data['US-NY-Rate_1'] = [ 'tax_calculation_rate_id' => '2', 'tax_country_id' => 'US', 'tax_region_id' => '43', diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml index ccbfad291b187..48e2eda08518a 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml @@ -5,30 +5,135 @@ */ --> - + 1 - + US 12 - - + * + US-CA-*-Rate 1 8.2500 - - - + + + 1 - - - + US-CA-*-Rate 1 + + 2 - + US 43 - - + * + US-NY-*-Rate 1 8.3750 - - - + + + 2 - - + US-NY-*-Rate 1 + + + Tax Rate %isolation% + 8.25 + United States + 90230 + California + + + Tax Rate %isolation% + 8.25 + United States + * + California + + + Tax Rate %isolation% + 8.375 + United States + * + California + + + Tax Rate %isolation% + 8.375 + United States + New York + * + + + Tax Rate %isolation% + 8.25 + United States + New York + * + + + US-NY-*-%isolation% + 8.1 + United States + New York + * + + + Tax Rate %isolation% + 8.25 + United States + 95131 + California + + + Tax Rate %isolation% + 20 + United Kingdom + * + + + TaxIdentifier%isolation% + * + Australia + 20 + + + TaxIdentifier%isolation% + Yes + 90001 + 96162 + United States + California + 15.5 + + + TaxIdentifier%isolation% + * + United States + Texas + 20 + + + TaxIdentifier%isolation% + 84001 + United States + Utah + 20 + + + TaxIdentifier%isolation% + * + United States + Texas + 10 + + + TaxIdentifier%isolation% + * + United States + New York + 20 + + + TaxIdentifier%isolation% + * + United States + California + 30 + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php index 400078fc61020..4a98c3bcaf56b 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php @@ -37,19 +37,19 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'code' => 'Tax Rule %isolation%', 'tax_rate' => [ 'dataSet' => [ - 0 => 'US-CA-*-Rate 1', + 0 => 'US-CA-Rate_1', 1 => 'us_ny_rate_8_1', ], ], 'tax_customer_class' => [ 'dataSet' => [ - 0 => 'Retail Customer', + 0 => 'retail_customer', 1 => 'customer_tax_class', ], ], 'tax_product_class' => [ 'dataSet' => [ - 0 => 'Taxable Goods', + 0 => 'taxable_goods', 1 => 'product_tax_class', ], ], @@ -72,17 +72,17 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'code' => 'TaxIdentifier%isolation%', 'tax_rate' => [ 'dataSet' => [ - 0 => 'US-CA-*-Rate 1', + 0 => 'US-CA-Rate_1', ], ], 'tax_customer_class' => [ 'dataSet' => [ - 0 => 'Retail Customer', + 0 => 'retail_customer', ], ], 'tax_product_class' => [ 'dataSet' => [ - 0 => 'Taxable Goods', + 0 => 'taxable_goods', ], ], 'priority' => '1', @@ -93,20 +93,20 @@ public function __construct(array $defaultConfig = [], array $defaultData = []) 'code' => 'TaxIdentifier%isolation%', 'tax_rate' => [ 'dataSet' => [ - 0 => 'US-CA-*-Rate 1', - 1 => 'US-NY-*-Rate 1', + 0 => 'US-CA-Rate_1', + 1 => 'US-NY-Rate_1', ], ], 'tax_customer_class' => [ 'dataSet' => [ - 0 => 'Retail Customer', + 0 => 'retail_customer', 1 => 'customer_tax_class', ], ], 'tax_product_class' => [ 'dataSet' => [ 0 => 'product_tax_class', - 1 => 'Taxable Goods', + 1 => 'taxable_goods', ], ], 'priority' => '1', diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml new file mode 100644 index 0000000000000..2fe565d3f9093 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml @@ -0,0 +1,140 @@ + + + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25 + us_ny_rate_8_375 + + + 0 + 0 + + + Tax Rule %isolation% + + + US-CA-Rate_1 + us_ny_rate_8_1 + + + + + retail_customer + customer_tax_class + + + + + taxable_goods + product_tax_class + + + 0 + 0 + + + TaxIdentifier%isolation% + + + uk_full_tax_rate + + + 0 + 0 + + + TaxIdentifier%isolation% + + + US-CA-Rate_1 + + + + + retail_customer + + + + + taxable_goods + + + 1 + 1 + + + TaxIdentifier%isolation% + + + US-CA-Rate_1 + US-NY-Rate_1 + + + + + retail_customer + customer_tax_class + + + + + product_tax_class + taxable_goods + + + 1 + 1 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25_no_zip + us_ny_rate_8_25 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_375 + us_ny_rate_8_25 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25_no_zip + us_ny_rate_8_375 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + tx_rate_10 + ny_rate_20 + ca_rate_30 + + + 0 + 0 + + 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 index 3b880e7f96e98..b2bdea51c632e 100644 --- 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 @@ -1,5 +1,5 @@ "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" +"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/UpdateTaxRuleEntityTest/testUpdateTaxRule.csv b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest/testUpdateTaxRule.csv index a2cf204815996..ef703c7b92e08 100644 --- 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 @@ -1,5 +1,5 @@ "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";"-";"-";"-";"-";"-";"-";"-";"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/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml new file mode 100644 index 0000000000000..44ec02d9e0a11 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml @@ -0,0 +1,26 @@ + + + + + test-test-test%isolation%.html + http://www.ebayinc.com/ + Temporary (302) + Main Website/Main Website Store/Default Store View + + + test-test-test%isolation%.html + Temporary (302) + Main Website/Main Website Store/Default Store View + + + Main Website/Main Website Store/Default Store View + wishlist/%isolation% + http://google.com + Temporary (302) + test description + + 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 index d5b350c767936..58e27c235e06a 100644 --- 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 @@ -1,2 +1,2 @@ "productRedirect/dataSet";"productRedirect/data/target_path/entity";"constraint" -"default_without_target";"product/%catalogProductSimple::100_dollar_product%";"assertUrlRewriteDeletedMessage, assertUrlRewriteNotInGrid, assertPageByUrlRewriteIsNotFound" +"default_without_target";"product/%catalogProductSimple::product_100_dollar%";"assertUrlRewriteDeletedMessage, assertUrlRewriteNotInGrid, assertPageByUrlRewriteIsNotFound" 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 index 5baa25f7f6cf3..f910d38e94936 100644 --- 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 @@ -1,2 +1,2 @@ "urlRewrite/data/target_path/entity";"urlRewrite/data/store_id";"urlRewrite/data/request_path";"urlRewrite/data/redirect_type";"urlRewrite/data/description";"isRequired";"constraint" -"product/%catalogProductSimple::100_dollar_product%";"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";"assertUrlRewriteSaveMessage, assertUrlRewriteProductRedirect" diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml new file mode 100644 index 0000000000000..af5be980cd655 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml @@ -0,0 +1,42 @@ + + + + + RoleName%isolation% + All + + + Administrators + All + 1 + + + RoleName%isolation% + Custom + + Magento_Sales::sales + Magento_Sales::sales_operation + Magento_Sales::actions + Magento_Sales::sales_order + Magento_Sales::create + Magento_Sales::actions_view + Magento_Sales::email + Magento_Sales::reorder + Magento_Sales::actions_edit + Magento_Sales::cancel + Magento_Sales::review_payment + Magento_Sales::capture + Magento_Sales::invoice + Magento_Sales::creditmemo + Magento_Sales::hold + Magento_Sales::unhold + Magento_Sales::ship + Magento_Sales::comment + Magento_Sales::emails + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php index d17271719c6bd..36f6bad19cd83 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php @@ -23,9 +23,6 @@ class User extends AbstractRepository */ public function __construct(array $defaultConfig = [], array $defaultData = []) { - /** @var \Mtf\System\Config $systemConfig */ - $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config'); - $superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password'); $this->_data['default'] = [ 'username' => 'admin', 'firstname' => 'FirstName%isolation%', diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml new file mode 100644 index 0000000000000..4ff7a892044c2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml @@ -0,0 +1,40 @@ + + + + + admin + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + 1 + %current_password% + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + %current_password% + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + + default + + %current_password% + Active + + From 077825edba96bb4aa98f6d2b35a175f5ec4a0071 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Mon, 12 Jan 2015 16:05:33 +0200 Subject: [PATCH 04/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 repositories to new format - Changed xml format --- .../Bundle/Test/Repository/BundleProduct.xml | 246 +-- .../Test/Fixture/CatalogProductSimple.xml | 4 +- .../Test/Repository/CatalogAttributeSet.xml | 42 +- .../Test/Repository/CatalogCategory.xml | 86 +- .../Repository/CatalogProductAttribute.xml | 214 +- .../Test/Repository/CatalogProductSimple.xml | 1814 +++++++++-------- .../Test/Repository/CatalogProductVirtual.xml | 228 ++- .../Catalog/Test/Repository/Category.xml | 44 +- .../Test/Repository/CatalogRule.xml | 186 +- .../Test/Repository/CatalogSearchQuery.xml | 22 +- .../Core/Test/Repository/SystemVariable.xml | 22 +- .../Test/Repository/AddressInjectable.xml | 446 ++-- .../Repository/CustomerGroupInjectable.xml | 68 +- .../Test/Repository/CustomerInjectable.xml | 210 +- .../DownloadableProductInjectable.xml | 158 +- .../Test/Repository/GiftMessage.xml | 14 +- .../Repository/GoogleShoppingAttribute.xml | 11 +- .../Repository/GroupedProductInjectable.xml | 218 +- .../Test/Repository/Integration.xml | 40 +- .../Newsletter/Test/Repository/Template.xml | 18 +- .../Magento/Review/Test/Repository/Rating.xml | 32 +- .../Magento/Review/Test/Repository/Review.xml | 16 +- .../Test/Repository/ReviewInjectable.xml | 64 +- .../Sitemap/Test/Repository/Sitemap.xml | 12 +- .../Magento/Store/Test/Repository/Store.xml | 37 +- .../Store/Test/Repository/StoreGroup.xml | 42 +- .../Magento/Store/Test/Repository/Website.xml | 32 +- .../Magento/Tax/Test/Repository/TaxClass.xml | 64 +- .../Magento/Tax/Test/Repository/TaxRate.xml | 266 +-- .../Magento/Tax/Test/Repository/TaxRule.xml | 268 +-- .../UrlRewrite/Test/Repository/UrlRewrite.xml | 40 +- .../User/Test/Repository/AdminUserRole.xml | 38 +- .../app/Magento/User/Test/Repository/User.xml | 68 +- 33 files changed, 2536 insertions(+), 2534 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml index 0d60c6411c9fa..4d060500143d2 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -4,126 +4,128 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - BundleDynamic_sku_10735074493 - BundleDynamic 1073507449 - - 1 - 2 - - - - - taxable_goods - - 0 - 0 - 0 - Product online - 1 - bundle-dynamic-product-%isolation% - BundleDynamic_sku_1073507449 - - Main Website - - - - BundleDynamic_sku_215249172 - BundleDynamic 215249172 - - 3 - 4 - - - - - taxable_goods - - 0 - 0 - 0 - 1 - bundle-dynamic-product-%isolation% - BundleDynamic_sku_215249172 - - Main Website - - - - Bundle dynamic product %isolation% - sku_bundle_dynamic_product_%isolation% - Dynamic - Dynamic - - - - default_dynamic - - - 666 - In Stock - - Dynamic - Separately - - taxable_goods - - - Main Website - - - Yes - Yes - Yes - In Stock - - bundle-dynamic-product-%isolation% - Catalog, Search - - default_dynamic - - Default - - default_dynamic - - - - Bundle fixed product %isolation% - sku_bundle_fixed_product_%isolation% - Fixed - Fixed - - 750 - default_fixed - - - taxable_goods - - - 666 - In Stock - - 1 - Fixed - Product online - Together - - Main Website - - - Yes - Yes - Yes - In Stock - - bundle-fixed-product-%isolation% - Catalog, Search - - default_fixed - - Default - - default_fixed - - + + + + BundleDynamic_sku_10735074493 + BundleDynamic 1073507449 + + 1 + 2 + + + + + taxable_goods + + 0 + 0 + 0 + Product online + 1 + bundle-dynamic-product-%isolation% + BundleDynamic_sku_1073507449 + + Main Website + + + + BundleDynamic_sku_215249172 + BundleDynamic 215249172 + + 3 + 4 + + + + + taxable_goods + + 0 + 0 + 0 + 1 + bundle-dynamic-product-%isolation% + BundleDynamic_sku_215249172 + + Main Website + + + + Bundle dynamic product %isolation% + sku_bundle_dynamic_product_%isolation% + Dynamic + Dynamic + + - + default_dynamic + + + 666 + In Stock + + Dynamic + Separately + + taxable_goods + + + Main Website + + + Yes + Yes + Yes + In Stock + + bundle-dynamic-product-%isolation% + Catalog, Search + + default_dynamic + + Default + + default_dynamic + + + + Bundle fixed product %isolation% + sku_bundle_fixed_product_%isolation% + Fixed + Fixed + + 750 + default_fixed + + + taxable_goods + + + 666 + In Stock + + 1 + Fixed + Product online + Together + + Main Website + + + Yes + Yes + Yes + In Stock + + bundle-fixed-product-%isolation% + Catalog, Search + + default_fixed + + Default + + default_fixed + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 766c5cad69bee..8c9b29afea47a 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -22,7 +22,7 @@ product - + category_ids static 0 @@ -30,7 +30,7 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + color int diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml index 7ad7d69268c8e..67abbaa60332a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml @@ -4,24 +4,26 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Default - 4 - - - Custom_attribute_set%isolation% - - default - - - - Custom_attribute_set%isolation% - - default - - - attribute_type_fpt - - + + + + Default + 4 + + + Custom_attribute_set%isolation% + + default + + + + Custom_attribute_set%isolation% + + default + + + attribute_type_fpt + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml index 542088cd6b815..d8a0a8b724ce2 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml @@ -4,46 +4,48 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Default Category - 1 - Yes - 2 - - - DefaultSubcategory%isolation% - default-subcategory-%isolation% - - default_category - - Yes - Yes - - - DefaultSubcategory%isolation% - default-subcategory-%isolation% - - default_category - - Yes - Yes - Yes - - - RootCategory%isolation% - root-category-%isolation% - 1 - Yes - Yes - - - RootSubCategory%isolation% - root-sub-category-%isolation% - - root_category - - Yes - Yes - + + + + Default Category + 1 + Yes + 2 + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + + Yes + Yes + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + + Yes + Yes + Yes + + + RootCategory%isolation% + root-category-%isolation% + 1 + Yes + Yes + + + RootSubCategory%isolation% + root-sub-category-%isolation% + + root_category + + Yes + Yes + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml index 6dc7db23f64dd..05dc57c581a80 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml @@ -4,110 +4,112 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - attribute_text%isolation% - attribute_text%isolation% - Text Field - No - - - attribute_dropdown%isolation% - attribute_dropdown%isolation% - Dropdown - No - Yes - - - Yes - black - option_0_%isolation% - - - No - white - option_1_%isolation% - - - No - green - option_2_%isolation% - - - - - attribute_dropdown%isolation% - attribute_dropdown%isolation% - Dropdown - No - Yes - - - Yes - black - option_0_%isolation% - - - No - white - option_1_%isolation% - - - - - attribute_dropdown%isolation% - attribute_dropdown%isolation% - Dropdown - No - Yes - - - Yes - black - option_0_%isolation% - - - - - color_%isolation% - color_%isolation% - Dropdown - No - Yes - - - Yes - black - black_%isolation% - - - No - white - white_%isolation% - - - - - size_%isolation% - size_%isolation% - Dropdown - No - Yes - - - Yes - xl - xl_%isolation% - - - No - xxl - xxl_%isolation% - - - - - fpt_%isolation% - Fixed Product Tax - + + + + attribute_text%isolation% + attribute_text%isolation% + Text Field + No + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + No + white + option_1_%isolation% + + + No + green + option_2_%isolation% + + + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + No + white + option_1_%isolation% + + + + + attribute_dropdown%isolation% + attribute_dropdown%isolation% + Dropdown + No + Yes + + + Yes + black + option_0_%isolation% + + + + + color_%isolation% + color_%isolation% + Dropdown + No + Yes + + + Yes + black + black_%isolation% + + + No + white + white_%isolation% + + + + + size_%isolation% + size_%isolation% + Dropdown + No + Yes + + + Yes + xl + xl_%isolation% + + + No + xxl + xxl_%isolation% + + + + + fpt_%isolation% + Fixed Product Tax + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index b65fdaa5cfccf..4cf762395dc98 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -4,905 +4,917 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - No - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - simple-product-%isolation% - - order_default - - - - Simple Product %isolation% - sku_simple_product_%isolation% - No - 1 - - 25 - In Stock - - simple-product-%isolation% - - 560 - - - - - Main Website - - Catalog, Search - - order_default - - - - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - 1 - - 1000 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - simple-product-%isolation% - - order_big_qty - - - - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - simple-product-%isolation% - - order_custom_price - - - - product_100_dollar%isolation% - product_100_dollar%isolation% - simple - - 666 - In Stock - - 1 - - default - - - 100 - - - - - Main Website - - simple-product-%isolation% - - two_products - - - - product_40_dollar%isolation% - product_40_dollar%isolation% - simple - - 666 - In Stock - - 1 - - default - - - 40 - - - - product_40_dollar - simple-product-%isolation% - - Main Website - - - - MAGETWO-23036_%isolation% - simple_with_category %isolation% - - default - - simple - - 666 - In Stock - - 1 - - 100 - MAGETWO-23036 - - - default_subcategory - - simple_with_category - - Main Website - - simple-product-%isolation% - - - simple_product_with_category_%isolation% - Simple product with category %isolation% - - 666 - In Stock - - 1 - - default - - - 100 - - - - default_subcategory - - - Main Website - - simple_with_category - simple-product-%isolation% - - - - default - - simple - - 666 - In Stock - - Simple Product %isolation% - sku_simple_product_%isolation% - - 100 - - - 100 - - Main Website - - simple-product-%isolation% - - default_subcategory - - - - simple_for_composite_products%isolation% - simple_for_composite_products%isolation% - - 560 - - - - - default - - - taxable_goods - - - 111 - In Stock - - 1 - 1 - - Main Website - - - Yes - 111 - In Stock - - simple-for-composite-products%isolation% - Catalog, Search - - - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 50 - - - 50 - - Main Website - - simple-product-%isolation% - - default_subcategory - - - - simple_product_with_special_price_and_category%isolation% - Simple product with special price and category %isolation% - - default - - - 100 - - - 90 - - default_subcategory - - - Main Website - - simple-product-%isolation% - - - simple_product_with_special_price_and_category%isolation% - Simple with Special Price 1$ off %isolation% - - default - - - 10 - - - 9 - - Main Website - - simple-product-%isolation% - - - adc_123_%isolation% - adc_123 - - 100 - - - - - None - - - 666 - In Stock - - 1 -

dfj_full

 - Product online - - Main Website - - Catalog, Search - simple-product-%isolation% - - - Simple with Weight 0.1 %isolation% - adc_123 - - 100 - - - - - None - - - 666 - In Stock - - 0.1 -

Simple with Weight 0.1

 - Product online - - Main Website - - Catalog, Search - simple-product-%isolation% - - - Simple with Weight 150.1 %isolation% - adc_123 - - 100 - - - - - None - - - 666 - In Stock - - 150.1 -

Simple with Weight 150.1

 - Product online - - Main Website - - Catalog, Search - simple-product-%isolation% - - - abc_dfj_%isolation% - abc_dfj - - 50 - - - - - taxable_goods - - - 666 - In Stock - - 1 -

adc_Full

 - Product online -

abc_short

 - - Main Website - - Catalog, Search - simple-product-%isolation% - - - product_100_dollar%isolation% - product_100_dollar%isolation% - - default - - simple - - 25 - In Stock - - 1 - - 100 - - - - - Main Website - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 100 - - - - 1 - simple-product-%isolation% - 9 - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 100 - - - - 1 - - default - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 100 - - - - 1 - - tax_calculation - - - default_subcategory - - - Main Website - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - default - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - default - - - default_subcategory - - - Main Website - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - two_options - - simple-product-%isolation% - - with_two_custom_option - - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - drop_down_with_one_option_percent_price - - - drop_down_with_one_option_percent_price - - - Main Website - - - default_subcategory - - simple-product-%isolation% - - - simple - - default - - Simple Product With Custom Option %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - simple-product-%isolation% - - all_types - - - - low_stock_product%isolation% - low_stock_product%isolation% - simple - - 1 - In Stock - - - No - 2 - - 1 - - default - - - 100 - - - - - Main Website - - simple-product-%isolation% - - - - default - - Simple Product out of stock %isolation% - sku_simple_product_out_of_stock%isolation% - 1 - - 25 - Out of Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - - order_default - - simple-product-%isolation% - - - - default - - Simple Product offline %isolation% - sku_simple_product_offline_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - - order_default - - Product offline - simple-product-%isolation% - - - - default - - Simple Product not visible %isolation% - sku_simple_product_not_visible_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Not Visible Individually - - order_default - - simple-product-%isolation% - - - - default - - Simple Product with cart limit %isolation% - sku_simple_product_with_cart_limit_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - - order_default - - - 2 - 5 - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - drop_down_with_one_option_percent_price - - - drop_down_with_one_option_percent_price - - simple-product-%isolation% - - Main Website - - - - - default - - Simple Product with qty increments %isolation% - sku_simple_product_with_qty_increments_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - - order_default - - - Yes - 2 - - simple-product-%isolation% - - - simple - - default - - Simple Product %isolation% - sku_simple_product_%isolation% - - 300 - - - - 1 - - 25 - In Stock - - simple-product-%isolation% - - default - - - Main Website - - - - - default - - Simple Product with msrp %isolation% - sku_simple_product_with_msrp_%isolation% - 1 - - 25 - In Stock - - - 560 - - - - - taxable_goods - - - Main Website - - Catalog, Search - - order_default - - 600 - Before Order Confirmation - - - simple_product_with_category_%isolation% - Simple product with category %isolation% - - 666 - In Stock - - 1 - - default - - - 100 - - - - default_anchor_subcategory - - - Main Website - - simple_with_category - simple-product-%isolation% - - - simple - - default - - - default_subcategory - - - Main Website - - Simple Product With Fpt %isolation% - sku_simple_product_%isolation% - - 70 - - - - 1 - - drop_down_with_one_option_fixed_price - - - drop_down_with_one_option_fixed_price - - simple-product-%isolation% - - one_fpt_for_all_states - - - - simple - - default - - - default_subcategory - - - Main Website - - Simple Product With Fpt %isolation% - sku_simple_product_%isolation% - - 110 - - - - 100 - 1 - simple-product-%isolation% - - one_fpt_for_all_states - - + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + No + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_default + + + + Simple Product %isolation% + sku_simple_product_%isolation% + No + 1 + + 25 + In Stock + + simple-product-%isolation% + + 560 + - + + + Main Website + + Catalog, Search + + order_default + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + 1 + + 1000 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_big_qty + + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + simple-product-%isolation% + + order_custom_price + + + + product_100_dollar%isolation% + product_100_dollar%isolation% + simple + + 666 + In Stock + + 1 + + default + + + 100 + - + + + Main Website + + simple-product-%isolation% + + two_products + + + + product_40_dollar%isolation% + product_40_dollar%isolation% + simple + + 666 + In Stock + + 1 + + default + + + 40 + - + + product_40_dollar + simple-product-%isolation% + + Main Website + + + + MAGETWO-23036_%isolation% + simple_with_category %isolation% + + default + + simple + + 666 + In Stock + + 1 + + 100 + MAGETWO-23036 + + + default_subcategory + + simple_with_category + + Main Website + + simple-product-%isolation% + + + simple_product_with_category_%isolation% + Simple product with category %isolation% + + 666 + In Stock + + 1 + + default + + + 100 + + + + default_subcategory + + + Main Website + + simple_with_category + simple-product-%isolation% + + + + default + + simple + + 666 + In Stock + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + + + 100 + + Main Website + + simple-product-%isolation% + + default_subcategory + + + + simple_for_composite_products%isolation% + simple_for_composite_products%isolation% + + 560 + - + + + default + + + taxable_goods + + + 111 + In Stock + + 1 + 1 + + Main Website + + + Yes + 111 + In Stock + + simple-for-composite-products%isolation% + Catalog, Search + + + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 50 + + + 50 + + Main Website + + simple-product-%isolation% + + default_subcategory + + + + simple_product_with_special_price_and_category%isolation% + Simple product with special price and category %isolation% + + default + + + 100 + + + 90 + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple_product_with_special_price_and_category%isolation% + Simple with Special Price 1$ off %isolation% + + default + + + 10 + + + 9 + + Main Website + + simple-product-%isolation% + + + adc_123_%isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 1 + + dfj_full + + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + Simple with Weight 0.1 %isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 0.1 + + Simple with Weight 0.1 + + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + Simple with Weight 150.1 %isolation% + adc_123 + + 100 + - + + + None + + + 666 + In Stock + + 150.1 + + Simple with Weight 150.1 + + Product online + + Main Website + + Catalog, Search + simple-product-%isolation% + + + abc_dfj_%isolation% + abc_dfj + + 50 + - + + + taxable_goods + + + 666 + In Stock + + 1 + + adc_Full + + Product online + + abc_short + + + Main Website + + Catalog, Search + simple-product-%isolation% + + + product_100_dollar%isolation% + product_100_dollar%isolation% + + default + + simple + + 25 + In Stock + + 1 + + 100 + - + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + simple-product-%isolation% + 9 + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + + default + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 100 + - + + 1 + + tax_calculation + + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + default + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + default + + + default_subcategory + + + Main Website + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + two_options + + simple-product-%isolation% + + with_two_custom_option + + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + drop_down_with_one_option_percent_price + + + drop_down_with_one_option_percent_price + + + Main Website + + + default_subcategory + + simple-product-%isolation% + + + simple + + default + + Simple Product With Custom Option %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + simple-product-%isolation% + + all_types + + + + low_stock_product%isolation% + low_stock_product%isolation% + simple + + 1 + In Stock + + + No + 2 + + 1 + + default + + + 100 + - + + + Main Website + + simple-product-%isolation% + + + + default + + Simple Product out of stock %isolation% + sku_simple_product_out_of_stock%isolation% + 1 + + 25 + Out of Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + simple-product-%isolation% + + + + default + + Simple Product offline %isolation% + sku_simple_product_offline_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + Product offline + simple-product-%isolation% + + + + default + + Simple Product not visible %isolation% + sku_simple_product_not_visible_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Not Visible Individually + + order_default + + simple-product-%isolation% + + + + default + + Simple Product with cart limit %isolation% + sku_simple_product_with_cart_limit_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + + 2 + 5 + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + drop_down_with_one_option_percent_price + + + drop_down_with_one_option_percent_price + + simple-product-%isolation% + + Main Website + + + + + default + + Simple Product with qty increments %isolation% + sku_simple_product_with_qty_increments_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + + Yes + 2 + + simple-product-%isolation% + + + simple + + default + + Simple Product %isolation% + sku_simple_product_%isolation% + + 300 + - + + 1 + + 25 + In Stock + + simple-product-%isolation% + + default + + + Main Website + + + + + default + + Simple Product with msrp %isolation% + sku_simple_product_with_msrp_%isolation% + 1 + + 25 + In Stock + + + 560 + - + + + taxable_goods + + + Main Website + + Catalog, Search + + order_default + + 600 + Before Order Confirmation + + + simple_product_with_category_%isolation% + Simple product with category %isolation% + + 666 + In Stock + + 1 + + default + + + 100 + + + + default_anchor_subcategory + + + Main Website + + simple_with_category + simple-product-%isolation% + + + simple + + default + + + default_subcategory + + + Main Website + + Simple Product With Fpt %isolation% + sku_simple_product_%isolation% + + 70 + - + + 1 + + drop_down_with_one_option_fixed_price + + + drop_down_with_one_option_fixed_price + + simple-product-%isolation% + + one_fpt_for_all_states + + + + simple + + default + + + default_subcategory + + + Main Website + + Simple Product With Fpt %isolation% + sku_simple_product_%isolation% + + 110 + - + + 100 + 1 + simple-product-%isolation% + + one_fpt_for_all_states + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml index 9ec91452dc7ac..8b0cbcf65f4b9 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml @@ -4,117 +4,119 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - taxable_goods - - Product online - - Main Website - - Yes - virtual-product%isolation% - Catalog, Search - - default - - Virtual product %isolation% - sku_virtual_product_%isolation% - - 666 - In Stock - - - 10 - - - - - order_default - - - - - taxable_goods - - Product online - - Main Website - - Yes - virtual-product%isolation% - Catalog, Search - - default - - Virtual product %isolation% - sku_virtual_product_%isolation% - - 1000 - In Stock - - - 10 - - - - - order_big_qty - - - - - taxable_goods - - Product online - - Main Website - - Yes - virtual-product%isolation% - Catalog, Search - - default - - Virtual product %isolation% - sku_virtual_product_%isolation% - - 666 - In Stock - - - 10 - - - - - order_custom_price - - - - product_50_dollar %isolation% - product_50_dollar_%isolation% - - taxable_goods - - Product online - - Main Website - - Yes - virtual-product%isolation% - Catalog, Search - - default - - - 111 - In Stock - - - 50 - - - - - product_50_dollar - - + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 666 + In Stock + + + 10 + - + + + order_default + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 1000 + In Stock + + + 10 + - + + + order_big_qty + + + + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + Virtual product %isolation% + sku_virtual_product_%isolation% + + 666 + In Stock + + + 10 + - + + + order_custom_price + + + + product_50_dollar %isolation% + product_50_dollar_%isolation% + + taxable_goods + + Product online + + Main Website + + Yes + virtual-product%isolation% + Catalog, Search + + default + + + 111 + In Stock + + + 50 + - + + + product_50_dollar + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml index 8be6b6c395a43..93ef0a9d833f8 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml @@ -4,25 +4,27 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - - - - - - - - - - - Yes - 1 - display_setting - select - - - - + + + + + + + + + + + + + + + Yes + 1 + display_setting + select + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml index 0db3d81236cbc..1f46c9c6bd4b0 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -4,96 +4,98 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Active Catalog Rule - Rule Description - Active - - Main Website - - - NOT LOGGED IN - General - Wholesale - Retailer - - 3/25/14 - 3/29/14 - 1 - By Percentage of the Original Price - 50 - - - Inactive Catalog Price Rule - Inactive - - Main Website - - - NOT LOGGED IN - - By Percentage of the Original Price - 50 - - - Active Catalog Rule with conditions %isolation% - Rule Description - Active - - Main Website - - - NOT LOGGED IN - General - Wholesale - Retailer - - [Category|is|2] - By Percentage of the Original Price - 10 - - - catalog_price_rule_priority_0 - -50% of price, Priority = 0 - Active - - Main Website - - - NOT LOGGED IN - - 0 - By Percentage of the Original Price - 50 - - - catalog_price_rule_priority_1_stop_further_rules - Priority 1, -5 By fixed amount - Active - - Main Website - - - NOT LOGGED IN - - 1 - By Fixed Amount - 5 - Yes - - - catalog_price_rule_priority_2 - Priority 2, -10 By fixed amount - Active - - Main Website - - - NOT LOGGED IN - - 2 - By Fixed Amount - 10 - + + + + Active Catalog Rule + Rule Description + Active + + Main Website + + + NOT LOGGED IN + General + Wholesale + Retailer + + 3/25/14 + 3/29/14 + 1 + By Percentage of the Original Price + 50 + + + Inactive Catalog Price Rule + Inactive + + Main Website + + + NOT LOGGED IN + + By Percentage of the Original Price + 50 + + + Active Catalog Rule with conditions %isolation% + Rule Description + Active + + Main Website + + + NOT LOGGED IN + General + Wholesale + Retailer + + [Category|is|2] + By Percentage of the Original Price + 10 + + + catalog_price_rule_priority_0 + -50% of price, Priority = 0 + Active + + Main Website + + + NOT LOGGED IN + + 0 + By Percentage of the Original Price + 50 + + + catalog_price_rule_priority_1_stop_further_rules + Priority 1, -5 By fixed amount + Active + + Main Website + + + NOT LOGGED IN + + 1 + By Fixed Amount + 5 + Yes + + + catalog_price_rule_priority_2 + Priority 2, -10 By fixed amount + Active + + Main Website + + + NOT LOGGED IN + + 2 + By Fixed Amount + 10 + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml index 7f26066d75825..f9653cc215436 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml @@ -4,14 +4,16 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - Query text %isolation% - - Main Website/Main Website Store/Default Store View - Synonym word %isolation% - http://example.com/ - No - + + + + + Query text %isolation% + + Main Website/Main Website Store/Default Store View + Synonym word %isolation% + http://example.com/ + No + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index 3aadbbc94ae7c..4b8acd1b4a5c6 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -4,13 +4,17 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - variableCode%isolation% - variableName%isolation% -

variableName%isolation%

 - variableName%isolation% - - + + + + + variableCode%isolation% + variableName%isolation% + + variableName%isolation% + + variableName%isolation% + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml index 367a08944fbf2..fd37ecb280340 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml @@ -4,226 +4,228 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 6161 West Centinela Avenue - Culver City - California - 90230 - United States - 555-55-555-55 - Yes - Yes - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 6161 West Centinela Avenue - Culver City - California - 90230 - United States - 555-55-555-55 - Yes - No - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 6262 Fifth Avenue - New York - New York - 90230 - United States - 555-55-555-55 - No - No - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 6161 West Centinela Avenue - Culver City - California - 90230 - United States - 555-55-555-55 - Yes - No - - - Magento %isolation% - 6161 West Centinela Avenue - Culver City - California - 90230 - United States - 555-55-555-55 - Yes - Yes - - - John - Doe - Magento %isolation% - 6161 West Centinela Avenue - Culver City - California - 90230 - United States - 555-55-555-55 - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 3222 Cliffside Drive - Binghamton - New York - 13901 - United States - 607-481-7802 - Yes - Yes - - - John - Doe - John.Doe%isolation%@example.com - Magento %isolation% - 7700 W. Parmer Lane Bldg. D - Austin - Texas - 78729 - United States - 512-691-4400 - Yes - Yes - - - John - Doe - JohnDoe_%isolation%@example.com - Magento %isolation% - Culver City - 6161 West Centinela Avenue - 90230 - United States - California - 555-55-555-55 - 555-55-555-55 - - - Jane - Doe - JaneDoe_%isolation%@example.com - Magento %isolation% - London - 172, Westminster Bridge Rd - SE1 7RW - United Kingdom - London - 444-44-444-44 - 444-44-444-44 - - - John - Doe - Magento %isolation% - John.Doe%isolation%@example.com - Culver City - 6161 West Centinela Avenue - 90230 - United States - California - 555-55-555-55 - - - Billy - Holiday - Magento %isolation% - b.holliday@example.net - New York - 727 5th Ave - 10022 - United States - New York - 777-77-77-77 - - - John - Doe - Magento %isolation% - Culver City - 6161 West Centinela Avenue - 90230 - United States - California - 555-55-555-55 - - - Jan - Jansen - Magento %isolation% - Berlin - Augsburger Strabe 41 - 10789 - Germany - Berlin - 333-33-333-33 - - - Jane - Doe - Magento %isolation% - London - 172, Westminster Bridge Rd - SE1 7RW - United Kingdom - London - 444-44-444-44 - - - Jane - Doe - Magento %isolation% - Manchester - 42 King Street West - M3 2WY - United Kingdom - Manchester - 444-44-444-44 - - - Jane - Doe - Magento %isolation% - London - 172, Westminster Bridge Rd - SE1 7RW - United Kingdom - London - 444-44-444-44 - 584451913 - - - Dmytro - Aponasenko - Culver City - 1 Main St - 90230 - United States - Culver City - + + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + Yes + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + No + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6262 Fifth Avenue + New York + New York + 90230 + United States + 555-55-555-55 + No + No + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + No + + + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + Yes + Yes + + + John + Doe + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 3222 Cliffside Drive + Binghamton + New York + 13901 + United States + 607-481-7802 + Yes + Yes + + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 7700 W. Parmer Lane Bldg. D + Austin + Texas + 78729 + United States + 512-691-4400 + Yes + Yes + + + John + Doe + JohnDoe_%isolation%@example.com + Magento %isolation% + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + 555-55-555-55 + + + Jane + Doe + JaneDoe_%isolation%@example.com + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + 444-44-444-44 + + + John + Doe + Magento %isolation% + John.Doe%isolation%@example.com + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + + + Billy + Holiday + Magento %isolation% + b.holliday@example.net + New York + 727 5th Ave + 10022 + United States + New York + 777-77-77-77 + + + John + Doe + Magento %isolation% + Culver City + 6161 West Centinela Avenue + 90230 + United States + California + 555-55-555-55 + + + Jan + Jansen + Magento %isolation% + Berlin + Augsburger Strabe 41 + 10789 + Germany + Berlin + 333-33-333-33 + + + Jane + Doe + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + + + Jane + Doe + Magento %isolation% + Manchester + 42 King Street West + M3 2WY + United Kingdom + Manchester + 444-44-444-44 + + + Jane + Doe + Magento %isolation% + London + 172, Westminster Bridge Rd + SE1 7RW + United Kingdom + London + 444-44-444-44 + 584451913 + + + Dmytro + Aponasenko + Culver City + 1 Main St + 90230 + United States + Culver City + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml index 85158b45b07f9..1cbe281f3ea1d 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml @@ -4,37 +4,39 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - 1 - General - - retail_customer - - - - 3 - Retailer - - retail_customer - - - - 2 - Wholesale - - retail_customer - - - - 0 - All Customer Groups - - - 0 - NOT LOGGED IN - - retail_customer - - + + + + 1 + General + + retail_customer + + + + 3 + Retailer + + retail_customer + + + + 2 + Wholesale + + retail_customer + + + + 0 + All Customer Groups + + + 0 + NOT LOGGED IN + + retail_customer + + + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml index e93be99b511ee..724a57e7c10df 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -4,108 +4,110 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - John - Doe - - General - - JohnDoe_%isolation%@example.com - 123123q - 123123q - - - John - Doe - JohnDoe_%isolation%@example.com - 123123q - 123123q - 01/01/1990 - Male - - General - - - - John - Doe - - Retailer - - JohnDoe_%isolation%@example.com - 123123q - 123123q - 01/01/1990 - Male - - - John - Doe - JohnDoe_%isolation%@example.com - 123123q - 123123q - 01/01/1990 - Male - 501 - - - Main Website - John - Doe - JohnDoe_%isolation%@example.com - - - John - Doe - - General - - JohnDoe_%isolation%@example.com - 123123q - 123123q -
- US_address -
- - - John - Doe - JohnDoe_%isolation%@example.com - 123123q - 123123q - - - Jane - Doe - JaneDoe_%isolation%@example.com - 123123q - 123123q - - - John - Doe%isolation% - - General - - JohnDoe_%isolation%@example.com - 123123q - 123123q -
- US_address_NY -
- - - John - Doe%isolation% - - General - - JohnDoe_%isolation%@example.com - 123123q - 123123q -
- US_address_TX -
- + + + + John + Doe + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + + General + + + + John + Doe + + Retailer + + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + 01/01/1990 + Male + 501 + + + Main Website + John + Doe + JohnDoe_%isolation%@example.com + + + John + Doe + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + US_address + + + + John + Doe + JohnDoe_%isolation%@example.com + 123123q + 123123q + + + Jane + Doe + JaneDoe_%isolation%@example.com + 123123q + 123123q + + + John + Doe%isolation% + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + US_address_NY + + + + John + Doe%isolation% + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + US_address_TX + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml index 9e66214d283a0..09deed6ac541a 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml @@ -4,82 +4,84 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Test downloadable product %isolation% - sku_test_downloadable_product_%isolation% - - 280 - - - - downloadable - - taxable_goods - - - 90 - In Stock - - Product online - Catalog, Search - test-downloadable-product-%isolation% - Yes - - default - - - Main Website - - - default - - - - Downloadable product %isolation% - downloadable_product_%isolation% - downloadable-product-%isolation% - - 20 - - - taxable_goods - - - 1111 - In Stock - - Product online - Catalog, Search - Yes - - with_two_separately_links - - - with_two_separately_links - - - - Downloadable product %isolation% - downloadable_product_%isolation% - downloadable-product-%isolation% - - 20 - - - taxable_goods - - - 1111 - In Stock - - Product online - Catalog, Search - Yes - - with_two_separately_links - - - with_two_bought_links - - + + + + Test downloadable product %isolation% + sku_test_downloadable_product_%isolation% + + 280 + - + + downloadable + + taxable_goods + + + 90 + In Stock + + Product online + Catalog, Search + test-downloadable-product-%isolation% + Yes + + default + + + Main Website + + + default + + + + Downloadable product %isolation% + downloadable_product_%isolation% + downloadable-product-%isolation% + + 20 + + + taxable_goods + + + 1111 + In Stock + + Product online + Catalog, Search + Yes + + with_two_separately_links + + + with_two_separately_links + + + + Downloadable product %isolation% + downloadable_product_%isolation% + downloadable-product-%isolation% + + 20 + + + taxable_goods + + + 1111 + In Stock + + Product online + Catalog, Search + Yes + + with_two_separately_links + + + with_two_bought_links + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml index db5aee61da723..59a52ffd742ab 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml @@ -4,10 +4,12 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - John Doe - Jane Doe - text_%isolation% - + + + + John Doe + Jane Doe + text_%isolation% + + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml index e9b8fbaa3a914..7da12aaab1d3c 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -4,12 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - United States - - default - - Apparel & Accessories - + + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml index f6c6440725e64..eab0d9c87e1ea 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml @@ -4,112 +4,114 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Test grouped product %isolation% - sku_test_grouped_product_%isolation% - - default - - - defaultSimpleProduct - - Product online - Catalog, Search - - taxable_goods - - test-grouped-product-%isolation% - - In Stock - - - Main Website - - - default - - - - Test grouped product %isolation% - sku_test_grouped_product_%isolation% - - default - - - defaultSimpleProduct - - Product online - Catalog, Search - - taxable_goods - - test-grouped-product-%isolation% - - Out of Stock - - - Main Website - - - default - - - - Test grouped product %isolation% - sku_test_grouped_product_%isolation% - - - - starting-560 - - - default - - - defaultSimpleProduct - - Product online - Catalog, Search - - taxable_goods - - test-grouped-product-%isolation% - - In Stock - - - Main Website - - - default - - - - Grouped product %isolation% - grouped_product_%isolation% - - default - - - three_simple_products - - Product online - Catalog, Search - - taxable_goods - - test-grouped-product-%isolation% - - In Stock - - - Main Website - - - default - - - three_simple_products - - + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + Out of Stock + + + Main Website + + + default + + + + Test grouped product %isolation% + sku_test_grouped_product_%isolation% + + - + starting-560 + + + default + + + defaultSimpleProduct + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + + Grouped product %isolation% + grouped_product_%isolation% + + default + + + three_simple_products + + Product online + Catalog, Search + + taxable_goods + + test-grouped-product-%isolation% + + In Stock + + + Main Website + + + default + + + three_simple_products + + + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml index 9bd77785063a5..546dce79a4a80 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml @@ -4,23 +4,25 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - default_integration_%isolation% - test_%isolation%@example.com - All - - Dashboard - Sales - Products - Customers - My Account - Marketing - Content - Reports - Stores - System - Global Search - - + + + + default_integration_%isolation% + test_%isolation%@example.com + All + + Dashboard + Sales + Products + Customers + My Account + Marketing + Content + Reports + Stores + System + Global Search + + + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml index 4fe81e819373f..31c4ab6dfcc68 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml @@ -4,12 +4,14 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Newsletter Template %isolation% - Newsletter Subject %isolation% - Sender Name %isolation% - support%isolation%@example.com - Template Content %isolation% - + + + + Newsletter Template %isolation% + Newsletter Subject %isolation% + Sender Name %isolation% + support%isolation%@example.com + Template Content %isolation% + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml index c286d175a4731..d9d499403ca32 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml @@ -4,19 +4,21 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Rating %isolation% - - Main Website/Main Website Store/Default Store View - - Yes - - - productRating_%isolation% - - Main Website/Main Website Store/Default Store View - - Yes - + + + + Rating %isolation% + + Main Website/Main Website Store/Default Store View + + Yes + + + productRating_%isolation% + + Main Website/Main Website Store/Default Store View + + Yes + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml index f5bc36c22b421..0deeca534d4cb 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml @@ -4,11 +4,13 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - - - - + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml index 774654e4972cc..0396683c60169 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml @@ -4,35 +4,37 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - Approved - - Main Website/Main Website Store/Default Store View - - nickname_%isolation% - title_%isolation% - review_detail_%isolation% - - - visibleOnDefaultWebsite - 5 - - - - catalogProductSimple::default - - - - Pending - - Main Website/Main Website Store/Default Store View - - nickname_%isolation% - title_%isolation% - review_detail_%isolation% - - catalogProductSimple::default - - + + + + Approved + + Main Website/Main Website Store/Default Store View + + nickname_%isolation% + title_%isolation% + review_detail_%isolation% + + + visibleOnDefaultWebsite + 5 + + + + catalogProductSimple::default + + + + Pending + + Main Website/Main Website Store/Default Store View + + nickname_%isolation% + title_%isolation% + review_detail_%isolation% + + catalogProductSimple::default + + + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml index e44c3b0a3cd9e..dd07d48b45124 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml @@ -4,9 +4,11 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - sitemap.xml - / - + + + + sitemap.xml + / + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml index 42843a54e789d..7da12aaab1d3c 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -4,38 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - default - - Default Store View - base - Enabled - 1 - - - - default - - Custom_Store_%isolation% - code_%isolation% - Enabled - - - 1 - Default Store View - - - All Store Views - 0 - - - - default - - DE%isolation% - de%isolation% - Enabled - + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml index 58eb41629b543..51a0786a1b6d0 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml @@ -4,24 +4,26 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - - main_website - - Main Website Store - 1 - - default_category - - - - - main_website - - store_name_%isolation% - - default_category - - + + + + + main_website + + Main Website Store + 1 + + default_category + + + + + main_website + + store_name_%isolation% + + default_category + + + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml index 793e909ba715a..7d87c1bae604e 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml @@ -4,19 +4,21 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - All Websites - 0 - - - Main Website - base - 0 - 1 - - - Web_Site_%isolation% - code_%isolation% - + + + + All Websites + 0 + + + Main Website + base + 0 + 1 + + + Web_Site_%isolation% + code_%isolation% + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml index 4c81b7be4223a..a43a4e16759dc 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml @@ -4,35 +4,37 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - 2 - Taxable Goods - PRODUCT - 2 - Taxable Goods - - - 3 - Retail Customer - CUSTOMER - 3 - Retail Customer - - - Customer Tax Class %isolation% - CUSTOMER - - - Product Tax Class %isolation% - PRODUCT - - - None - PRODUCT - 0 - - - All - + + + + 2 + Taxable Goods + PRODUCT + 2 + Taxable Goods + + + 3 + Retail Customer + CUSTOMER + 3 + Retail Customer + + + Customer Tax Class %isolation% + CUSTOMER + + + Product Tax Class %isolation% + PRODUCT + + + None + PRODUCT + 0 + + + All + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml index 48e2eda08518a..fa7667b6e2256 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml @@ -4,136 +4,138 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - 1 - US - 12 - * - US-CA-*-Rate 1 - 8.2500 - - - - 1 - US-CA-*-Rate 1 - - - 2 - US - 43 - * - US-NY-*-Rate 1 - 8.3750 - - - - 2 - US-NY-*-Rate 1 - - - Tax Rate %isolation% - 8.25 - United States - 90230 - California - - - Tax Rate %isolation% - 8.25 - United States - * - California - - - Tax Rate %isolation% - 8.375 - United States - * - California - - - Tax Rate %isolation% - 8.375 - United States - New York - * - - - Tax Rate %isolation% - 8.25 - United States - New York - * - - - US-NY-*-%isolation% - 8.1 - United States - New York - * - - - Tax Rate %isolation% - 8.25 - United States - 95131 - California - - - Tax Rate %isolation% - 20 - United Kingdom - * - - - TaxIdentifier%isolation% - * - Australia - 20 - - - TaxIdentifier%isolation% - Yes - 90001 - 96162 - United States - California - 15.5 - - - TaxIdentifier%isolation% - * - United States - Texas - 20 - - - TaxIdentifier%isolation% - 84001 - United States - Utah - 20 - - - TaxIdentifier%isolation% - * - United States - Texas - 10 - - - TaxIdentifier%isolation% - * - United States - New York - 20 - - - TaxIdentifier%isolation% - * - United States - California - 30 - + + + + 1 + US + 12 + * + US-CA-*-Rate 1 + 8.2500 + + + + 1 + US-CA-*-Rate 1 + + + 2 + US + 43 + * + US-NY-*-Rate 1 + 8.3750 + + + + 2 + US-NY-*-Rate 1 + + + Tax Rate %isolation% + 8.25 + United States + 90230 + California + + + Tax Rate %isolation% + 8.25 + United States + * + California + + + Tax Rate %isolation% + 8.375 + United States + * + California + + + Tax Rate %isolation% + 8.375 + United States + New York + * + + + Tax Rate %isolation% + 8.25 + United States + New York + * + + + US-NY-*-%isolation% + 8.1 + United States + New York + * + + + Tax Rate %isolation% + 8.25 + United States + 95131 + California + + + Tax Rate %isolation% + 20 + United Kingdom + * + + + TaxIdentifier%isolation% + * + Australia + 20 + + + TaxIdentifier%isolation% + Yes + 90001 + 96162 + United States + California + 15.5 + + + TaxIdentifier%isolation% + * + United States + Texas + 20 + + + TaxIdentifier%isolation% + 84001 + United States + Utah + 20 + + + TaxIdentifier%isolation% + * + United States + Texas + 10 + + + TaxIdentifier%isolation% + * + United States + New York + 20 + + + TaxIdentifier%isolation% + * + United States + California + 30 + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml index 2fe565d3f9093..dbcb98f3909c5 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml @@ -4,137 +4,139 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - TaxIdentifier%isolation% - - - us_ca_rate_8_25 - us_ny_rate_8_375 - - - 0 - 0 - - - Tax Rule %isolation% - - - US-CA-Rate_1 - us_ny_rate_8_1 - - - - - retail_customer - customer_tax_class - - - - - taxable_goods - product_tax_class - - - 0 - 0 - - - TaxIdentifier%isolation% - - - uk_full_tax_rate - - - 0 - 0 - - - TaxIdentifier%isolation% - - - US-CA-Rate_1 - - - - - retail_customer - - - - - taxable_goods - - - 1 - 1 - - - TaxIdentifier%isolation% - - - US-CA-Rate_1 - US-NY-Rate_1 - - - - - retail_customer - customer_tax_class - - - - - product_tax_class - taxable_goods - - - 1 - 1 - - - TaxIdentifier%isolation% - - - us_ca_rate_8_25_no_zip - us_ny_rate_8_25 - - - 0 - 0 - - - TaxIdentifier%isolation% - - - us_ca_rate_8_375 - us_ny_rate_8_25 - - - 0 - 0 - - - TaxIdentifier%isolation% - - - us_ca_rate_8_25_no_zip - us_ny_rate_8_375 - - - 0 - 0 - - - TaxIdentifier%isolation% - - - tx_rate_10 - ny_rate_20 - ca_rate_30 - - - 0 - 0 - + + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25 + us_ny_rate_8_375 + + + 0 + 0 + + + Tax Rule %isolation% + + + US-CA-Rate_1 + us_ny_rate_8_1 + + + + + retail_customer + customer_tax_class + + + + + taxable_goods + product_tax_class + + + 0 + 0 + + + TaxIdentifier%isolation% + + + uk_full_tax_rate + + + 0 + 0 + + + TaxIdentifier%isolation% + + + US-CA-Rate_1 + + + + + retail_customer + + + + + taxable_goods + + + 1 + 1 + + + TaxIdentifier%isolation% + + + US-CA-Rate_1 + US-NY-Rate_1 + + + + + retail_customer + customer_tax_class + + + + + product_tax_class + taxable_goods + + + 1 + 1 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25_no_zip + us_ny_rate_8_25 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_375 + us_ny_rate_8_25 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + us_ca_rate_8_25_no_zip + us_ny_rate_8_375 + + + 0 + 0 + + + TaxIdentifier%isolation% + + + tx_rate_10 + ny_rate_20 + ca_rate_30 + + + 0 + 0 + + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml index 44ec02d9e0a11..7fa163cf79f95 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml @@ -4,23 +4,25 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - test-test-test%isolation%.html - http://www.ebayinc.com/ - Temporary (302) - Main Website/Main Website Store/Default Store View - - - test-test-test%isolation%.html - Temporary (302) - Main Website/Main Website Store/Default Store View - - - Main Website/Main Website Store/Default Store View - wishlist/%isolation% - http://google.com - Temporary (302) - test description - + + + + test-test-test%isolation%.html + http://www.ebayinc.com/ + Temporary (302) + Main Website/Main Website Store/Default Store View + + + test-test-test%isolation%.html + Temporary (302) + Main Website/Main Website Store/Default Store View + + + Main Website/Main Website Store/Default Store View + wishlist/%isolation% + http://google.com + Temporary (302) + test description + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml index af5be980cd655..7da12aaab1d3c 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml @@ -4,39 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - RoleName%isolation% - All - - - Administrators - All - 1 - - - RoleName%isolation% - Custom - - Magento_Sales::sales - Magento_Sales::sales_operation - Magento_Sales::actions - Magento_Sales::sales_order - Magento_Sales::create - Magento_Sales::actions_view - Magento_Sales::email - Magento_Sales::reorder - Magento_Sales::actions_edit - Magento_Sales::cancel - Magento_Sales::review_payment - Magento_Sales::capture - Magento_Sales::invoice - Magento_Sales::creditmemo - Magento_Sales::hold - Magento_Sales::unhold - Magento_Sales::ship - Magento_Sales::comment - Magento_Sales::emails - - + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml index 4ff7a892044c2..06606e17bd457 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml @@ -4,37 +4,39 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - - - admin - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - 1 - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - %current_password% - - - AdminUser%isolation% - FirstName%isolation% - LastName%isolation% - email%isolation%@example.com - 123123q - 123123q - - default - - %current_password% - Active - + + + + admin + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + 1 + %current_password% + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + %current_password% + + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + + default + + %current_password% + Active + + From f7f7c298026df5d4f83993c935d4151b59ae9b87 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Mon, 12 Jan 2015 17:58:13 +0200 Subject: [PATCH 05/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format - Changed xml format --- .../Backend/Test/Fixture/GlobalSearch.xml | 4 +- .../Bundle/Test/Fixture/BundleProduct.xml | 288 +++++++++--------- .../Test/Fixture/CatalogAttributeSet.xml | 28 +- .../Catalog/Test/Fixture/CatalogCategory.xml | 100 +++--- .../Test/Fixture/CatalogProductAttribute.xml | 164 +++++----- .../Test/Fixture/CatalogProductSimple.xml | 270 ++++++++-------- .../Test/Fixture/CatalogProductVirtual.xml | 240 +++++++-------- .../CatalogRule/Test/Fixture/CatalogRule.xml | 64 ++-- .../Test/Fixture/CatalogSearchQuery.xml | 44 +-- .../Magento/Checkout/Test/Fixture/Cart.xml | 212 ++++++------- .../Fixture/ConfigurableProductInjectable.xml | 260 ++++++++-------- .../Magento/Core/Test/Fixture/ConfigData.xml | 24 +- .../Core/Test/Fixture/SystemVariable.xml | 36 +-- .../Test/Fixture/AddressInjectable.xml | 88 +++--- .../Test/Fixture/CustomerGroupInjectable.xml | 12 +- .../Test/Fixture/CustomerInjectable.xml | 112 +++---- .../Fixture/DownloadableProductInjectable.xml | 276 ++++++++--------- .../GiftMessage/Test/Fixture/GiftMessage.xml | 36 +-- .../Test/Fixture/GoogleShoppingAttribute.xml | 31 -- .../Test/Fixture/GroupedProductInjectable.xml | 216 ++++++------- .../Test/Fixture/ImportExport.xml | 16 +- .../Magento/Install/Test/Fixture/Install.xml | 76 ++--- .../Integration/Test/Fixture/Integration.xml | 108 +++---- .../Newsletter/Test/Fixture/Template.xml | 48 +-- .../Magento/Review/Test/Fixture/Rating.xml | 28 +- .../Review/Test/Fixture/ReviewInjectable.xml | 56 ++-- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 24 +- .../app/Magento/Store/Test/Fixture/Store.xml | 28 +- .../Magento/Store/Test/Fixture/StoreGroup.xml | 20 +- .../Magento/Store/Test/Fixture/Website.xml | 24 +- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 16 +- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 40 +-- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 28 +- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 28 +- .../User/Test/Fixture/AdminUserRole.xml | 44 +-- .../app/Magento/User/Test/Fixture/User.xml | 76 ++--- 36 files changed, 1568 insertions(+), 1597 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index 5869198155abc..44de464d98645 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -7,11 +7,11 @@ Magento_Backend - + query virtual Magento\Backend\Test\Fixture\GlobalSearch\Query catalogProductSimple::default::name - + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 80e21913a4b7b..e1475fe5e8ca0 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -13,16 +13,16 @@ sku Magento\Bundle\Test\Repository\BundleProduct Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface - - bundle - - bundle - 4 - - product - + + bundle + + bundle + 4 + + product + - + category_ids static 0 @@ -30,88 +30,88 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - + + country_of_manufacture varchar 0 select - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 textarea product-details - - + + enable_googlecheckout int 0 1 select - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select autosettings - - + + use_config_gift_message_available varchar 0 checkbox autosettings - - + + group_price decimal 0 @@ -119,121 +119,121 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 textarea - - + + meta_keyword text 0 textarea - - + + meta_title varchar 0 text - - + + minimal_price decimal 0 price - - + + msrp decimal 0 price - - + + msrp_display_actual_price_type varchar 0 4 select - - + + name varchar 1 BundleProduct %isolation% text product-details - - + + news_from_date datetime 0 date - - + + news_to_date datetime 0 date - - + + old_id int 0 text - - + + options_container varchar 0 container2 select - - + + page_layout varchar 0 select - - + + price decimal 1 @@ -241,143 +241,143 @@ price Magento\Bundle\Test\Fixture\BundleProduct\Price product-details - - + + price_from decimal 1 price product-details - - + + price_to decimal 1 price product-details - - + + price_type int 1 Dynamic select product-details - - + + status int 0 1 checkbox product-details - - + + price_view int 1 select advanced-pricing - - + + quantity_and_stock_status int 0 1 select product-details - - + + required_options static 0 text - - + + use_config_manage_stock checkbox advanced-inventory - - + + manage_stock select advanced-inventory - - + + shipment_type int 1 select product-details - - + + short_description text 0 textarea autosettings - - + + sku static 1 text product-details - - + + sku_type int 1 Dynamic select product-details - - + + weight_type int 1 Dynamic select product-details - - + + weight decimal 0 text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + special_price decimal 0 price advanced-pricing - - + + special_from_date data 0 @@ -385,8 +385,8 @@ price advanced-pricing Magento\Backend\Test\Fixture\Date - - + + special_to_date data 0 @@ -394,8 +394,8 @@ price advanced-pricing Magento\Backend\Test\Fixture\Date - - + + tax_class_id int 0 @@ -403,22 +403,22 @@ select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + tier_price decimal 0 @@ -426,87 +426,87 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - - + + updated_at static 1 text - - + + url_key varchar 0 text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 4 select autosettings - - + + id virtual - - + + bundle_selections virtual 1 bundle Magento\Bundle\Test\Fixture\BundleProduct\BundleSelections - - + + checkout_data virtual 1 null Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData - - + + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - - + + type_id virtual - - + + new_variations_attribute_set_id - - + + affect_bundle_product_selection - - + + stock_data advanced-inventory - - + + category_id product-details - - + + website_ids virtual Main Website websites - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 660e9ec8e4070..8275019f63e68 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -12,35 +12,35 @@ Magento\Catalog\Test\Repository\CatalogAttributeSet Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface - + attribute_set_id smallint 1 - - + + entity_type_id smallint 0 - - + + attribute_set_name varchar Default_attribute_set_%isolation% - - + + sort_order smallint 0 - - + + skeleton_set varchar @@ -49,15 +49,15 @@ Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet - - + + assigned_attributes virtual Magento\Catalog\Test\Fixture\CatalogAttributeSet\AssignedAttributes - - + + group virtual - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml index 33cec042952b1..5a12abcc1867d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogCategory.xml @@ -12,35 +12,35 @@ Magento\Catalog\Test\Repository\CatalogCategory Magento\Catalog\Test\Handler\CatalogCategory\CatalogCategoryInterface - + entity_id int 1 - - + + entity_type_id smallint 0 - - + + attribute_set_id smallint 0 - - + + description text 0 textarea - - + + parent_id int @@ -48,140 +48,140 @@ null Magento\Catalog\Test\Fixture\CatalogCategory\ParentId - - + + created_at timestamp - - + + updated_at timestamp - - + + path varchar Default Category null - - + + position int - - + + level int 0 - - + + children_count int - - + + available_product_listing_config int display_setting checkbox - - + + available_sort_by varchar 0 display_setting multiselect - - + + default_product_listing_config varchar 0 display_setting checkbox - - + + default_sort_by varchar 0 display_setting select - - + + meta_title text - - + + id virtual null - - + + name virtual general_information Category%isolation% - - + + is_active virtual general_information Yes - - + + is_anchor virtual general_information - - + + url_key virtual general_information category%isolation% - - + + include_in_menu virtual general_information Yes - - + + landing_page virtual select display_setting - - + + display_mode virtual select display_setting - - + + category_products virtual category_products Magento\Catalog\Test\Fixture\CatalogCategory\CategoryProducts - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index cddcc640fc3fd..b83f56528c11b 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -15,304 +15,304 @@ Magento\Catalog\Test\Repository\CatalogProductAttribute Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface - + attribute_id smallint 1 - - + + entity_type_id smallint 0 - - + + attribute_code varchar advanced-properties - - + + attribute_model varchar - - + + backend_model varchar - - + + backend_type varchar static - - + + backend_table varchar - - + + frontend_model varchar - - + + frontend_input varchar Text Field select properties - - + + frontend_label varchar attribute_label%isolation% properties - - + + manage_frontend_label varchar manage-labels - - + + frontend_class varchar - - + + source_model varchar - - + + is_required smallint No select properties - - + + is_user_defined smallint 0 - - + + is_unique smallint 0 advanced-properties - - + + note varchar - - + + frontend_input_renderer varchar - - + + is_global smallint 1 advanced-properties - - + + is_visible smallint 1 - - + + is_searchable smallint 0 frontend-properties - - + + is_filterable smallint 0 frontend-properties - - + + is_comparable smallint 0 frontend-properties - - + + is_visible_on_front smallint 0 frontend-properties - - + + is_html_allowed_on_front smallint 0 frontend-properties - - + + is_used_for_price_rules smallint 0 frontend-properties - - + + is_filterable_in_search smallint 0 frontend-properties - - + + used_in_product_listing smallint 0 frontend-properties - - + + used_for_sort_by smallint 0 frontend-properties - - + + apply_to varchar - - + + is_visible_in_advanced_search smallint 0 frontend-properties - - + + position int 0 - - + + is_wysiwyg_enabled smallint 0 - - + + is_used_for_promo_rules smallint 0 - - + + is_configurable smallint advanced-properties - - + + search_weight smallint 1 - - + + options smallint Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options - - + + default_value_text text advanced-properties - - + + default_value_textarea text advanced-properties - - + + default_value_date text advanced-properties Magento\Backend\Test\Fixture\Date - - + + default_value_yesno text advanced-properties - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 8c9b29afea47a..75d392333bdde 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -13,16 +13,16 @@ sku Magento\Catalog\Test\Repository\CatalogProductSimple Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface - - simple - - simple - 4 - - product - + + simple + + simple + 4 + + product + - + category_ids static 0 @@ -31,78 +31,78 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + color int 0 select - - + + country_of_manufacture varchar 0 select - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 textarea product-details - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select - - + + group_price decimal 0 @@ -110,117 +110,117 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + manufacturer int 0 select - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 search-engine-optimization textarea - - + + meta_keyword text 0 search-engine-optimization textarea - - + + meta_title varchar 0 search-engine-optimization text - - + + minimal_price decimal 0 price - - + + msrp decimal 0 price - - + + msrp_display_actual_price_type varchar 0 Use config select - - + + name varchar 1 Test simple product %isolation% text product-details - - + + old_id int 0 text - - + + options_container varchar 0 Block after Info Column select - - + + page_layout varchar 0 select - - + + price decimal 1 @@ -230,8 +230,8 @@ price product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - - + + quantity_and_stock_status array 0 @@ -241,75 +241,75 @@ product-details - - + + required_options static 0 text - - + + sku static 1 test_simple_sku_%isolation% text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + special_from_date datetime 0 date - - + + short_description text 0 textarea autosettings - - + + special_price decimal 0 price advanced-pricing - - + + special_to_date datetime 0 date - - + + status int 0 Product online checkbox product-details - - + + tax_class_id int 0 @@ -317,22 +317,22 @@ select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + tier_price decimal 0 @@ -340,55 +340,55 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - - + + updated_at static 1 text - - + + url_key varchar 0 text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 Catalog, Search select autosettings - - + + weight decimal 0 12 weight product-details - - + + id virtual null - - + + type_id virtual - - + + attribute_set_id virtual product-details @@ -396,91 +396,91 @@ default - - + + custom_attribute virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomAttribute - - + + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - - + + website_ids virtual Main Website websites - - + + is_returnable varchar 0 2 select autosettings - - + + news_from_date datetime 0 date Magento\Backend\Test\Fixture\Date - - + + news_to_date datetime 0 date Magento\Backend\Test\Fixture\Date - - + + stock_data virtual advanced-inventory - - + + checkout_data virtual null Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData - - + + cross_sell_products virtual crosssells Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts - - + + up_sell_products virtual upsells Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts - - + + related_products virtual related-products Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts - - + + is_virtual virtual product-details - - + + attributes virtual - - + + fpt decimal 0 @@ -488,6 +488,6 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Fpt - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 279aa9685069c..c7bc60c3a819a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -13,22 +13,22 @@ sku Magento\Catalog\Test\Repository\CatalogProductVirtual Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface - - virtual - - virtual - 4 - - product - + + virtual + + virtual + 4 + + product + - + is_virtual virtual product-details Yes - - + + category_ids static 0 @@ -36,79 +36,79 @@ text Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds product-details - - + + color int 0 select - - + + country_of_manufacture varchar 0 select - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 textarea product-details - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select - - + + group_price decimal 0 @@ -116,131 +116,131 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + manufacturer int 0 select - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 search-engine-optimization textarea - - + + meta_keyword text 0 search-engine-optimization textarea - - + + meta_title varchar 0 search-engine-optimization text - - + + minimal_price decimal 0 price - - + + msrp decimal 0 price - - + + msrp_display_actual_price_type varchar 0 Use config select - - + + name varchar 1 Test virtual product %isolation% text product-details - - + + news_from_date datetime 0 date - - + + news_to_date datetime 0 date - - + + old_id int 0 text - - + + options_container varchar 0 Block after Info Column select - - + + page_layout varchar 0 select - - + + price decimal 1 @@ -250,8 +250,8 @@ price product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - - + + quantity_and_stock_status int 0 @@ -261,75 +261,75 @@ select product-details - - + + required_options static 0 text - - + + sku static 1 sku_test_virtual_product_%isolation% text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + special_from_date datetime 0 date - - + + short_description text 0 textarea autosettings - - + + special_price decimal 0 price advanced-pricing - - + + special_to_date datetime 0 date - - + + status int 0 Product online checkbox product-details - - + + tax_class_id int 0 @@ -337,22 +337,22 @@ select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + tier_price decimal 0 @@ -360,79 +360,79 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - - + + updated_at static 1 text - - + + url_key varchar 0 text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 Catalog, Search select autosettings - - + + weight decimal 0 weight product-details - - + + id virtual - - + + type_id virtual - - + + attribute_set_id virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - - + + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - - + + website_ids virtual Main Website websites - - + + checkout_data virtual null Magento\Catalog\Test\Fixture\CatalogProductVirtual\CheckoutData - + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index f7ab4176f8d57..f1370dc5d0623 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -12,29 +12,29 @@ Magento\CatalogRule\Test\Repository\CatalogRule Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface - + name varchar 1 CatalogPriceRule %isolation% text rule_information - - + + description Catalog Price Rule Description text rule_information - - + + is_active smallint 1 Active select rule_information - - + + website_ids smallint 1 @@ -43,8 +43,8 @@ multiselect rule_information - - + + customer_group_ids smallint 1 @@ -53,78 +53,78 @@ multiselect rule_information - - + + from_date date 0 text rule_information - - + + to_date date 0 text rule_information - - + + simple_action smallint 0 By Percentage of the Original Price select actions - - + + discount_amount decimal 1 50 text actions - - + + condition_type virtual 0 conditions select - - + + condition_value virtual 0 conditions - - + + rule virtual 0 conditions - - + + conditions virtual conditions - - + + id virtual - - + + sort_order text rule_information - - + + stop_rules_processing select rule_information - + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index 2f32a150dc990..897e5fb03f464 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -12,83 +12,83 @@ Magento\CatalogSearch\Test\Repository\CatalogSearchQuery Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface - + query_id int 1 - - + + query_text varchar Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\QueryText - - + + num_results int 0 - - + + popularity int 0 - - + + redirect varchar - - + + synonym_for varchar - - + + store_id smallint 0 - - + + display_in_terms smallint null - - + + is_active smallint null - - + + is_processed smallint 0 - - + + updated_at timestamp null - + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index b200425b4f247..8fb2a1cfb0b42 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -12,373 +12,373 @@ Magento\Checkout\Test\Repository\Cart Magento\Checkout\Test\Handler\Cart\CartInterface - + entity_id int 1 - - + + store_id smallint 0 - - + + created_at timestamp CURRENT_TIMESTAMP - - + + updated_at timestamp 0000-00-00 00:00:00 - - + + converted_at timestamp - - + + is_active smallint 1 - - + + is_virtual smallint 0 - - + + is_multi_shipping smallint 0 - - + + items virtual Magento\Checkout\Test\Fixture\Cart\Items - - + + items_count int 0 - - + + items_qty decimal 0.0000 - - + + orig_order_id int 0 - - + + store_to_base_rate decimal 0.0000 - - + + store_to_quote_rate decimal 0.0000 - - + + base_currency_code varchar - - + + store_currency_code varchar - - + + quote_currency_code varchar - - + + grand_total decimal 0.0000 - - + + base_grand_total decimal 0.0000 - - + + checkout_method varchar - - + + customer_id int 0 - - + + customer_tax_class_id int 0 - - + + customer_group_id int 0 - - + + customer_email varchar - - + + customer_prefix varchar - - + + customer_firstname varchar - - + + customer_middlename varchar - - + + customer_lastname varchar - - + + customer_suffix varchar - - + + customer_dob datetime - - + + customer_note varchar - - + + customer_note_notify smallint 1 - - + + customer_is_guest smallint 0 - - + + remote_ip varchar - - + + applied_rule_ids varchar - - + + reserved_order_id varchar - - + + password_hash varchar - - + + coupon_code varchar - - + + global_currency_code varchar - - + + base_to_global_rate decimal - - + + base_to_quote_rate decimal - - + + customer_taxvat varchar - - + + customer_gender varchar - - + + subtotal decimal - - + + base_subtotal decimal - - + + subtotal_with_discount decimal - - + + base_subtotal_with_discount decimal - - + + is_changed int - - + + trigger_recollect smallint 0 - - + + ext_shipping_info text - - + + is_persistent smallint 0 - - + + gift_message_id int - - + + checkout_data virtual Magento\Checkout\Test\Fixture\Cart\CheckoutData - + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 2dac494c65f73..540118cc32e4f 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -13,16 +13,16 @@ sku Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface - - configurable - - configurable - 4 - - product - + + configurable + + configurable + 4 + + product + - + category_ids static 0 @@ -30,86 +30,86 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - + + color int 0 select - - + + country_of_manufacture varchar 0 select - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 textarea product-details - - + + enable_googlecheckout int 0 No select - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select - - + + group_price decimal 0 @@ -117,128 +117,128 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + manufacturer int 0 select - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 textarea - - + + meta_keyword text 0 textarea - - + + meta_title varchar 0 text - - + + minimal_price decimal 0 price - - + + msrp decimal 0 price - - + + msrp_display_actual_price_type varchar 0 select - - + + name varchar 1 Configurable Product %isolation% text product-details - - + + news_from_date datetime 0 date - - + + news_to_date datetime 0 date - - + + old_id int 0 text - - + + options_container varchar 0 select - - + + page_layout varchar 0 select - - + + price decimal 1 @@ -248,8 +248,8 @@ price product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - - + + quantity_and_stock_status int 0 @@ -258,75 +258,75 @@ select product-details - - + + required_options static 0 text - - + + short_description text 0 textarea autosettings - - + + sku static 1 sku_configurable_product_%isolation% text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + special_from_date datetime 0 date - - + + special_price decimal 0 price advanced-pricing - - + + special_to_date datetime 0 date - - + + status int 0 Product online checkbox product-details - - + + tax_class_id int 0 @@ -334,22 +334,22 @@ select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + tier_price decimal 0 @@ -357,61 +357,61 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - - + + updated_at static 1 text - - + + url_key varchar 0 configurable-product-%isolation% text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 Catalog, Search select autosettings - - + + weight decimal 0 1 weight product-details - - + + is_virtual virtual product-details - - + + id virtual - - + + type_id virtual null configurable - - + + attribute_set_id virtual product-details @@ -419,25 +419,25 @@ default - - + + attribute_set_name virtual variations - - + + affected_attribute_set virtual null - - + + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - - + + configurable_attributes_data virtual 0 @@ -447,26 +447,26 @@ default - - + + website_ids virtual Main Website websites - - + + checkout_data virtual null Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData - - + + up_sell_products virtual upsells Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts - + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index 1d92052df51b8..c8298ff020d70 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -12,44 +12,44 @@ Magento\Core\Test\Repository\ConfigData Magento\Core\Test\Handler\ConfigData\ConfigDataInterface -
+ section virtual -
- + + config_id int 1 - - + + scope varchar default - - + + scope_id int 0 - - + + path varchar general - - + + value text - + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 6b98a48610398..5745d2991ab0d 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -14,59 +14,61 @@ Magento\Core\Model\Resource\Variable\Collection Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface - + variable_id int 0 - - + + code varchar variableCode%isolation% - - + + name varchar variableName%isolation% - - + + value_id int 1 - - + + store_id smallint 0 - - + + plain_value text plain_value - - + + html_value text -

html_value

 + +

html_value

+ - - + + use_default_value virtual select - + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index 14ee41a0b8ee0..03fb245560eaa 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -12,159 +12,159 @@ Magento\Customer\Test\Repository\AddressInjectable Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface - + city varchar 1 Culver City text - - + + default_billing varchar 1 checkbox - - + + default_shipping varchar 1 checkbox - - + + company varchar 0 Magento %isolation% text - - + + country_id varchar 1 United States select - - + + fax varchar 0 text - - + + firstname varchar 1 John text - - + + lastname varchar 1 Doe text - - + + email varchar 1 John.Doe%isolation%@example.com text - - + + middlename varchar 0 text - - + + postcode varchar 0 90230 text - - + + prefix varchar 0 text - - + + region varchar 0 text - - + + region_id int 0 California hidden - - + + street text 1 6161 West Centinela Avenue multiline - - + + suffix varchar 0 text - - + + telephone varchar 1 555-55-555-55 text - - + + vat_id varchar 0 text - - + + vat_is_valid int 0 text - - + + vat_request_date varchar 0 text - - + + vat_request_id varchar 0 text - - + + vat_request_success int 0 text - + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 140260dd19330..c185b6627b1d6 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -12,14 +12,14 @@ Magento\Customer\Test\Repository\CustomerGroupInjectable Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface - + code varchar 1 customer_code_%isolation% text - - + + tax_class varchar 1 @@ -28,10 +28,10 @@ select Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds - - + + customer_group_id virtual - + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index be5c779937234..a41b4fd65b173 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -13,93 +13,93 @@ Magento\Customer\Test\Repository\CustomerInjectable Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface -
+ address virtual Magento\Customer\Test\Fixture\CustomerInjectable\Address -
- + + confirmation varchar 0 text - - + + id virtual null - - + + created_at static 0 date - - + + created_in varchar 0 text account_information - - + + default_billing int 0 text - - + + default_shipping int 0 text - - + + disable_auto_group_change static 0 boolean account_information - - + + dob datetime 0 date account_information - - + + email static 1 John.Doe%isolation%@example.com text account_information - - + + firstname varchar 1 John text account_information - - + + gender int 0 select account_information - - + + group_id static 1 @@ -107,112 +107,112 @@ select account_information Magento\Customer\Test\Fixture\CustomerInjectable\GroupId - - + + lastname varchar 1 Doe text account_information - - + + middlename varchar 0 text account_information - - + + password_hash varchar 0 hidden - - + + prefix varchar 0 text account_information - - + + rp_token varchar 0 hidden - - + + rp_token_created_at datetime 0 date - - + + store_id static 1 select account_information - - + + suffix varchar 0 text account_information - - + + taxvat varchar 0 text account_information - - + + website_id static 1 select account_information - - + + amount_delta static 1 text store_credit - - + + is_subscribed virtual - - + + password virtual null 123123q - - + + password_confirmation virtual null 123123q - - + + current_password virtual null - + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index e40082a51626e..b24472b829bc2 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -13,16 +13,16 @@ sku Magento\Downloadable\Test\Repository\DownloadableProductInjectable Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface - - downloadable - - downloadable - 4 - - product - + + downloadable + + downloadable + 4 + + product + - + category_ids static 0 @@ -30,72 +30,72 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - + + cost decimal 0 price - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 This is description for downloadable product textarea product-details - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select - - + + group_price decimal 0 @@ -103,149 +103,149 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + is_returnable varchar 0 2 select - - + + links_exist int 0 0 - - + + links_purchased_separately int 1 - - + + links_title varchar 1 - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 textarea - - + + meta_keyword text 0 textarea - - + + meta_title varchar 0 text - - + + minimal_price decimal 0 price - - + + msrp decimal 0 price - - + + msrp_display_actual_price_type varchar 0 4 select - - + + name varchar 1 DownloadableProduct_%isolation% text product-details - - + + news_from_date datetime 0 date - - + + news_to_date datetime 0 date - - + + old_id int 0 text - - + + options_container varchar 0 container2 select - - + + page_layout varchar 0 select - - + + price decimal 1 @@ -255,13 +255,13 @@ price product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - - + + stock_data text advanced-inventory - - + + quantity_and_stock_status int 0 @@ -271,50 +271,50 @@ select product-details - - + + related_tgtr_position_behavior int 0 text - - + + related_tgtr_position_limit int 0 text - - + + required_options static 0 text - - + + samples_title varchar 1 - - + + short_description text 0 This is short description for downloadable product textarea autosettings - - + + downloadable virtual 0 downloadable_information - - + + downloadable_items text 0 @@ -324,8 +324,8 @@ text downloadable_information Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Links - - + + downloadable_sample text 0 @@ -333,59 +333,59 @@ text downloadable_information Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples - - + + sku static 1 DownloadableProduct_%isolation% text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + special_from_date datetime 0 date - - + + special_price decimal 0 10 advanced-pricing - - + + special_to_date datetime 0 date - - + + status int 0 1 select product-details - - + + tax_class_id int 0 @@ -395,22 +395,22 @@ select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + tier_price decimal 0 @@ -418,90 +418,90 @@ text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - - + + updated_at static 1 text - - + + upsell_tgtr_position_behavior int 0 text - - + + upsell_tgtr_position_limit int 0 text - - + + url_key varchar 0 downloadableproduct_%isolation% text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 4 select autosettings - - + + weight decimal 0 weight product-details - - + + custom_options virtual 0 default customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - - + + id virtual - - + + is_virtual virtual product-details Yes - - + + website_ids virtual Main Website websites - - + + checkout_data virtual null Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\CheckoutData - + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index cf1a00a1775ad..52af7d1a53380 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -12,59 +12,59 @@ gift_message_id Magento\GiftMessage\Test\Repository\GiftMessage - + gift_message_id int 1 - - + + customer_id int 0 - - + + sender varchar John Doe - - + + recipient varchar Jane Doe - - + + message text text_%isolation% - - + + allow_gift_options virtual Yes - - + + allow_gift_messages_for_order virtual Yes - - + + allow_gift_options_for_items virtual - - + + items virtual Magento\GiftMessage\Test\Fixture\GiftMessage\Items - + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index 5df0d8e9c680e..7e0895d02194b 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -12,36 +12,5 @@ Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface - - type_id - int - 1 - - - - - attribute_set_id - smallint - - - default - - - Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId - - - target_country - varchar - - United States - - - - category - varchar - - Apparel & Accessories - - diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index 10322bb5c91dc..8821df8893613 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -13,16 +13,16 @@ sku Magento\GroupedProduct\Test\Repository\GroupedProductInjectable Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface - - grouped - - grouped - 4 - - product - + + grouped + + grouped + 4 + + product + - + category_ids static 0 @@ -30,178 +30,178 @@ text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - + + country_of_manufacture varchar 0 select - - + + created_at static 1 text - - + + custom_design varchar 0 select - - + + associated virtual 1 grouped Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Associated - - + + custom_design_from datetime 0 date - - + + custom_design_to datetime 0 date - - + + custom_layout_update text 0 textarea - - + + description text 0 This is description for grouped product product-details - - + + gallery varchar 0 gallery - - + + gift_message_available varchar 0 select - - + + has_options static 0 text - - + + image varchar 0 media_image - - + + image_label varchar 0 text - - + + is_returnable varchar 0 2 select - - + + media_gallery varchar 0 gallery - - + + meta_description varchar 0 textarea - - + + meta_keyword text 0 textarea - - + + meta_title varchar 0 text - - + + name varchar 1 GroupedProduct_%isolation% text product-details - - + + news_from_date datetime 0 date - - + + news_to_date datetime 0 date - - + + old_id int 0 text - - + + options_container varchar 0 container2 select - - + + page_layout varchar 0 select - - + + quantity_and_stock_status int 0 @@ -211,161 +211,161 @@ select product-details - - + + stock_data advanced-inventory - - + + related_tgtr_position_behavior int 0 text - - + + related_tgtr_position_limit int 0 text - - + + required_options static 0 text - - + + short_description text 0 This is short description for grouped product autosettings - - + + sku static 1 GroupedProduct_%isolation% text product-details - - + + small_image varchar 0 media_image - - + + small_image_label varchar 0 text - - + + status int 0 1 select - - + + thumbnail varchar 0 media_image - - + + thumbnail_label varchar 0 text - - + + updated_at static 1 text - - + + upsell_tgtr_position_behavior int 0 text - - + + upsell_tgtr_position_limit int 0 text - - + + url_key varchar 0 text search-engine-optimization - - + + url_path varchar 0 text - - + + visibility int 0 4 select - - + + id virtual - - + + type_id virtual - - + + attribute_set_id virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - - + + website_ids virtual Main Website websites - - + + price virtual Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Price - - + + checkout_data virtual null Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData - - + + taxable_goods - + diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 8a372f861530f..205d65f809b4a 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -9,33 +9,33 @@ flat importexport_importdata - + id int 1 - - + + entity varchar Products - - + + behavior varchar CSV - - + + data longtext - + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index 44e054c70c444..614fffaa46646 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -11,81 +11,81 @@ Magento\Install\Test\Repository\Install Magento\Install\Test\Handler\Install\InstallInterface - + dbHost virtual - - + + dbUser virtual - - + + dbPassword virtual - - + + dbName virtual - - + + web virtual - - + + admin virtual - - + + adminUsername virtual - - + + adminEmail virtual - - + + adminPassword virtual - - + + adminConfirm virtual - - + + apacheRewrites virtual - - + + dbTablePrefix virtual - - + + keyOwn virtual - - + + httpsAdmin virtual - - + + https virtual - - + + httpsFront virtual - - + + keyValue virtual - - + + language virtual - - + + language virtual - + diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index b59d9a8224117..cbb26774bef2c 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -17,191 +17,191 @@ Magento\Integration\Test\Repository\Integration Magento\Integration\Test\Handler\Integration\IntegrationInterface - + integration_id int 1 - - + + name varchar default_integration_%isolation% integration_info - - + + email varchar test_%isolation%@example.com integration_info - - + + endpoint varchar integration_info - - + + status smallint - - + + consumer_id int - - + + created_at timestamp CURRENT_TIMESTAMP - - + + updated_at timestamp - - + + setup_type smallint 0 - - + + identity_link_url varchar integration_info - - + + entity_id int 1 - - + + admin_id int - - + + customer_id int - - + + type varchar - - + + token varchar - - + + secret varchar - - + + verifier varchar - - + + callback_url varchar - - + + revoked smallint 0 - - + + authorized smallint 0 - - + + user_type int - - + + key varchar - - + + rejected_callback_url varchar - - + + resource_access virtual api All - - + + resources virtual api - - + + token_secret virtual integration_info - - + + consumer_secret virtual integration_info - + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 512ec3a45dd88..d9672c35eee98 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -13,89 +13,89 @@ Magento\Newsletter\Test\Repository\Template Magento\Newsletter\Test\Handler\Template\TemplateInterface - + template_id int 1 - - + + template_code varchar TemplateName%isolation% - - + + template_text text Some text %isolation% - - + + template_text_preprocessed text - - + + template_styles text - - + + template_type int - - + + template_subject varchar TemplateSubject%isolation% - - + + template_sender_name varchar SenderName%isolation% - - + + template_sender_email varchar SenderName%isolation%@example.com - - + + template_actual smallint 1 - - + + added_at timestamp - - + + modified_at timestamp - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index 335f2d04df884..7a6c1d9b7b4f0 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -13,54 +13,54 @@ Magento\Review\Test\Repository\Rating Magento\Review\Test\Handler\Rating\RatingInterface - + rating_id smallint 1 - - + + entity_id smallint 0 - - + + rating_code varchar Rating %isolation% rating_information - - + + position smallint 0 rating_information - - + + is_active smallint Yes rating_information - - + + stores virtual rating_information Main Website/Main Website Store/Default Store View - - + + options virtual rating_information - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml index f40cb8f899962..d7040f3bc2bf2 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/ReviewInjectable.xml @@ -15,21 +15,21 @@ Magento\Review\Test\Repository\ReviewInjectable Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface - + review_id bigint 0 - - + + created_at timestamp CURRENT_TIMESTAMP - - + + entity_id smallint @@ -38,64 +38,64 @@ Magento\Review\Test\Fixture\ReviewInjectable\EntityId - - + + entity_pk_value int 0 - - + + status_id smallint Approved - - + + detail_id bigint 1 - - + + store_id smallint 0 - - + </field> + <field name="title" > <attribute_code>title</attribute_code> <backend_type>varchar</backend_type> <is_required></is_required> <default_value>Summary review %isolation%</default_value> <input></input> - - + + detail text Text review %isolation% - - + + nickname varchar Guest customer %isolation% - - + + customer_id int - - + + select_stores virtual 1 @@ -103,8 +103,8 @@ Main Website/Main Website Store/Default Store View multiselectgrouplist - - + + ratings virtual Magento\Review\Test\Fixture\ReviewInjectable\Ratings @@ -114,13 +114,13 @@ 4 - - + + type string Administrator - + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index dac7e316eff83..b86090c9dc856 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -12,47 +12,47 @@ Magento\Sitemap\Test\Repository\Sitemap Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface - + sitemap_id int 1 - - + + sitemap_type varchar - - + + sitemap_filename varchar sitemap.xml - - + + sitemap_path varchar / - - + + sitemap_time timestamp - - + + store_id smallint 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index 2cc0419474ea8..22b5c311d2c5f 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -12,28 +12,28 @@ Magento\Store\Test\Repository\Store Magento\Store\Test\Handler\Store\StoreInterface - + store_id smallint 1 1 - - + + code varchar default text - - + + website_id smallint 0 - - + + group_id smallint @@ -42,27 +42,27 @@ select Magento\Store\Test\Fixture\Store\GroupId - - + + name varchar Default Store View text - - + + sort_order smallint 0 text - - + + is_active smallint Enabled select - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index cc208e67c1229..992506a6ea778 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -13,42 +13,42 @@ Magento\Store\Test\Repository\StoreGroup Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface - + group_id smallint 1 - - + + website_id virtual Magento\Store\Test\Fixture\StoreGroup\WebsiteId main_website - - + + name varchar StoreGroup%isolation% - - + + root_category_id virtual Magento\Store\Test\Fixture\StoreGroup\CategoryId default_category - - + + default_store_id smallint 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 35a220fe77c42..426e8c50f59bb 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -13,47 +13,47 @@ Magento\Store\Test\Repository\Website Magento\Store\Test\Handler\Website\WebsiteInterface - + website_id smallint 1 1 - - + + code varchar base - - + + name varchar Main Website - - + + sort_order smallint 0 - - + + default_group_id smallint 0 - - + + is_default smallint 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index eeff468816958..05b312b4150b3 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -13,30 +13,30 @@ Magento\Tax\Test\Repository\TaxClass Magento\Tax\Test\Handler\TaxClass\TaxClassInterface - + class_id smallint 1 - - + + class_name varchar Tax Class %isolation% - - + + class_type varchar CUSTOMER - - + + id virtual - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index ebfaad754fd8b..b28f279d588bd 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -13,72 +13,72 @@ Magento\Tax\Test\Repository\TaxRate Magento\Tax\Test\Handler\TaxRate\TaxRateInterface - + tax_calculation_rate_id int 1 - - + + tax_country_id varchar United States - - + + tax_region_id int California - - + + tax_postcode varchar * - - + + code varchar Tax Rate %isolation% - - + + rate decimal 10 - - + + zip_is_range smallint - - + + zip_from int - - + + zip_to int - - + + id virtual - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index 8ce3d872654eb..3c37192fcf8d3 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -13,35 +13,35 @@ Magento\Tax\Test\Repository\TaxRule Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface - + tax_calculation_rule_id int 1 - - + + code varchar TaxIdentifier%isolation% - - + + priority int - - + + position int - - + + tax_rate virtual Magento\Tax\Test\Fixture\TaxRule\TaxRate @@ -50,16 +50,16 @@ US-CA-Rate_1 - - + + tax_customer_class virtual Magento\Tax\Test\Fixture\TaxRule\TaxClass - - + + tax_product_class virtual Magento\Tax\Test\Fixture\TaxRule\TaxClass - + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index 3c58338761be6..9be2ec8fa4b84 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -13,51 +13,51 @@ Magento\UrlRewrite\Test\Repository\UrlRewrite Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface - + id virtual - - + + store_id varchar 1 Main Website/Main Website Store/Default Store View Magento\UrlRewrite\Test\Fixture\UrlRewrite\StoreId select - - + + redirect_type int 0 select - - + + request_path varchar 1 test_request%isolation% text - - + + entity_type varchar 0 text - - + + target_path varchar 1 target_path%isolation% text Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath - - + + description varchar 0 text - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index 04262f49cfa04..e576819ce1ced 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -12,79 +12,79 @@ Magento\User\Test\Repository\AdminUserRole Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface - + role_id int 1 - - + + parent_id int 0 - - + + tree_level smallint 0 - - + + sort_order smallint 0 - - + + role_type varchar 0 - - + + user_id int 0 - - + + rolename varchar AdminRole%isolation% role-info - - + + user_type varchar - - + + resource_access virtual role-resources All - - + + roles_resources virtual role-resources - - + + in_role_users virtual in_role_users Magento\User\Test\Fixture\AdminUserRole\InRoleUsers - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index 11000dfaebdfe..a02da19fcb699 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -12,139 +12,139 @@ Magento\User\Test\Repository\User Magento\User\Test\Handler\User\UserInterface - + user_id int 1 - - + + firstname varchar FirstName%isolation% user-info - - + + lastname varchar LastName%isolation% user-info - - + + email varchar email%isolation%@example.com user-info - - + + username varchar AdminUser%isolation% user-info - - + + password varchar 123123q user-info - - + + created timestamp CURRENT_TIMESTAMP - - + + modified timestamp - - + + logdate timestamp - - + + lognum smallint 0 - - + + reload_acl_flag smallint 0 - - + + is_active smallint Active - - + + extra text - - + + rp_token text - - + + rp_token_created_at timestamp - - + + interface_locale varchar en_US - - + + role_id virtual user-role Magento\User\Test\Fixture\User\RoleId - - + + password_confirmation virtual user-info 123123q - - + + current_password virtual user-info - + From 10def70eb0f346562625140e2abf08cae62b85e0 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Mon, 12 Jan 2015 18:22:26 +0200 Subject: [PATCH 06/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format - Changed repository node --- .../tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml | 2 +- .../app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml | 2 +- .../app/Magento/Catalog/Test/Repository/CatalogCategory.xml | 2 +- .../Magento/Catalog/Test/Repository/CatalogProductAttribute.xml | 2 +- .../Magento/Catalog/Test/Repository/CatalogProductSimple.xml | 2 +- .../Magento/Catalog/Test/Repository/CatalogProductVirtual.xml | 2 +- .../tests/app/Magento/Catalog/Test/Repository/Category.xml | 2 +- .../app/Magento/CatalogRule/Test/Repository/CatalogRule.xml | 2 +- .../CatalogSearch/Test/Repository/CatalogSearchQuery.xml | 2 +- .../tests/app/Magento/Core/Test/Repository/SystemVariable.xml | 2 +- .../app/Magento/Customer/Test/Repository/AddressInjectable.xml | 2 +- .../Customer/Test/Repository/CustomerGroupInjectable.xml | 2 +- .../app/Magento/Customer/Test/Repository/CustomerInjectable.xml | 2 +- .../Test/Repository/DownloadableProductInjectable.xml | 2 +- .../app/Magento/GiftMessage/Test/Repository/GiftMessage.xml | 2 +- .../GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml | 2 +- .../GroupedProduct/Test/Repository/GroupedProductInjectable.xml | 2 +- .../app/Magento/Integration/Test/Repository/Integration.xml | 2 +- .../tests/app/Magento/Newsletter/Test/Repository/Template.xml | 2 +- .../tests/app/Magento/Review/Test/Repository/Rating.xml | 2 +- .../tests/app/Magento/Review/Test/Repository/Review.xml | 2 +- .../app/Magento/Review/Test/Repository/ReviewInjectable.xml | 2 +- .../tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml | 2 +- .../tests/app/Magento/Store/Test/Repository/Store.xml | 2 +- .../tests/app/Magento/Store/Test/Repository/StoreGroup.xml | 2 +- .../tests/app/Magento/Store/Test/Repository/Website.xml | 2 +- .../tests/app/Magento/Tax/Test/Repository/TaxClass.xml | 2 +- .../tests/app/Magento/Tax/Test/Repository/TaxRate.xml | 2 +- .../tests/app/Magento/Tax/Test/Repository/TaxRule.xml | 2 +- .../tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml | 2 +- .../tests/app/Magento/User/Test/Repository/AdminUserRole.xml | 2 +- .../functional/tests/app/Magento/User/Test/Repository/User.xml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml index 4d060500143d2..e323c9fa4fbda 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + BundleDynamic_sku_10735074493 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml index 67abbaa60332a..b7a8e3914fe7b 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Default diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml index d8a0a8b724ce2..9de5b10ebfada 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Default Category diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml index 05dc57c581a80..686e759ca70dd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + attribute_text%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 4cf762395dc98..ad79640727c99 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml index 8b0cbcf65f4b9..b70f95dd7595a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml index 93ef0a9d833f8..ae52e3e6d446d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml index 1f46c9c6bd4b0..fdeab38469759 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Active Catalog Rule diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml index f9653cc215436..9ca581d406296 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index 4b8acd1b4a5c6..aa29c5b06be38 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml index fd37ecb280340..989c4318536ca 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + John diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml index 1cbe281f3ea1d..ef8c45beb3db1 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml index 724a57e7c10df..d41f3f853b583 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + John diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml index 09deed6ac541a..7b5ea754305a5 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Test downloadable product %isolation% diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml index 59a52ffd742ab..dc9129298668d 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + John Doe diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml index 7da12aaab1d3c..e5b39b6b91f4d 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml index eab0d9c87e1ea..80fc923304376 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Test grouped product %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml index 546dce79a4a80..7f0a01dc0bac0 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + default_integration_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml index 31c4ab6dfcc68..568dac2086000 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Newsletter Template %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml index d9d499403ca32..2b61bd778982d 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Rating %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml index 0deeca534d4cb..0a7769b4909cf 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml index 0396683c60169..b42c3f55df8d7 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + Approved diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml index dd07d48b45124..33390c71f4328 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + sitemap.xml diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml index 7da12aaab1d3c..e5b39b6b91f4d 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml index 51a0786a1b6d0..222e61ba955fa 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml index 7d87c1bae604e..9d82fe758aef9 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + All Websites diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml index a43a4e16759dc..e1651fb1585df 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + 2 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml index fa7667b6e2256..54bc199f9af12 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml index dbcb98f3909c5..106ee053301ef 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + TaxIdentifier%isolation% diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml index 7fa163cf79f95..f33de4ff3041f 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + test-test-test%isolation%.html diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml index 7da12aaab1d3c..e5b39b6b91f4d 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml index 06606e17bd457..ddfc330b3291a 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ --> - + admin From 526fb69be9f7c7ee70ae97fa25d15176b05357de Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Wed, 14 Jan 2015 12:20:46 +0200 Subject: [PATCH 07/29] MTA-1316: Apply fixture changes to Magento - Split configuration repository to appropriate modules --- .../Backend/Test/Repository/ConfigData.xml | 62 + .../Test/Repository/ConfigData.xml | 50 + .../Dhl/Test/Repository/ConfigData.xml | 66 + .../Fedex/Test/Repository/ConfigData.xml | 60 + .../Test/Repository/ConfigData.xml | 26 + .../Test/Repository/ConfigData.xml | 242 +++ .../Test/Repository/ConfigData.xml | 130 ++ .../Reports/Test/Repository/ConfigData.xml | 32 + .../Shipping/Test/Repository/ConfigData.xml | 84 + .../Tax/Test/Repository/ConfigData.xml | 1752 +++++++++++++++++ .../Ups/Test/Repository/ConfigData.xml | 156 ++ .../Usps/Test/Repository/ConfigData.xml | 54 + 12 files changed, 2714 insertions(+) create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..b0114417c0655 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml @@ -0,0 +1,62 @@ + + + + + + + + general/store_information/name + general + 1 + Store 1 + + + general/store_information/phone + general + 1 + 1234-123-123 + + + general/store_information/country_id + general + 1 + US + + + general/store_information/region_id + general + 1 + 12 + + + general/store_information/postcode + general + 1 + 90322 + + + general/store_information/city + general + 1 + Culver City + + + general/store_information/street_line1 + general + 1 + 10441 Jefferson Blvd + + + general/store_information/street_line2 + general + 1 + Suite 200 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..046e3e51e353b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml @@ -0,0 +1,50 @@ + + + + + + + + cataloginventory/options/show_out_of_stock + cataloginventory + 1 + 1 + + + + + + + cataloginventory/item_options/backorders + cataloginventory + 1 + 1 + + + + + + + cataloginventory/options/show_out_of_stock + cataloginventory + 1 + 0 + + + + + + + cataloginventory/item_options/backorders + cataloginventory + 1 + 0 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..96a005dbafda4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -0,0 +1,66 @@ + + + + + + + + carriers/dhl/active + carriers + 1 + 0 + + + + + + + carriers/dhl/active + carriers + 1 + 1 + + + carriers/dhl/gateway_url + carriers + 1 + https://xmlpitest-ea.dhl.com/XMLShippingServlet + + + carriers/dhl/id + carriers + 1 + EvgeniyDE + + + carriers/dhl/password + carriers + 1 + aplNb6Rop + + + carriers/dhl/account + carriers + 1 + 152691811 + + + carriers/dhl/showmethod + carriers + 1 + 1 + + + carriers/dhl/debug + carriers + 1 + 1 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..e6c6b3bb415a5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -0,0 +1,60 @@ + + + + + + + + carriers/fedex/active + carriers + 1 + 0 + + + + + + + carriers/fedex/active + carriers + 1 + 1 + + + carriers/fedex/account + carriers + 1 + 510087801 + + + carriers/fedex/meter_number + carriers + 1 + 100047915 + + + carriers/fedex/key + carriers + 1 + INdxa6ug7qZ2KD7y + + + carriers/fedex/password + carriers + 1 + pTfh4K0nkHcHVginelU4HmJkA + + + carriers/fedex/sandbox_mode + carriers + 1 + 1 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..4deff1abc838a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml @@ -0,0 +1,26 @@ + + + + + + + + sales/gift_options/allow_order + sales + 1 + 1 + + + sales/gift_options/allow_items + sales + 1 + 1 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..9ef801b6448c6 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml @@ -0,0 +1,242 @@ + + + + + + + + payment/cashondelivery/active + payment + 1 + 1 + + + + + + + payment/cashondelivery/active + payment + 1 + 0 + + + + + + + payment/cashondelivery/active + payment + 1 + 1 + + + payment/cashondelivery/allowspecific + payment + 1 + 1 + + + payment/cashondelivery/specificcountry/active + payment + 1 + GB + + + + + + + payment/cashondelivery/active + payment + 1 + 0 + + + payment/cashondelivery/allowspecific + payment + 1 + 0 + + + + + + + payment/checkmo/active + payment + 1 + 1 + + + + + + + payment/checkmo/active + payment + 1 + 0 + + + + + + + payment/checkmo/active + payment + 1 + 1 + + + payment/checkmo/allowspecific + payment + 1 + 1 + + + payment/checkmo/specificcountry/active + payment + 1 + GB + + + + + + + payment/checkmo/active + payment + 1 + 0 + + + payment/checkmo/allowspecific + payment + 1 + 0 + + + + + + + payment/banktransfer/active + payment + 1 + 1 + + + + + + + payment/banktransfer/active + payment + 1 + 0 + + + + + + + payment/banktransfer/active + payment + 1 + 1 + + + payment/banktransfer/allowspecific + payment + 1 + 1 + + + payment/banktransfer/specificcountry/active + payment + 1 + GB + + + + + + + payment/banktransfer/active + payment + 1 + 0 + + + payment/banktransfer/allowspecific + payment + 1 + 0 + + + + + + + payment/purchaseorder/active + payment + 1 + 1 + + + + + + + payment/purchaseorder/active + payment + 1 + 0 + + + + + + + payment/purchaseorder/active + payment + 1 + 1 + + + payment/purchaseorder/allowspecific + payment + 1 + 1 + + + payment/purchaseorder/specificcountry/active + payment + 1 + GB + + + + + + + payment/purchaseorder/active + payment + 1 + 0 + + + payment/purchaseorder/allowspecific + payment + 1 + 0 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..42a60a2de1b83 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml @@ -0,0 +1,130 @@ + + + + + + + + carriers/freeshipping/active + carriers + 1 + 1 + + + + + + + carriers/freeshipping/active + carriers + 1 + 0 + + + + + + + carriers/freeshipping/active + carriers + 1 + 1 + + + carriers/freeshipping/sallowspecific + carriers + 1 + 1 + + + carriers/freeshipping/specificcountry/active + carriers + 1 + GB + + + + + + + carriers/freeshipping/active + carriers + 1 + 0 + + + carriers/freeshipping/sallowspecific + carriers + 1 + 0 + + + + + + + carriers/flatrate/active + carriers + 1 + 0 + + + carriers/freeshipping/active + carriers + 1 + 0 + + + + + + + carriers/flatrate/active + carriers + 1 + 1 + + + carriers/flatrate/title + carriers + 1 + Flat Rate + + + carriers/flatrate/name + carriers + 1 + Fixed + + + carriers/flatrate/type + carriers + 1 + I + + + carriers/flatrate/price + carriers + 1 + 5 + + + carriers/flatrate/handling_type + carriers + 1 + F + + + carriers/flatrate/specificerrmsg + carriers + 1 + This shipping method is not available. To use this shipping method, please contact us. + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..039e6f8034382 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml @@ -0,0 +1,32 @@ + + + + + + + + catalog/recently_products/scope + catalog + 1 + Website + + + catalog/recently_products/viewed_count + catalog + 1 + 5 + + + catalog/recently_products/compared_count + catalog + 1 + 12 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..84c25798846d3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml @@ -0,0 +1,84 @@ + + + + + + + + shipping/origin/country_id + shipping + 1 + US + + + shipping/origin/region_id + shipping + 1 + 12 + + + shipping/origin/postcode + shipping + 1 + 90232 + + + shipping/origin/city + shipping + 1 + Culver City + + + shipping/origin/street_line1 + shipping + 1 + 10441 Jefferson Blvd + + + shipping/origin/street_line2 + shipping + 1 + Suite 200 + + + + + + + shipping/origin/country_id + carriers + 1 + US + + + shipping/origin/region_id + shipping + 1 + 12 + + + shipping/origin/postcode + shipping + 1 + 90024 + + + shipping/origin/city + shipping + 1 + Los Angeles + + + shipping/origin/street_line1 + shipping + 1 + 1419 Westwood Blvd + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..7d31eea86bf44 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml @@ -0,0 +1,1752 @@ + + + + + + + + tax/classes/shipping_tax_class + tax + 1 + 2 + + + + + + + tax/classes/shipping_tax_class + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + ROW_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + ROW_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + ROW_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + UNIT_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + UNIT_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + UNIT_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 3 + + + tax/display/shipping + tax + 1 + 3 + + + tax/cart_display/price + tax + 1 + 3 + + + tax/cart_display/subtotal + tax + 1 + 3 + + + tax/cart_display/shipping + tax + 1 + 3 + + + tax/cart_display/grandtotal + tax + 1 + 1 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 2 + + + tax/display/shipping + tax + 1 + 2 + + + tax/cart_display/price + tax + 1 + 2 + + + tax/cart_display/subtotal + tax + 1 + 2 + + + tax/cart_display/shipping + tax + 1 + 2 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 1 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 2 + + + tax/display/shipping + tax + 1 + 2 + + + tax/cart_display/price + tax + 1 + 2 + + + tax/cart_display/subtotal + tax + 1 + 2 + + + tax/cart_display/shipping + tax + 1 + 2 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 1 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 0 + + + tax/calculation/shipping_includes_tax + tax + 1 + 0 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 1 + + + tax/calculation/discount_tax + tax + 1 + 0 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + + + tax/calculation/algorithm + tax + 1 + TOTAL_BASE_CALCULATION + + + tax/calculation/price_includes_tax + tax + 1 + 1 + + + tax/calculation/shipping_includes_tax + tax + 1 + 1 + + + tax/calculation/apply_after_discount + tax + 1 + 0 + + + tax/calculation/discount_tax + tax + 1 + 1 + + + tax/display/type + tax + 1 + 1 + + + tax/display/shipping + tax + 1 + 1 + + + tax/cart_display/price + tax + 1 + 1 + + + tax/cart_display/subtotal + tax + 1 + 1 + + + tax/cart_display/shipping + tax + 1 + 1 + + + tax/cart_display/grandtotal + tax + 1 + 0 + + + tax/cart_display/full_summary + tax + 1 + 0 + + + tax/calculation/cross_border_trade_enabled + tax + 1 + 0 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..5d4d8295d52e0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -0,0 +1,156 @@ + + + + + + + + carriers/ups/active + carriers + 1 + 0 + + + + + + + carriers/ups/active + carriers + 1 + 1 + + + carriers/ups/active_rma + carriers + 1 + 1 + + + carriers/ups/type + carriers + 1 + UPS_XML + + + carriers/ups/is_account_live + carriers + 1 + 0 + + + carriers/ups/password + carriers + 1 + magento200 + + + carriers/ups/username + carriers + 1 + magento + + + carriers/ups/mode_xml + carriers + 1 + 0 + + + carriers/ups/gateway_url + carriers + 1 + https://wwwcie.ups.com/ups.app/xml/Rate + + + carriers/ups/origin_shipment + carriers + 1 + Shipments Originating in United States + + + carriers/ups/access_license_number + carriers + 1 + ECAB751ABF189ECA + + + carriers/ups/negotiated_active + carriers + 1 + 0 + + + carriers/ups/shipper_number + carriers + 1 + 207W88 + + + carriers/ups/container + carriers + 1 + CP + + + carriers/ups/dest_type + carriers + 1 + RES + + + carriers/ups/tracking_xml_url + carriers + 1 + https://wwwcie.ups.com/ups.app/xml/Track + + + carriers/ups/unit_of_measure + carriers + 1 + LBS + + + carriers/ups/allowed_methods + carriers + 1 + + 11 + 12 + 14 + 54 + 59 + 65 + 01 + 02 + 03 + 07 + 08 + + + + carriers/ups/sallowspecific + carriers + 1 + 0 + + + carriers/ups/showmethod + carriers + 1 + 0 + + + carriers/ups/debug + carriers + 1 + 1 + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..a554e27768372 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -0,0 +1,54 @@ + + + + + + + + carriers/usps/active + carriers + 1 + 0 + + + + + + + carriers/usps/active + carriers + 1 + 1 + + + carriers/usps/gateway_url + carriers + 1 + http://production.shippingapis.com/ShippingAPI.dll + + + carriers/usps/gateway_secure_url + carriers + 1 + https://secure.shippingapis.com/ShippingAPI.dll + + + carriers/usps/userid + carriers + 1 + 721FRAGR6267 + + + carriers/usps/password + carriers + 1 + 326ZL84XF990 + + + + + From f7f9e224d218bd1e09a8a4773cfddc61c775568c Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Thu, 15 Jan 2015 14:46:46 +0200 Subject: [PATCH 08/29] MTA-1316: Apply fixture changes to Magento - Split configuration repository to appropriate modules - Added label --- .../Backend/Test/Repository/ConfigData.xml | 60 +- .../Test/Repository/ConfigData.xml | 44 +- .../Dhl/Test/Repository/ConfigData.xml | 64 +- .../Fedex/Test/Repository/ConfigData.xml | 59 +- .../Test/Repository/ConfigData.xml | 20 +- .../Test/Repository/ConfigData.xml | 292 +-- .../Test/Repository/ConfigData.xml | 138 +- .../Reports/Test/Repository/ConfigData.xml | 27 +- .../Shipping/Test/Repository/ConfigData.xml | 87 +- .../Tax/Test/Repository/ConfigData.xml | 2019 +++-------------- .../Ups/Test/Repository/ConfigData.xml | 179 +- .../Usps/Test/Repository/ConfigData.xml | 52 +- 12 files changed, 486 insertions(+), 2555 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml index 2a75afbe7826f..086ec63fff02f 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml @@ -7,57 +7,15 @@ --> - - - - general/store_information/name - general - 1 - Store 1 - - - general/store_information/phone - general - 1 - 1234-123-123 - - - general/store_information/country_id - general - 1 - US - - - general/store_information/region_id - general - 1 - 12 - - - general/store_information/postcode - general - 1 - 90322 - - - general/store_information/city - general - 1 - Culver City - - - general/store_information/street_line1 - general - 1 - 10441 Jefferson Blvd - - - general/store_information/street_line2 - general - 1 - Suite 200 - - + + Store 1 + 1234-123-123 + US + 12 + 90322 + Culver City + 10441 Jefferson Blvd + Suite 200 diff --git a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml index cffcf9fabab57..659249da5e5c2 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml @@ -7,45 +7,17 @@ --> - - - - cataloginventory/options/show_out_of_stock - cataloginventory - 1 - 1 - - + + 1 - - - - cataloginventory/item_options/backorders - cataloginventory - 1 - 1 - - + + 1 - - - - cataloginventory/options/show_out_of_stock - cataloginventory - 1 - 0 - - + + 0 - - - - cataloginventory/item_options/backorders - cataloginventory - 1 - 0 - - + + 0 diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml index 9df7be9f55cc0..27d1d4c32f434 100644 --- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -7,61 +7,17 @@ --> - - - - carriers/dhl/active - carriers - 1 - 0 - - + + 0 - - - - carriers/dhl/active - carriers - 1 - 1 - - - carriers/dhl/gateway_url - carriers - 1 - https://xmlpitest-ea.dhl.com/XMLShippingServlet - - - carriers/dhl/id - carriers - 1 - EvgeniyDE - - - carriers/dhl/password - carriers - 1 - aplNb6Rop - - - carriers/dhl/account - carriers - 1 - 152691811 - - - carriers/dhl/showmethod - carriers - 1 - 1 - - - carriers/dhl/debug - carriers - 1 - 1 - - + + 1 + https://xmlpitest-ea.dhl.com/XMLShippingServlet + EvgeniyDE + aplNb6Rop + 152691811 + 1 + 1 diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml index 82e25889d7489..cdfb685f04283 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -5,57 +5,18 @@ * See COPYING.txt for license details. */ --> - + - - - - carriers/fedex/active - carriers - 1 - 0 - - + + 0 - - - - carriers/fedex/active - carriers - 1 - 1 - - - carriers/fedex/account - carriers - 1 - 510087801 - - - carriers/fedex/meter_number - carriers - 1 - 100047915 - - - carriers/fedex/key - carriers - 1 - INdxa6ug7qZ2KD7y - - - carriers/fedex/password - carriers - 1 - pTfh4K0nkHcHVginelU4HmJkA - - - carriers/fedex/sandbox_mode - carriers - 1 - 1 - - + + 1 + 510087801 + 100047915 + INdxa6ug7qZ2KD7y + pTfh4K0nkHcHVginelU4HmJkA + 1 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml index fea3c279c4618..b5266da9eb335 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml @@ -5,23 +5,11 @@ * See COPYING.txt for license details. */ --> - + - - - - sales/gift_options/allow_order - sales - 1 - 1 - - - sales/gift_options/allow_items - sales - 1 - 1 - - + + 1 + 1 diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml index 7723d192fcc9c..760de60ee86fa 100644 --- a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml @@ -5,239 +5,67 @@ * See COPYING.txt for license details. */ --> - + - - - - payment/cashondelivery/active - payment - 1 - 1 - - - - - - - payment/cashondelivery/active - payment - 1 - 0 - - - - - - - payment/cashondelivery/active - payment - 1 - 1 - - - payment/cashondelivery/allowspecific - payment - 1 - 1 - - - payment/cashondelivery/specificcountry/active - payment - 1 - GB - - - - - - - payment/cashondelivery/active - payment - 1 - 0 - - - payment/cashondelivery/allowspecific - payment - 1 - 0 - - - - - - - payment/checkmo/active - payment - 1 - 1 - - - - - - - payment/checkmo/active - payment - 1 - 0 - - - - - - - payment/checkmo/active - payment - 1 - 1 - - - payment/checkmo/allowspecific - payment - 1 - 1 - - - payment/checkmo/specificcountry/active - payment - 1 - GB - - - - - - - payment/checkmo/active - payment - 1 - 0 - - - payment/checkmo/allowspecific - payment - 1 - 0 - - - - - - - payment/banktransfer/active - payment - 1 - 1 - - - - - - - payment/banktransfer/active - payment - 1 - 0 - - - - - - - payment/banktransfer/active - payment - 1 - 1 - - - payment/banktransfer/allowspecific - payment - 1 - 1 - - - payment/banktransfer/specificcountry/active - payment - 1 - GB - - - - - - - payment/banktransfer/active - payment - 1 - 0 - - - payment/banktransfer/allowspecific - payment - 1 - 0 - - - - - - - payment/purchaseorder/active - payment - 1 - 1 - - - - - - - payment/purchaseorder/active - payment - 1 - 0 - - - - - - - payment/purchaseorder/active - payment - 1 - 1 - - - payment/purchaseorder/allowspecific - payment - 1 - 1 - - - payment/purchaseorder/specificcountry/active - payment - 1 - GB - - - - - - - payment/purchaseorder/active - payment - 1 - 0 - - - payment/purchaseorder/allowspecific - payment - 1 - 0 - - + + 1 + + + 0 + + + 1 + 1 + GB + + + 0 + 0 + + + 1 + + + 0 + + + 1 + 1 + GB + + + 0 + 0 + + + 1 + + + 0 + + + 1 + 1 + GB + + + 0 + 0 + + + 1 + + + 0 + + + 1 + 1 + GB + + + 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml index c169ea2517e9b..958fe1cdd7fb4 100644 --- a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml @@ -5,127 +5,35 @@ * See COPYING.txt for license details. */ --> - + - - - - carriers/freeshipping/active - carriers - 1 - 1 - - + + 1 - - - - carriers/freeshipping/active - carriers - 1 - 0 - - + + 0 - - - - carriers/freeshipping/active - carriers - 1 - 1 - - - carriers/freeshipping/sallowspecific - carriers - 1 - 1 - - - carriers/freeshipping/specificcountry/active - carriers - 1 - GB - - + + 1 + 1 + GB - - - - carriers/freeshipping/active - carriers - 1 - 0 - - - carriers/freeshipping/sallowspecific - carriers - 1 - 0 - - + + 0 + 0 - - - - carriers/flatrate/active - carriers - 1 - 0 - - - carriers/freeshipping/active - carriers - 1 - 0 - - + + 0 + 0 - - - - carriers/flatrate/active - carriers - 1 - 1 - - - carriers/flatrate/title - carriers - 1 - Flat Rate - - - carriers/flatrate/name - carriers - 1 - Fixed - - - carriers/flatrate/type - carriers - 1 - I - - - carriers/flatrate/price - carriers - 1 - 5 - - - carriers/flatrate/handling_type - carriers - 1 - F - - - carriers/flatrate/specificerrmsg - carriers - 1 - This shipping method is not available. To use this shipping method, please contact us. - - + + 1 + Flat Rate + Fixed + I + 5 + F + This shipping method is not available. To use this shipping method, please contact us. diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml index 05670b528ba88..c2948245ec049 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml @@ -5,29 +5,12 @@ * See COPYING.txt for license details. */ --> - + - - - - catalog/recently_products/scope - catalog - 1 - Website - - - catalog/recently_products/viewed_count - catalog - 1 - 5 - - - catalog/recently_products/compared_count - catalog - 1 - 12 - - + + website + 5 + 12 diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml index 1b13ee8002bc0..590a9959da1c5 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml @@ -5,81 +5,22 @@ * See COPYING.txt for license details. */ --> - + - - - - shipping/origin/country_id - shipping - 1 - US - - - shipping/origin/region_id - shipping - 1 - 12 - - - shipping/origin/postcode - shipping - 1 - 90232 - - - shipping/origin/city - shipping - 1 - Culver City - - - shipping/origin/street_line1 - shipping - 1 - 10441 Jefferson Blvd - - - shipping/origin/street_line2 - shipping - 1 - Suite 200 - - + + US + 12 + 90232 + Culver City + 10441 Jefferson Blvd + Suite 200 - - - - shipping/origin/country_id - carriers - 1 - US - - - shipping/origin/region_id - shipping - 1 - 12 - - - shipping/origin/postcode - shipping - 1 - 90024 - - - shipping/origin/city - shipping - 1 - Los Angeles - - - shipping/origin/street_line1 - shipping - 1 - 1419 Westwood Blvd - - + + US + 12 + 90024 + Los Angeles + 1419 Westwood Blvd diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml index 6b60e2f5287bf..9305b85b1c65e 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml @@ -5,1749 +5,328 @@ * See COPYING.txt for license details. */ --> - + - - - - tax/classes/shipping_tax_class - tax - 1 - 2 - - + + 2 - - - - tax/classes/shipping_tax_class - tax - 1 - 0 - - + + 0 - - - - tax/calculation/algorithm - tax - 1 - ROW_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + ROW_BASE_CALCULATION + 1 + 0 + 1 + 0 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - ROW_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + ROW_BASE_CALCULATION + 0 + 1 + 0 + 1 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 1 + 1 + 0 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - ROW_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + ROW_BASE_CALCULATION + 1 + 0 + 0 + 1 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - UNIT_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + UNIT_BASE_CALCULATION + 1 + 0 + 1 + 1 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 1 + 0 + 1 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - UNIT_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + UNIT_BASE_CALCULATION + 0 + 0 + 1 + 0 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 1 + 0 + 0 + 0 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 1 + 1 + 1 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - UNIT_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 3 - - - tax/display/shipping - tax - 1 - 3 - - - tax/cart_display/price - tax - 1 - 3 - - - tax/cart_display/subtotal - tax - 1 - 3 - - - tax/cart_display/shipping - tax - 1 - 3 - - - tax/cart_display/grandtotal - tax - 1 - 1 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + UNIT_BASE_CALCULATION + 0 + 1 + 1 + 0 + 3 + 3 + 3 + 3 + 3 + 1 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 2 - - - tax/display/shipping - tax - 1 - 2 - - - tax/cart_display/price - tax - 1 - 2 - - - tax/cart_display/subtotal - tax - 1 - 2 - - - tax/cart_display/shipping - tax - 1 - 2 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 1 - - + + TOTAL_BASE_CALCULATION + 1 + 1 + 0 + 1 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 1 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 2 - - - tax/display/shipping - tax - 1 - 2 - - - tax/cart_display/price - tax - 1 - 2 - - - tax/cart_display/subtotal - tax - 1 - 2 - - - tax/cart_display/shipping - tax - 1 - 2 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 1 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 1 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 0 - - - tax/calculation/shipping_includes_tax - tax - 1 - 0 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 1 - - - tax/calculation/discount_tax - tax - 1 - 0 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 - - - - tax/calculation/algorithm - tax - 1 - TOTAL_BASE_CALCULATION - - - tax/calculation/price_includes_tax - tax - 1 - 1 - - - tax/calculation/shipping_includes_tax - tax - 1 - 1 - - - tax/calculation/apply_after_discount - tax - 1 - 0 - - - tax/calculation/discount_tax - tax - 1 - 1 - - - tax/display/type - tax - 1 - 1 - - - tax/display/shipping - tax - 1 - 1 - - - tax/cart_display/price - tax - 1 - 1 - - - tax/cart_display/subtotal - tax - 1 - 1 - - - tax/cart_display/shipping - tax - 1 - 1 - - - tax/cart_display/grandtotal - tax - 1 - 0 - - - tax/cart_display/full_summary - tax - 1 - 0 - - - tax/calculation/cross_border_trade_enabled - tax - 1 - 0 - - + + TOTAL_BASE_CALCULATION + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml index f3d3311c5bdba..e59441cb3ff4a 100644 --- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -5,153 +5,44 @@ * See COPYING.txt for license details. */ --> - + - - - - carriers/ups/active - carriers - 1 - 0 - - + + 0 - - - - carriers/ups/active - carriers - 1 - 1 - - - carriers/ups/active_rma - carriers - 1 - 1 - - - carriers/ups/type - carriers - 1 - UPS_XML - - - carriers/ups/is_account_live - carriers - 1 - 0 - - - carriers/ups/password - carriers - 1 - magento200 - - - carriers/ups/username - carriers - 1 - magento - - - carriers/ups/mode_xml - carriers - 1 - 0 - - - carriers/ups/gateway_url - carriers - 1 - https://wwwcie.ups.com/ups.app/xml/Rate - - - carriers/ups/origin_shipment - carriers - 1 - Shipments Originating in United States - - - carriers/ups/access_license_number - carriers - 1 - ECAB751ABF189ECA - - - carriers/ups/negotiated_active - carriers - 1 - 0 - - - carriers/ups/shipper_number - carriers - 1 - 207W88 - - - carriers/ups/container - carriers - 1 - CP - - - carriers/ups/dest_type - carriers - 1 - RES - - - carriers/ups/tracking_xml_url - carriers - 1 - https://wwwcie.ups.com/ups.app/xml/Track - - - carriers/ups/unit_of_measure - carriers - 1 - LBS - - - carriers/ups/allowed_methods - carriers - 1 - - 11 - 12 - 14 - 54 - 59 - 65 - 01 - 02 - 03 - 07 - 08 - - - - carriers/ups/sallowspecific - carriers - 1 - 0 - - - carriers/ups/showmethod - carriers - 1 - 0 - - - carriers/ups/debug - carriers - 1 - 1 - + + 1 + 1 + UPS_XML + 0 + magento200 + magento + 0 + https://wwwcie.ups.com/ups.app/xml/Rate + Shipments Originating in United States + ECAB751ABF189ECA + 0 + 207W88 + CP + RES + https://wwwcie.ups.com/ups.app/xml/Track + LBS + + 11 + 12 + 14 + 54 + 59 + 65 + 01 + 02 + 03 + 07 + 08 + 0 + 0 + 1 diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml index 939baf0e30276..2485941f13753 100644 --- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -5,51 +5,17 @@ * See COPYING.txt for license details. */ --> - + - - - - carriers/usps/active - carriers - 1 - 0 - - + + 0 - - - - carriers/usps/active - carriers - 1 - 1 - - - carriers/usps/gateway_url - carriers - 1 - http://production.shippingapis.com/ShippingAPI.dll - - - carriers/usps/gateway_secure_url - carriers - 1 - https://secure.shippingapis.com/ShippingAPI.dll - - - carriers/usps/userid - carriers - 1 - 721FRAGR6267 - - - carriers/usps/password - carriers - 1 - 326ZL84XF990 - - + + 1 + http://production.shippingapis.com/ShippingAPI.dll + https://secure.shippingapis.com/ShippingAPI.dll + 721FRAGR6267 + 326ZL84XF990 From d11b25e8f98491213f4c27d3f3ed3bcb9e6a2bce Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Thu, 15 Jan 2015 18:17:45 +0200 Subject: [PATCH 09/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format - Fix fixture format --- .../Backend/Test/Fixture/GlobalSearch.php | 31 - .../Backend/Test/Fixture/GlobalSearch.xml | 4 +- .../Bundle/Test/Fixture/BundleProduct.php | 902 ------------------ .../Bundle/Test/Fixture/BundleProduct.xml | 102 +- .../Test/Fixture/CatalogAttributeSet.php | 118 --- .../Test/Fixture/CatalogAttributeSet.xml | 6 +- .../Test/Fixture/CatalogProductAttribute.php | 580 ----------- .../Test/Fixture/CatalogProductAttribute.xml | 34 +- .../Test/Fixture/CatalogProductSimple.php | 897 ----------------- .../Test/Fixture/CatalogProductSimple.xml | 88 +- .../Test/Fixture/CatalogProductVirtual.php | 793 --------------- .../Test/Fixture/CatalogProductVirtual.xml | 84 +- .../Magento/Catalog/Test/Fixture/Category.xml | 26 +- .../CatalogRule/Test/Fixture/CatalogRule.php | 243 ----- .../CatalogRule/Test/Fixture/CatalogRule.xml | 12 +- .../Test/Fixture/CatalogSearchQuery.php | 175 ---- .../Test/Fixture/CatalogSearchQuery.xml | 12 +- .../Magento/Checkout/Test/Fixture/Cart.php | 717 -------------- .../Magento/Checkout/Test/Fixture/Cart.xml | 66 +- .../Fixture/ConfigurableProductInjectable.php | 858 ----------------- .../Fixture/ConfigurableProductInjectable.xml | 84 +- .../Magento/Core/Test/Fixture/ConfigData.php | 104 -- .../Magento/Core/Test/Fixture/ConfigData.xml | 30 +- .../Core/Test/Fixture/SystemVariable.php | 129 --- .../Core/Test/Fixture/SystemVariable.xml | 6 +- .../Test/Fixture/AddressInjectable.php | 326 ------- .../Test/Fixture/AddressInjectable.xml | 28 +- .../Test/Fixture/CustomerGroupInjectable.php | 70 -- .../Test/Fixture/CustomerGroupInjectable.xml | 4 +- .../Test/Fixture/CustomerInjectable.php | 403 -------- .../Test/Fixture/CustomerInjectable.xml | 42 +- .../Fixture/DownloadableProductInjectable.php | 900 ----------------- .../Fixture/DownloadableProductInjectable.xml | 84 +- .../GiftMessage/Test/Fixture/GiftMessage.php | 137 --- .../GiftMessage/Test/Fixture/GiftMessage.xml | 6 +- .../Test/Fixture/GoogleShoppingAttribute.php | 88 -- .../Test/Fixture/GoogleShoppingAttribute.xml | 35 +- .../Test/Fixture/GroupedProductInjectable.php | 699 -------------- .../Test/Fixture/GroupedProductInjectable.xml | 68 +- .../Test/Fixture/ImportExport.php | 73 -- .../Test/Fixture/ImportExport.xml | 8 +- .../Magento/Install/Test/Fixture/Install.php | 220 ----- .../Magento/Install/Test/Fixture/Install.xml | 4 +- .../Integration/Test/Fixture/Integration.php | 381 -------- .../Integration/Test/Fixture/Integration.xml | 38 +- .../Newsletter/Test/Fixture/Template.php | 190 ---- .../Newsletter/Test/Fixture/Template.xml | 16 +- .../Magento/Review/Test/Fixture/Rating.php | 121 --- .../Magento/Review/Test/Fixture/Rating.xml | 6 +- .../Magento/Review/Test/Fixture/Review.xml | 8 +- .../Magento/Sitemap/Test/Fixture/Sitemap.php | 109 --- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 10 +- .../app/Magento/Store/Test/Fixture/Store.php | 126 --- .../app/Magento/Store/Test/Fixture/Store.xml | 4 +- .../Magento/Store/Test/Fixture/StoreGroup.php | 96 -- .../Magento/Store/Test/Fixture/StoreGroup.xml | 6 +- .../Magento/Store/Test/Fixture/Website.php | 109 --- .../Magento/Store/Test/Fixture/Website.xml | 4 +- .../app/Magento/Tax/Test/Fixture/TaxClass.php | 78 -- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 6 +- .../app/Magento/Tax/Test/Fixture/TaxRate.php | 160 ---- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 12 +- .../app/Magento/Tax/Test/Fixture/TaxRule.php | 119 --- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 10 +- .../UrlRewrite/Test/Fixture/UrlRewrite.php | 118 --- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 6 +- .../User/Test/Fixture/AdminUserRole.php | 184 ---- .../User/Test/Fixture/AdminUserRole.xml | 8 +- .../app/Magento/User/Test/Fixture/User.php | 291 ------ .../app/Magento/User/Test/Fixture/User.xml | 16 +- .../Test/Fixture/User/CurrentPassword.php | 73 ++ 71 files changed, 616 insertions(+), 10985 deletions(-) delete mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php delete mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php delete mode 100755 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php delete mode 100644 dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php delete mode 100644 dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php delete mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php delete mode 100644 dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php delete mode 100644 dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php delete mode 100644 dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php delete mode 100644 dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php delete mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php delete mode 100644 dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php delete mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php delete mode 100755 dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php delete mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php delete mode 100644 dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php delete mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php delete mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php deleted file mode 100644 index a32966711b509..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php +++ /dev/null @@ -1,31 +0,0 @@ - 'catalogProductSimple::default::name', - ]; - - protected $query = [ - 'attribute_code' => 'query', - 'backend_type' => 'virtual', - 'source' => 'Magento\Backend\Test\Fixture\GlobalSearch\Query', - ]; - - public function getQuery() - { - return $this->getData('query'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index db8ecf1e8be5c..dd6bc8b4ef8a2 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Backend diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php deleted file mode 100644 index b93ae90772e8b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php +++ /dev/null @@ -1,902 +0,0 @@ - 'bundle', - 'create_url_params' => [ - 'type' => 'bundle', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'BundleProduct %isolation%', - 'sku_type' => 'Dynamic', - 'price_type' => 'Dynamic', - 'weight_type' => 'Dynamic', - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - ]; - - protected $country_of_manufacture = [ - 'attribute_code' => 'country_of_manufacture', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'product-details', - ]; - - protected $enable_googlecheckout = [ - 'attribute_code' => 'enable_googlecheckout', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $use_config_gift_message_available = [ - 'attribute_code' => 'use_config_gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'checkbox', - 'group' => 'autosettings', - ]; - - protected $group_price = [ - 'attribute_code' => 'group_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $minimal_price = [ - 'attribute_code' => 'minimal_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp = [ - 'attribute_code' => 'msrp', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp_display_actual_price_type = [ - 'attribute_code' => 'msrp_display_actual_price_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '4', - 'input' => 'select', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'container2', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'source' => 'Magento\Bundle\Test\Fixture\BundleProduct\Price', - 'group' => 'product-details', - ]; - - protected $price_from = [ - 'attribute_code' => 'price_from', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - ]; - - protected $price_to = [ - 'attribute_code' => 'price_to', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - ]; - - protected $price_type = [ - 'attribute_code' => 'price_type', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'checkbox', - 'group' => 'product-details', - ]; - - protected $price_view = [ - 'attribute_code' => 'price_view', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'advanced-pricing', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $use_config_manage_stock = [ - 'attribute_code' => 'use_config_manage_stock', - 'input' => 'checkbox', - 'group' => 'advanced-inventory', - ]; - - protected $manage_stock = [ - 'attribute_code' => 'manage_stock', - 'input' => 'select', - 'group' => 'advanced-inventory', - ]; - - protected $shipment_type = [ - 'attribute_code' => 'shipment_type', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'autosettings', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $sku_type = [ - 'attribute_code' => 'sku_type', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $weight_type = [ - 'attribute_code' => 'weight_type', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $weight = [ - 'attribute_code' => 'weight', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $special_price = [ - 'attribute_code' => 'special_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - ]; - - protected $special_from_date = [ - 'attribute_code' => 'special_from_date', - 'backend_type' => 'data', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Backend\Test\Fixture\Source\Date', - ]; - - protected $special_to_date = [ - 'attribute_code' => 'special_to_date', - 'backend_type' => 'data', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Backend\Test\Fixture\Source\Date', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Taxable Goods', - 'input' => 'select', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tier_price = [ - 'attribute_code' => 'tier_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '4', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $bundle_selections = [ - 'attribute_code' => 'bundle_selections', - 'backend_type' => 'virtual', - 'is_required' => '1', - 'group' => 'bundle', - 'source' => 'Magento\Bundle\Test\Fixture\BundleProduct\BundleSelections', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'is_required' => '1', - 'group' => null, - 'source' => 'Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData', - ]; - - protected $custom_options = [ - 'attribute_code' => 'custom_options', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'customer-options', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions', - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'virtual', - ]; - - protected $new_variations_attribute_set_id = [ - 'attribute_code' => 'new_variations_attribute_set_id', - ]; - - protected $affect_bundle_product_selection = [ - 'attribute_code' => 'affect_bundle_product_selection', - ]; - - protected $stock_data = [ - 'attribute_code' => 'stock_data', - 'group' => 'advanced-inventory', - ]; - - protected $category_id = [ - 'attribute_code' => 'category_id', - 'group' => 'product-details', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => ['Main Website'], - 'group' => 'websites', - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getCountryOfManufacture() - { - return $this->getData('country_of_manufacture'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getEnableGooglecheckout() - { - return $this->getData('enable_googlecheckout'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getMinimalPrice() - { - return $this->getData('minimal_price'); - } - - public function getMsrp() - { - return $this->getData('msrp'); - } - - public function getMsrpDisplayActualPriceType() - { - return $this->getData('msrp_display_actual_price_type'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getPriceFrom() - { - return $this->getData('price_from'); - } - - public function getPriceTo() - { - return $this->getData('price_to'); - } - - public function getPriceType() - { - return $this->getData('price_type'); - } - - public function getPriceView() - { - return $this->getData('price_view'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getShipmentType() - { - return $this->getData('shipment_type'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getSkuType() - { - return $this->getData('sku_type'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getSpecialFromDate() - { - return $this->getData('special_from_date'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getSpecialToDate() - { - return $this->getData('special_to_date'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getWeight() - { - return $this->getData('weight'); - } - - public function getWeightType() - { - return $this->getData('weight_type'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getBundleSelections() - { - return $this->getData('bundle_selections'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } - - public function getCustomOptions() - { - return $this->getData('custom_options'); - } - - public function getTypeId() - { - return $this->getData('type_id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 53f8a472f80a6..97b164bc4693d 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Bundle eav catalog_product @@ -27,7 +29,7 @@ category_ids static 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds @@ -36,49 +38,49 @@ country_of_manufacture varchar 0 - + select created_at static 1 - + text custom_design varchar 0 - + select custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea description text 0 - + textarea product-details @@ -93,14 +95,14 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select autosettings @@ -108,7 +110,7 @@ use_config_gift_message_available varchar 0 - + checkbox autosettings @@ -116,7 +118,7 @@ group_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions @@ -125,63 +127,63 @@ has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text media_gallery varchar 0 - + gallery meta_description varchar 0 - + textarea meta_keyword text 0 - + textarea meta_title varchar 0 - + text minimal_price decimal 0 - + price msrp decimal 0 - + price @@ -203,21 +205,21 @@ news_from_date datetime 0 - + date news_to_date datetime 0 - + date old_id int 0 - + text @@ -231,14 +233,14 @@ page_layout varchar 0 - + select price decimal 1 - + price Magento\Bundle\Test\Fixture\BundleProduct\Price product-details @@ -247,7 +249,7 @@ price_from decimal 1 - + price product-details @@ -255,7 +257,7 @@ price_to decimal 1 - + price product-details @@ -279,7 +281,7 @@ price_view int 1 - + select advanced-pricing @@ -295,7 +297,7 @@ required_options static 0 - + text @@ -312,7 +314,7 @@ shipment_type int 1 - + select product-details @@ -320,7 +322,7 @@ short_description text 0 - + textarea autosettings @@ -328,7 +330,7 @@ sku static 1 - + text product-details @@ -352,7 +354,7 @@ weight decimal 0 - + text product-details @@ -360,21 +362,21 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text special_price decimal 0 - + price advanced-pricing @@ -382,19 +384,19 @@ special_from_date data 0 - + price advanced-pricing - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date special_to_date data 0 - + price advanced-pricing - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date tax_class_id @@ -409,21 +411,21 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text tier_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions @@ -432,14 +434,14 @@ updated_at static 1 - + text url_key varchar 0 - + text search-engine-optimization @@ -447,7 +449,7 @@ url_path varchar 0 - + text @@ -504,8 +506,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php deleted file mode 100644 index 4a3c8f5da9ce7..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php +++ /dev/null @@ -1,118 +0,0 @@ - 'Default_attribute_set_%isolation%', - 'skeleton_set' => ['dataSet' => 'default'], - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $entity_type_id = [ - 'attribute_code' => 'entity_type_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $attribute_set_name = [ - 'attribute_code' => 'attribute_set_name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sort_order = [ - 'attribute_code' => 'sort_order', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $skeleton_set = [ - 'attribute_code' => 'skeleton_set', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet', - ]; - - protected $assigned_attributes = [ - 'attribute_code' => 'assigned_attributes', - 'backend_type' => 'virtual', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogAttributeSet\AssignedAttributes', - ]; - - protected $group = [ - 'attribute_code' => 'group', - 'backend_type' => 'virtual', - ]; - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getEntityTypeId() - { - return $this->getData('entity_type_id'); - } - - public function getAttributeSetName() - { - return $this->getData('attribute_set_name'); - } - - public function getSortOrder() - { - return $this->getData('sort_order'); - } - - public function getSkeletonSet() - { - return $this->getData('skeleton_set'); - } - - public function getAssignedAttributes() - { - return $this->getData('assigned_attributes'); - } - - public function getGroup() - { - return $this->getData('group'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 3143efd370ab0..b3f2fdcba99f5 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Catalog flat eav_attribute_set @@ -17,7 +19,7 @@ attribute_set_id smallint 1 - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php deleted file mode 100644 index 194323bceceff..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php +++ /dev/null @@ -1,580 +0,0 @@ - 'attribute_label%isolation%', - 'frontend_input' => 'Text Field', - 'is_required' => 'No', - ]; - - protected $attribute_id = [ - 'attribute_code' => 'attribute_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $entity_type_id = [ - 'attribute_code' => 'entity_type_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $attribute_code = [ - 'attribute_code' => 'attribute_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'advanced-properties', - ]; - - protected $attribute_model = [ - 'attribute_code' => 'attribute_model', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $backend_model = [ - 'attribute_code' => 'backend_model', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $backend_type = [ - 'attribute_code' => 'backend_type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'static', - 'input' => '', - ]; - - protected $backend_table = [ - 'attribute_code' => 'backend_table', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $frontend_model = [ - 'attribute_code' => 'frontend_model', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $frontend_input = [ - 'attribute_code' => 'frontend_input', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => 'select', - 'group' => 'properties', - ]; - - protected $frontend_label = [ - 'attribute_code' => 'frontend_label', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'properties', - ]; - - protected $manage_frontend_label = [ - 'attribute_code' => 'manage_frontend_label', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'manage-labels', - ]; - - protected $frontend_class = [ - 'attribute_code' => 'frontend_class', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $source_model = [ - 'attribute_code' => 'source_model', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_required = [ - 'attribute_code' => 'is_required', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => 'select', - 'group' => 'properties', - ]; - - protected $is_user_defined = [ - 'attribute_code' => 'is_user_defined', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_unique = [ - 'attribute_code' => 'is_unique', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'advanced-properties', - ]; - - protected $note = [ - 'attribute_code' => 'note', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $frontend_input_renderer = [ - 'attribute_code' => 'frontend_input_renderer', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_global = [ - 'attribute_code' => 'is_global', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - 'group' => 'advanced-properties', - ]; - - protected $is_visible = [ - 'attribute_code' => 'is_visible', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $is_searchable = [ - 'attribute_code' => 'is_searchable', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_filterable = [ - 'attribute_code' => 'is_filterable', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_comparable = [ - 'attribute_code' => 'is_comparable', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_visible_on_front = [ - 'attribute_code' => 'is_visible_on_front', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_html_allowed_on_front = [ - 'attribute_code' => 'is_html_allowed_on_front', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_used_for_price_rules = [ - 'attribute_code' => 'is_used_for_price_rules', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $is_filterable_in_search = [ - 'attribute_code' => 'is_filterable_in_search', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $used_in_product_listing = [ - 'attribute_code' => 'used_in_product_listing', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $used_for_sort_by = [ - 'attribute_code' => 'used_for_sort_by', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $apply_to = [ - 'attribute_code' => 'apply_to', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_visible_in_advanced_search = [ - 'attribute_code' => 'is_visible_in_advanced_search', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'frontend-properties', - ]; - - protected $position = [ - 'attribute_code' => 'position', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_wysiwyg_enabled = [ - 'attribute_code' => 'is_wysiwyg_enabled', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_used_for_promo_rules = [ - 'attribute_code' => 'is_used_for_promo_rules', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_configurable = [ - 'attribute_code' => 'is_configurable', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'advanced-properties', - ]; - - protected $search_weight = [ - 'attribute_code' => 'search_weight', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $options = [ - 'attribute_code' => 'options', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options', - ]; - - protected $default_value_text = [ - 'attribute_code' => 'default_value_text', - 'backend_type' => 'text', - 'group' => 'advanced-properties', - ]; - - protected $default_value_textarea = [ - 'attribute_code' => 'default_value_textarea', - 'backend_type' => 'text', - 'group' => 'advanced-properties', - ]; - - protected $default_value_date = [ - 'attribute_code' => 'default_value_date', - 'backend_type' => 'text', - 'group' => 'advanced-properties', - 'source' => 'Magento\Backend\Test\Fixture\Source\Date', - ]; - - protected $default_value_yesno = [ - 'attribute_code' => 'default_value_yesno', - 'backend_type' => 'text', - 'group' => 'advanced-properties', - ]; - - public function getDefaultValueText() - { - return $this->getData('default_value_text'); - } - - public function getDefaultValueTextarea() - { - return $this->getData('default_value_textarea'); - } - - public function getDefaultValueDate() - { - return $this->getData('default_value_date'); - } - - public function getDefaultValueYesno() - { - return $this->getData('default_value_yesno'); - } - - public function getAttributeId() - { - return $this->getData('attribute_id'); - } - - public function getEntityTypeId() - { - return $this->getData('entity_type_id'); - } - - public function getAttributeCode() - { - return $this->getData('attribute_code'); - } - - public function getAttributeModel() - { - return $this->getData('attribute_model'); - } - - public function getBackendModel() - { - return $this->getData('backend_model'); - } - - public function getBackendType() - { - return $this->getData('backend_type'); - } - - public function getBackendTable() - { - return $this->getData('backend_table'); - } - - public function getFrontendModel() - { - return $this->getData('frontend_model'); - } - - public function getFrontendInput() - { - return $this->getData('frontend_input'); - } - - public function getFrontendLabel() - { - return $this->getData('frontend_label'); - } - - public function getManageFrontendLabel() - { - return $this->getData('manage_frontend_label'); - } - - public function getFrontendClass() - { - return $this->getData('frontend_class'); - } - - public function getSourceModel() - { - return $this->getData('source_model'); - } - - public function getIsRequired() - { - return $this->getData('is_required'); - } - - public function getIsUserDefined() - { - return $this->getData('is_user_defined'); - } - - public function getIsUnique() - { - return $this->getData('is_unique'); - } - - public function getNote() - { - return $this->getData('note'); - } - - public function getFrontendInputRenderer() - { - return $this->getData('frontend_input_renderer'); - } - - public function getIsGlobal() - { - return $this->getData('is_global'); - } - - public function getIsVisible() - { - return $this->getData('is_visible'); - } - - public function getIsSearchable() - { - return $this->getData('is_searchable'); - } - - public function getIsFilterable() - { - return $this->getData('is_filterable'); - } - - public function getIsComparable() - { - return $this->getData('is_comparable'); - } - - public function getIsVisibleOnFront() - { - return $this->getData('is_visible_on_front'); - } - - public function getIsHtmlAllowedOnFront() - { - return $this->getData('is_html_allowed_on_front'); - } - - public function getIsUsedForPriceRules() - { - return $this->getData('is_used_for_price_rules'); - } - - public function getIsFilterableInSearch() - { - return $this->getData('is_filterable_in_search'); - } - - public function getUsedInProductListing() - { - return $this->getData('used_in_product_listing'); - } - - public function getUsedForSortBy() - { - return $this->getData('used_for_sort_by'); - } - - public function getApplyTo() - { - return $this->getData('apply_to'); - } - - public function getIsVisibleInAdvancedSearch() - { - return $this->getData('is_visible_in_advanced_search'); - } - - public function getPosition() - { - return $this->getData('position'); - } - - public function getIsWysiwygEnabled() - { - return $this->getData('is_wysiwyg_enabled'); - } - - public function getIsUsedForPromoRules() - { - return $this->getData('is_used_for_promo_rules'); - } - - public function getIsConfigurable() - { - return $this->getData('is_configurable'); - } - - public function getSearchWeight() - { - return $this->getData('search_weight'); - } - - public function getOptions() - { - return $this->getData('options'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index 31633cbb0f68e..1726d525669f9 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Catalog composite @@ -20,7 +22,7 @@ attribute_id smallint 1 - + @@ -34,7 +36,7 @@ attribute_code varchar - + advanced-properties @@ -42,14 +44,14 @@ attribute_model varchar - + backend_model varchar - + @@ -63,14 +65,14 @@ backend_table varchar - + frontend_model varchar - + @@ -93,7 +95,7 @@ manage_frontend_label varchar - + manage-labels @@ -101,14 +103,14 @@ frontend_class varchar - + source_model varchar - + @@ -138,14 +140,14 @@ note varchar - + frontend_input_renderer varchar - + @@ -239,7 +241,7 @@ apply_to varchar - + @@ -275,7 +277,7 @@ is_configurable smallint - + advanced-properties @@ -290,7 +292,7 @@ options smallint - + Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options @@ -308,7 +310,7 @@ default_value_date text advanced-properties - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date default_value_yesno diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php deleted file mode 100755 index e029235ecfb47..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php +++ /dev/null @@ -1,897 +0,0 @@ - 'simple', - 'create_url_params' => [ - 'type' => 'simple', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'Test simple product %isolation%', - 'sku' => 'test_simple_sku_%isolation%', - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100.00], - 'weight' => 12.0000, - 'quantity_and_stock_status' => [ - 'qty' => 10.0000, - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - ]; - - protected $color = [ - 'attribute_code' => 'color', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $country_of_manufacture = [ - 'attribute_code' => 'country_of_manufacture', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'product-details', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $group_price = [ - 'attribute_code' => 'group_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $manufacturer = [ - 'attribute_code' => 'manufacturer', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'text', - ]; - - protected $minimal_price = [ - 'attribute_code' => 'minimal_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp = [ - 'attribute_code' => 'msrp', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp_display_actual_price_type = [ - 'attribute_code' => 'msrp_display_actual_price_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'Use config', - 'input' => 'select', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'Block after Info Column', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Price', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'array', - 'is_required' => '0', - 'default_value' => '', - 'input' => '', - 'group' => 'product-details', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $special_from_date = [ - 'attribute_code' => 'special_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'autosettings', - ]; - - protected $special_price = [ - 'attribute_code' => 'special_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - ]; - - protected $special_to_date = [ - 'attribute_code' => 'special_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Product online', - 'input' => 'checkbox', - 'group' => 'product-details', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Taxable Goods', - 'input' => 'select', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tier_price = [ - 'attribute_code' => 'tier_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Catalog, Search', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $weight = [ - 'attribute_code' => 'weight', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'weight', - 'group' => 'product-details', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'virtual', - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'virtual', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId', - ]; - - protected $custom_attribute = [ - 'attribute_code' => 'custom_attribute', - 'backend_type' => 'virtual', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomAttribute', - ]; - - protected $custom_options = [ - 'attribute_code' => 'custom_options', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'customer-options', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => 'Main Website', - 'group' => 'websites', - ]; - - protected $is_returnable = [ - 'attribute_code' => 'is_returnable', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '2', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - 'source' => 'Magento\Backend\Test\Fixture\Source\Date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - 'source' => 'Magento\Backend\Test\Fixture\Source\Date', - ]; - - protected $stock_data = [ - 'attribute_code' => 'stock_data', - 'backend_type' => 'virtual', - 'group' => 'advanced-inventory' - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => null, - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData' - ]; - - protected $cross_sell_products = [ - 'attribute_code' => 'cross_sell_products', - 'backend_type' => 'virtual', - 'group' => 'crosssells', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts' - ]; - - protected $up_sell_products = [ - 'attribute_code' => 'up_sell_products', - 'backend_type' => 'virtual', - 'group' => 'upsells', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts' - ]; - - protected $related_products = [ - 'attribute_code' => 'related_products', - 'backend_type' => 'virtual', - 'group' => 'related-products', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts' - ]; - - protected $is_virtual = [ - 'attribute_code' => 'is_virtual', - 'backend_type' => 'virtual', - 'group' => 'product-details', - ]; - - protected $attributes = [ - 'attribute_code' => 'attributes', - 'backend_type' => 'virtual', - ]; - - protected $fpt = [ - 'attribute_code' => 'fpt', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Fpt' - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getColor() - { - return $this->getData('color'); - } - - public function getCountryOfManufacture() - { - return $this->getData('country_of_manufacture'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getManufacturer() - { - return $this->getData('manufacturer'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getMinimalPrice() - { - return $this->getData('minimal_price'); - } - - public function getMsrp() - { - return $this->getData('msrp'); - } - - public function getMsrpDisplayActualPriceType() - { - return $this->getData('msrp_display_actual_price_type'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getSpecialFromDate() - { - return $this->getData('special_from_date'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getSpecialToDate() - { - return $this->getData('special_to_date'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getWeight() - { - return $this->getData('weight'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getTypeId() - { - return $this->getData('type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getCustomAttribute() - { - return $this->getData('custom_attribute'); - } - - public function getCustomOptions() - { - return $this->getData('custom_options'); - } - - public function getWebsiteIds() - { - return $this->getData('website_ids'); - } - - public function getIsReturnable() - { - return $this->getData('is_returnable'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getStockData() - { - return $this->getData('stock_data'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } - - public function getCrossSellProducts() - { - return $this->getData('cross_sell_products'); - } - - public function getUpSellProducts() - { - return $this->getData('up_sell_products'); - } - - public function getRelatedProducts() - { - return $this->getData('related_products'); - } - - public function getIsVirtual() - { - return $this->getData('is_virtual'); - } - - public function getAttributes() - { - return $this->getData('attributes'); - } - - public function getFptData() - { - return $this->getData('fpt'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 04e0b1182f047..53e6fab28cb31 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Catalog eav catalog_product @@ -27,7 +29,7 @@ category_ids static 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds @@ -36,56 +38,56 @@ color int 0 - + select country_of_manufacture varchar 0 - + select created_at static 1 - + text custom_design varchar 0 - + select custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea description text 0 - + textarea product-details @@ -93,21 +95,21 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select group_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions @@ -116,42 +118,42 @@ has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text manufacturer int 0 - + select media_gallery varchar 0 - + gallery meta_description varchar 0 - + search-engine-optimization textarea @@ -159,7 +161,7 @@ meta_keyword text 0 - + search-engine-optimization textarea @@ -167,7 +169,7 @@ meta_title varchar 0 - + search-engine-optimization text @@ -175,14 +177,14 @@ minimal_price decimal 0 - + price msrp decimal 0 - + price @@ -204,7 +206,7 @@ old_id int 0 - + text @@ -218,7 +220,7 @@ page_layout varchar 0 - + select @@ -247,7 +249,7 @@ required_options static 0 - + text @@ -262,28 +264,28 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text special_from_date datetime 0 - + date short_description text 0 - + textarea autosettings @@ -291,7 +293,7 @@ special_price decimal 0 - + price advanced-pricing @@ -299,7 +301,7 @@ special_to_date datetime 0 - + date @@ -323,21 +325,21 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text tier_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions @@ -346,14 +348,14 @@ updated_at static 1 - + text url_key varchar 0 - + text search-engine-optimization @@ -361,7 +363,7 @@ url_path varchar 0 - + text @@ -431,17 +433,17 @@ news_from_date datetime 0 - + date - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date news_to_date datetime 0 - + date - Magento\Backend\Test\Fixture\Date + Magento\Backend\Test\Fixture\Source\Date stock_data @@ -485,7 +487,7 @@ fpt decimal 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Fpt diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php deleted file mode 100644 index 35fe6b9356a8a..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php +++ /dev/null @@ -1,793 +0,0 @@ - 'virtual', - 'create_url_params' => [ - 'type' => 'virtual', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'Test virtual product %isolation%', - 'sku' => 'sku_test_virtual_product_%isolation%', - 'price' => ['value' => 100.00], - 'quantity_and_stock_status' => [ - 'qty' => 10.0000, - 'is_in_stock' => 'In Stock', - ], - 'is_virtual' => 'Yes', - ]; - - protected $is_virtual = [ - 'attribute_code' => 'is_virtual', - 'backend_type' => 'virtual', - 'group' => 'product-details', - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - 'group' => 'product-details', - ]; - - protected $color = [ - 'attribute_code' => 'color', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $country_of_manufacture = [ - 'attribute_code' => 'country_of_manufacture', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'product-details', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $group_price = [ - 'attribute_code' => 'group_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $manufacturer = [ - 'attribute_code' => 'manufacturer', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'search-engine-optimization', - 'input' => 'text', - ]; - - protected $minimal_price = [ - 'attribute_code' => 'minimal_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp = [ - 'attribute_code' => 'msrp', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp_display_actual_price_type = [ - 'attribute_code' => 'msrp_display_actual_price_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'Use config', - 'input' => 'select', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'Block after Info Column', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Price', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'In Stock', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $special_from_date = [ - 'attribute_code' => 'special_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'autosettings', - ]; - - protected $special_price = [ - 'attribute_code' => 'special_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - ]; - - protected $special_to_date = [ - 'attribute_code' => 'special_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Product online', - 'input' => 'checkbox', - 'group' => 'product-details', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Taxable Goods', - 'input' => 'select', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tier_price = [ - 'attribute_code' => 'tier_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Catalog, Search', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $weight = [ - 'attribute_code' => 'weight', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'weight', - 'group' => 'product-details', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'virtual', - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'virtual', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId', - ]; - - protected $custom_options = [ - 'attribute_code' => 'custom_options', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'customer-options', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => ['Main Website'], - 'group' => 'websites', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => null, - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductVirtual\CheckoutData', - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getIsVirtual() - { - return $this->getData('is_virtual'); - } - - public function getColor() - { - return $this->getData('color'); - } - - public function getCountryOfManufacture() - { - return $this->getData('country_of_manufacture'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getManufacturer() - { - return $this->getData('manufacturer'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getMinimalPrice() - { - return $this->getData('minimal_price'); - } - - public function getMsrp() - { - return $this->getData('msrp'); - } - - public function getMsrpDisplayActualPriceType() - { - return $this->getData('msrp_display_actual_price_type'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getSpecialFromDate() - { - return $this->getData('special_from_date'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getSpecialToDate() - { - return $this->getData('special_to_date'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getWeight() - { - return $this->getData('weight'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getTypeId() - { - return $this->getData('type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getCustomOptions() - { - return $this->getData('custom_options'); - } - - public function getWebsiteIds() - { - return $this->getData('website_ids'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 3d82b9e11209b..34674a7a057ba 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Catalog eav catalog_product @@ -33,7 +35,7 @@ category_ids static 0 - + text Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds product-details @@ -42,56 +44,56 @@ color int 0 - + select country_of_manufacture varchar 0 - + select created_at static 1 - + text custom_design varchar 0 - + select custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea description text 0 - + textarea product-details @@ -99,21 +101,21 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select group_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions @@ -122,42 +124,42 @@ has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text manufacturer int 0 - + select media_gallery varchar 0 - + gallery meta_description varchar 0 - + search-engine-optimization textarea @@ -165,7 +167,7 @@ meta_keyword text 0 - + search-engine-optimization textarea @@ -173,7 +175,7 @@ meta_title varchar 0 - + search-engine-optimization text @@ -181,14 +183,14 @@ minimal_price decimal 0 - + price msrp decimal 0 - + price @@ -210,21 +212,21 @@ news_from_date datetime 0 - + date news_to_date datetime 0 - + date old_id int 0 - + text @@ -238,7 +240,7 @@ page_layout varchar 0 - + select @@ -267,7 +269,7 @@ required_options static 0 - + text @@ -282,28 +284,28 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text special_from_date datetime 0 - + date short_description text 0 - + textarea autosettings @@ -311,7 +313,7 @@ special_price decimal 0 - + price advanced-pricing @@ -319,7 +321,7 @@ special_to_date datetime 0 - + date @@ -343,21 +345,21 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text tier_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions @@ -366,14 +368,14 @@ updated_at static 1 - + text url_key varchar 0 - + text search-engine-optimization @@ -381,7 +383,7 @@ url_path varchar 0 - + text @@ -396,7 +398,7 @@ weight decimal 0 - + weight product-details diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index 46d0583d13ed1..6e55586ff53dd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Catalog eav catalog_category_entity @@ -17,7 +19,7 @@ entity_id int 1 - + @@ -38,7 +40,7 @@ description text 0 - + textarea @@ -54,14 +56,14 @@ created_at timestamp - + updated_at timestamp - + @@ -76,7 +78,7 @@ position int - + @@ -90,14 +92,14 @@ children_count int - + available_product_listing_config int - + display_setting checkbox @@ -105,7 +107,7 @@ available_sort_by varchar 0 - + display_setting multiselect @@ -113,7 +115,7 @@ default_product_listing_config varchar 0 - + display_setting checkbox @@ -121,7 +123,7 @@ default_sort_by varchar 0 - + display_setting select @@ -129,7 +131,7 @@ meta_title text - + general_information diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php deleted file mode 100644 index 910c5a91f0bed..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php +++ /dev/null @@ -1,243 +0,0 @@ - 'CatalogPriceRule %isolation%', - 'description' => 'Catalog Price Rule Description', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN'], - 'simple_action' => 'By Percentage of the Original Price', - 'discount_amount' => '50', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'rule_information', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'default_value' => '', - 'input' => 'text', - 'group' => 'rule_information', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'rule_information', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'multiselect', - 'group' => 'rule_information', - ]; - - protected $customer_group_ids = [ - 'attribute_code' => 'customer_group_ids', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'multiselect', - 'group' => 'rule_information', - ]; - - protected $from_date = [ - 'attribute_code' => 'from_date', - 'backend_type' => 'date', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'rule_information', - ]; - - protected $to_date = [ - 'attribute_code' => 'to_date', - 'backend_type' => 'date', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'rule_information', - ]; - - protected $simple_action = [ - 'attribute_code' => 'simple_action', - 'backend_type' => 'smallint', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - 'group' => 'actions', - ]; - - protected $discount_amount = [ - 'attribute_code' => 'discount_amount', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'actions', - ]; - - protected $condition_type = [ - 'attribute_code' => 'condition_type', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'conditions', - 'input' => 'select', - ]; - - protected $condition_value = [ - 'attribute_code' => 'condition_value', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'conditions', - ]; - - protected $rule = [ - 'attribute_code' => 'rule', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'conditions', - ]; - - protected $conditions = [ - 'attribute_code' => 'conditions', - 'backend_type' => 'virtual', - 'group' => 'conditions', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $sort_order = [ - 'attribute_code' => 'sort_order', - 'default_value' => '', - 'input' => 'text', - 'group' => 'rule_information', - ]; - - protected $stop_rules_processing = [ - 'attribute_code' => 'stop_rules_processing', - 'default_value' => '', - 'input' => 'select', - 'group' => 'rule_information', - ]; - - public function getName() - { - return $this->getData('name'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getWebsiteIds() - { - return $this->getData('website_ids'); - } - - public function getCustomerGroupIds() - { - return $this->getData('customer_group_ids'); - } - - public function getFromDate() - { - return $this->getData('from_date'); - } - - public function getToDate() - { - return $this->getData('to_date'); - } - - public function getSimpleAction() - { - return $this->getData('simple_action'); - } - - public function getDiscountAmount() - { - return $this->getData('discount_amount'); - } - - public function getConditionType() - { - return $this->getData('condition_type'); - } - - public function getConditionValue() - { - return $this->getData('condition_value'); - } - - public function getRule() - { - return $this->getData('rule'); - } - - public function getConditions() - { - return $this->getData('conditions'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getSortOrder() - { - return $this->getData('sort_order'); - } - - public function getStopRulesProcessing() - { - return $this->getData('stop_rules_processing'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index ec0d4dca173eb..cb3897e8aaad3 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_CatalogRule eav catalog_rule @@ -59,7 +61,7 @@ from_date date 0 - + text rule_information @@ -67,7 +69,7 @@ to_date date 0 - + text rule_information @@ -117,13 +119,13 @@ sort_order - + text rule_information stop_rules_processing - + select rule_information diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php deleted file mode 100644 index ce372d1c8ad58..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php +++ /dev/null @@ -1,175 +0,0 @@ - null, - 'is_active' => null, - 'updated_at' => null, - ]; - - protected $query_id = [ - 'attribute_code' => 'query_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $query_text = [ - 'attribute_code' => 'query_text', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'source' => 'Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\QueryText', - ]; - - protected $num_results = [ - 'attribute_code' => 'num_results', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $popularity = [ - 'attribute_code' => 'popularity', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $redirect = [ - 'attribute_code' => 'redirect', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $synonym_for = [ - 'attribute_code' => 'synonym_for', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $display_in_terms = [ - 'attribute_code' => 'display_in_terms', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $is_processed = [ - 'attribute_code' => 'is_processed', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => 'CURRENT_TIMESTAMP', - 'input' => '', - ]; - - public function getQueryId() - { - return $this->getData('query_id'); - } - - public function getQueryText() - { - return $this->getData('query_text'); - } - - public function getNumResults() - { - return $this->getData('num_results'); - } - - public function getPopularity() - { - return $this->getData('popularity'); - } - - public function getRedirect() - { - return $this->getData('redirect'); - } - - public function getSynonymFor() - { - return $this->getData('synonym_for'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getDisplayInTerms() - { - return $this->getData('display_in_terms'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getIsProcessed() - { - return $this->getData('is_processed'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index 85c6e9b163bc1..acbb5b459c393 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_CatalogSearch flat search_query @@ -17,14 +19,14 @@ query_id int 1 - + query_text varchar - + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\QueryText @@ -46,14 +48,14 @@ redirect varchar - + synonym_for varchar - + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php deleted file mode 100644 index 4a2db34cc9c13..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php +++ /dev/null @@ -1,717 +0,0 @@ - 'entity_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => 'CURRENT_TIMESTAMP', - 'input' => '', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '0000-00-00 00:00:00', - 'input' => '', - ]; - - protected $converted_at = [ - 'attribute_code' => 'converted_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $is_virtual = [ - 'attribute_code' => 'is_virtual', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_multi_shipping = [ - 'attribute_code' => 'is_multi_shipping', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $items = [ - 'attribute_code' => 'items', - 'backend_type' => 'virtual', - 'source' => 'Magento\Checkout\Test\Fixture\Cart\Items', - ]; - - protected $items_count = [ - 'attribute_code' => 'items_count', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $items_qty = [ - 'attribute_code' => 'items_qty', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '0.0000', - 'input' => '', - ]; - - protected $orig_order_id = [ - 'attribute_code' => 'orig_order_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $store_to_base_rate = [ - 'attribute_code' => 'store_to_base_rate', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '0.0000', - 'input' => '', - ]; - - protected $store_to_quote_rate = [ - 'attribute_code' => 'store_to_quote_rate', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '0.0000', - 'input' => '', - ]; - - protected $base_currency_code = [ - 'attribute_code' => 'base_currency_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_currency_code = [ - 'attribute_code' => 'store_currency_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $quote_currency_code = [ - 'attribute_code' => 'quote_currency_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $grand_total = [ - 'attribute_code' => 'grand_total', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '0.0000', - 'input' => '', - ]; - - protected $base_grand_total = [ - 'attribute_code' => 'base_grand_total', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '0.0000', - 'input' => '', - ]; - - protected $checkout_method = [ - 'attribute_code' => 'checkout_method', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_id = [ - 'attribute_code' => 'customer_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $customer_tax_class_id = [ - 'attribute_code' => 'customer_tax_class_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $customer_group_id = [ - 'attribute_code' => 'customer_group_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $customer_email = [ - 'attribute_code' => 'customer_email', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_prefix = [ - 'attribute_code' => 'customer_prefix', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_firstname = [ - 'attribute_code' => 'customer_firstname', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_middlename = [ - 'attribute_code' => 'customer_middlename', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_lastname = [ - 'attribute_code' => 'customer_lastname', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_suffix = [ - 'attribute_code' => 'customer_suffix', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_dob = [ - 'attribute_code' => 'customer_dob', - 'backend_type' => 'datetime', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_note = [ - 'attribute_code' => 'customer_note', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_note_notify = [ - 'attribute_code' => 'customer_note_notify', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $customer_is_guest = [ - 'attribute_code' => 'customer_is_guest', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $remote_ip = [ - 'attribute_code' => 'remote_ip', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $applied_rule_ids = [ - 'attribute_code' => 'applied_rule_ids', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $reserved_order_id = [ - 'attribute_code' => 'reserved_order_id', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $password_hash = [ - 'attribute_code' => 'password_hash', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $coupon_code = [ - 'attribute_code' => 'coupon_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $global_currency_code = [ - 'attribute_code' => 'global_currency_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $base_to_global_rate = [ - 'attribute_code' => 'base_to_global_rate', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $base_to_quote_rate = [ - 'attribute_code' => 'base_to_quote_rate', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_taxvat = [ - 'attribute_code' => 'customer_taxvat', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_gender = [ - 'attribute_code' => 'customer_gender', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $subtotal = [ - 'attribute_code' => 'subtotal', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $base_subtotal = [ - 'attribute_code' => 'base_subtotal', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $subtotal_with_discount = [ - 'attribute_code' => 'subtotal_with_discount', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $base_subtotal_with_discount = [ - 'attribute_code' => 'base_subtotal_with_discount', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_changed = [ - 'attribute_code' => 'is_changed', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $trigger_recollect = [ - 'attribute_code' => 'trigger_recollect', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $ext_shipping_info = [ - 'attribute_code' => 'ext_shipping_info', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $is_persistent = [ - 'attribute_code' => 'is_persistent', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $gift_message_id = [ - 'attribute_code' => 'gift_message_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => '', - 'source' => 'Magento\Checkout\Test\Fixture\Cart\CheckoutData', - ]; - - public function getEntityId() - { - return $this->getData('entity_id'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getConvertedAt() - { - return $this->getData('converted_at'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getIsVirtual() - { - return $this->getData('is_virtual'); - } - - public function getIsMultiShipping() - { - return $this->getData('is_multi_shipping'); - } - - public function getItems() - { - return $this->getData('items'); - } - - public function getItemsCount() - { - return $this->getData('items_count'); - } - - public function getItemsQty() - { - return $this->getData('items_qty'); - } - - public function getOrigOrderId() - { - return $this->getData('orig_order_id'); - } - - public function getStoreToBaseRate() - { - return $this->getData('store_to_base_rate'); - } - - public function getStoreToQuoteRate() - { - return $this->getData('store_to_quote_rate'); - } - - public function getBaseCurrencyCode() - { - return $this->getData('base_currency_code'); - } - - public function getStoreCurrencyCode() - { - return $this->getData('store_currency_code'); - } - - public function getQuoteCurrencyCode() - { - return $this->getData('quote_currency_code'); - } - - public function getGrandTotal() - { - return $this->getData('grand_total'); - } - - public function getBaseGrandTotal() - { - return $this->getData('base_grand_total'); - } - - public function getCheckoutMethod() - { - return $this->getData('checkout_method'); - } - - public function getCustomerId() - { - return $this->getData('customer_id'); - } - - public function getCustomerTaxClassId() - { - return $this->getData('customer_tax_class_id'); - } - - public function getCustomerGroupId() - { - return $this->getData('customer_group_id'); - } - - public function getCustomerEmail() - { - return $this->getData('customer_email'); - } - - public function getCustomerPrefix() - { - return $this->getData('customer_prefix'); - } - - public function getCustomerFirstname() - { - return $this->getData('customer_firstname'); - } - - public function getCustomerMiddlename() - { - return $this->getData('customer_middlename'); - } - - public function getCustomerLastname() - { - return $this->getData('customer_lastname'); - } - - public function getCustomerSuffix() - { - return $this->getData('customer_suffix'); - } - - public function getCustomerDob() - { - return $this->getData('customer_dob'); - } - - public function getCustomerNote() - { - return $this->getData('customer_note'); - } - - public function getCustomerNoteNotify() - { - return $this->getData('customer_note_notify'); - } - - public function getCustomerIsGuest() - { - return $this->getData('customer_is_guest'); - } - - public function getRemoteIp() - { - return $this->getData('remote_ip'); - } - - public function getAppliedRuleIds() - { - return $this->getData('applied_rule_ids'); - } - - public function getReservedOrderId() - { - return $this->getData('reserved_order_id'); - } - - public function getPasswordHash() - { - return $this->getData('password_hash'); - } - - public function getCouponCode() - { - return $this->getData('coupon_code'); - } - - public function getGlobalCurrencyCode() - { - return $this->getData('global_currency_code'); - } - - public function getBaseToGlobalRate() - { - return $this->getData('base_to_global_rate'); - } - - public function getBaseToQuoteRate() - { - return $this->getData('base_to_quote_rate'); - } - - public function getCustomerTaxvat() - { - return $this->getData('customer_taxvat'); - } - - public function getCustomerGender() - { - return $this->getData('customer_gender'); - } - - public function getSubtotal() - { - return $this->getData('subtotal'); - } - - public function getBaseSubtotal() - { - return $this->getData('base_subtotal'); - } - - public function getSubtotalWithDiscount() - { - return $this->getData('subtotal_with_discount'); - } - - public function getBaseSubtotalWithDiscount() - { - return $this->getData('base_subtotal_with_discount'); - } - - public function getIsChanged() - { - return $this->getData('is_changed'); - } - - public function getTriggerRecollect() - { - return $this->getData('trigger_recollect'); - } - - public function getExtShippingInfo() - { - return $this->getData('ext_shipping_info'); - } - - public function getIsPersistent() - { - return $this->getData('is_persistent'); - } - - public function getGiftMessageId() - { - return $this->getData('gift_message_id'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index f594e23dd64e8..9bd75b5d6e1fb 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Checkout flat sales_quote @@ -17,7 +19,7 @@ entity_id int 1 - + @@ -45,7 +47,7 @@ converted_at timestamp - + @@ -113,21 +115,21 @@ base_currency_code varchar - + store_currency_code varchar - + quote_currency_code varchar - + @@ -148,7 +150,7 @@ checkout_method varchar - + @@ -176,56 +178,56 @@ customer_email varchar - + customer_prefix varchar - + customer_firstname varchar - + customer_middlename varchar - + customer_lastname varchar - + customer_suffix varchar - + customer_dob datetime - + customer_note varchar - + @@ -246,105 +248,105 @@ remote_ip varchar - + applied_rule_ids varchar - + reserved_order_id varchar - + password_hash varchar - + coupon_code varchar - + global_currency_code varchar - + base_to_global_rate decimal - + base_to_quote_rate decimal - + customer_taxvat varchar - + customer_gender varchar - + subtotal decimal - + base_subtotal decimal - + subtotal_with_discount decimal - + base_subtotal_with_discount decimal - + is_changed int - + @@ -358,7 +360,7 @@ ext_shipping_info text - + @@ -372,7 +374,7 @@ gift_message_id int - + diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php deleted file mode 100644 index a8eea04e5ad2e..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php +++ /dev/null @@ -1,858 +0,0 @@ - 'configurable', - 'create_url_params' => [ - 'type' => 'configurable', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'Configurable Product %isolation%', - 'sku' => 'sku_configurable_product_%isolation%', - 'type_id' => 'configurable', - 'attribute_set_id' => ['dataSet' => 'default'], - 'website_ids' => ['Main Website'], - 'price' => ['value' => 100.00], - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'default'], - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - ]; - - protected $color = [ - 'attribute_code' => 'color', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $country_of_manufacture = [ - 'attribute_code' => 'country_of_manufacture', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'product-details', - ]; - - protected $enable_googlecheckout = [ - 'attribute_code' => 'enable_googlecheckout', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'No', - 'input' => 'select', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $group_price = [ - 'attribute_code' => 'group_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $manufacturer = [ - 'attribute_code' => 'manufacturer', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $minimal_price = [ - 'attribute_code' => 'minimal_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp = [ - 'attribute_code' => 'msrp', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp_display_actual_price_type = [ - 'attribute_code' => 'msrp_display_actual_price_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Price', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'autosettings', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $special_from_date = [ - 'attribute_code' => 'special_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $special_price = [ - 'attribute_code' => 'special_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - 'group' => 'advanced-pricing', - ]; - - protected $special_to_date = [ - 'attribute_code' => 'special_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Product online', - 'input' => 'checkbox', - 'group' => 'product-details', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Taxable Goods', - 'input' => 'select', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tier_price = [ - 'attribute_code' => 'tier_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => 'Catalog, Search', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $weight = [ - 'attribute_code' => 'weight', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'weight', - 'group' => 'product-details', - ]; - - protected $is_virtual = [ - 'attribute_code' => 'is_virtual', - 'backend_type' => 'virtual', - 'group' => 'product-details', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'virtual', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId', - ]; - - protected $attribute_set_name = [ - 'attribute_code' => 'attribute_set_name', - 'backend_type' => 'virtual', - 'group' => 'variations', - ]; - - protected $affected_attribute_set = [ - 'attribute_code' => 'affected_attribute_set', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $custom_options = [ - 'attribute_code' => 'custom_options', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'customer-options', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions', - ]; - - protected $configurable_attributes_data = [ - 'attribute_code' => 'configurable_attributes_data', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'input' => 'variations', - 'group' => 'variations', - 'source' => 'Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => ['Main Website'], - 'group' => 'websites', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => null, - 'source' => 'Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData', - ]; - - protected $up_sell_products = [ - 'attribute_code' => 'up_sell_products', - 'backend_type' => 'virtual', - 'group' => 'upsells', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts', - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getColor() - { - return $this->getData('color'); - } - - public function getCountryOfManufacture() - { - return $this->getData('country_of_manufacture'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getEnableGooglecheckout() - { - return $this->getData('enable_googlecheckout'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getManufacturer() - { - return $this->getData('manufacturer'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getMinimalPrice() - { - return $this->getData('minimal_price'); - } - - public function getMsrp() - { - return $this->getData('msrp'); - } - - public function getMsrpDisplayActualPriceType() - { - return $this->getData('msrp_display_actual_price_type'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getSpecialFromDate() - { - return $this->getData('special_from_date'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getSpecialToDate() - { - return $this->getData('special_to_date'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getWeight() - { - return $this->getData('weight'); - } - - public function getIsVirtual() - { - return $this->getData('is_virtual'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getTypeId() - { - return $this->getData('type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getCustomOptions() - { - return $this->getData('custom_options'); - } - - public function getAttributeSetName() - { - return $this->getData('attribute_set_name'); - } - - public function getAffectedAttributeSet() - { - return $this->getData('affected_attribute_set'); - } - - public function getConfigurableAttributesData() - { - return $this->getData('configurable_attributes_data'); - } - - public function getWebsiteIds() - { - return $this->getData('website_ids'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } - - public function getUpSellProducts() - { - return $this->getData('up_sell_products'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index e0cd4a069cba1..fe461f2ab4b2c 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_ConfigurableProduct eav catalog_product @@ -27,7 +29,7 @@ category_ids static 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds @@ -36,56 +38,56 @@ color int 0 - + select country_of_manufacture varchar 0 - + select created_at static 1 - + text custom_design varchar 0 - + select custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea description text 0 - + textarea product-details @@ -100,21 +102,21 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select group_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions @@ -123,77 +125,77 @@ has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text manufacturer int 0 - + select media_gallery varchar 0 - + gallery meta_description varchar 0 - + textarea meta_keyword text 0 - + textarea meta_title varchar 0 - + text minimal_price decimal 0 - + price msrp decimal 0 - + price msrp_display_actual_price_type varchar 0 - + select @@ -208,35 +210,35 @@ news_from_date datetime 0 - + date news_to_date datetime 0 - + date old_id int 0 - + text options_container varchar 0 - + select page_layout varchar 0 - + select @@ -264,14 +266,14 @@ required_options static 0 - + text short_description text 0 - + textarea autosettings @@ -287,28 +289,28 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text special_from_date datetime 0 - + date special_price decimal 0 - + price advanced-pricing @@ -316,7 +318,7 @@ special_to_date datetime 0 - + date @@ -340,21 +342,21 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text tier_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions @@ -363,7 +365,7 @@ updated_at static 1 - + text @@ -378,7 +380,7 @@ url_path varchar 0 - + text diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php deleted file mode 100644 index ef5afdf6641f2..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php +++ /dev/null @@ -1,104 +0,0 @@ - 'section', - 'backend_type' => 'virtual', - ]; - - protected $config_id = [ - 'attribute_code' => 'config_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $scope = [ - 'attribute_code' => 'scope', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'default', - 'input' => '', - ]; - - protected $scope_id = [ - 'attribute_code' => 'scope_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $path = [ - 'attribute_code' => 'path', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'general', - 'input' => '', - ]; - - protected $value = [ - 'attribute_code' => 'value', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - public function getSection() - { - return $this->getData('section'); - } - - public function getConfigId() - { - return $this->getData('config_id'); - } - - public function getScope() - { - return $this->getData('scope'); - } - - public function getScopeId() - { - return $this->getData('scope_id'); - } - - public function getPath() - { - return $this->getData('path'); - } - - public function getValue() - { - return $this->getData('value'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index ee5db8beddee6..c4b3522b80917 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Core flat core_config_data @@ -13,44 +15,44 @@ Magento\Core\Test\Repository\ConfigData Magento\Core\Test\Handler\ConfigData\ConfigDataInterface - + section virtual - + config_id int 1 - - + + - + scope varchar default - + - + scope_id int 0 - + - + path varchar general - + - + value text - - + + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php deleted file mode 100644 index 8671a384d5ff1..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php +++ /dev/null @@ -1,129 +0,0 @@ - 'variableCode%isolation%', - 'name' => 'variableName%isolation%', - 'html_value' => "

html_value

", - 'plain_value' => 'plain_value', - ]; - - protected $variable_id = [ - 'attribute_code' => 'variable_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $value_id = [ - 'attribute_code' => 'value_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $plain_value = [ - 'attribute_code' => 'plain_value', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $html_value = [ - 'attribute_code' => 'html_value', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $use_default_value = [ - 'attribute_code' => 'use_default_value', - 'backend_type' => 'virtual', - 'input' => 'select', - ]; - - public function getVariableId() - { - return $this->getData('variable_id'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getValueId() - { - return $this->getData('value_id'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getPlainValue() - { - return $this->getData('plain_value'); - } - - public function getHtmlValue() - { - return $this->getData('html_value'); - } - - public function getUseDefaultValue() - { - return $this->getData('use_default_value'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 7b05125724249..0a99089b8dec3 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Core composite @@ -40,7 +42,7 @@ value_id int 1 - + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php deleted file mode 100644 index c021f8acfa48f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php +++ /dev/null @@ -1,326 +0,0 @@ - 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - ]; - - protected $city = [ - 'attribute_code' => 'city', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $default_billing = [ - 'attribute_code' => 'default_billing', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'checkbox', - ]; - - protected $default_shipping = [ - 'attribute_code' => 'default_shipping', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'checkbox', - ]; - - protected $company = [ - 'attribute_code' => 'company', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $country_id = [ - 'attribute_code' => 'country_id', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $fax = [ - 'attribute_code' => 'fax', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $firstname = [ - 'attribute_code' => 'firstname', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $lastname = [ - 'attribute_code' => 'lastname', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $email = [ - 'attribute_code' => 'email', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $middlename = [ - 'attribute_code' => 'middlename', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $postcode = [ - 'attribute_code' => 'postcode', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $prefix = [ - 'attribute_code' => 'prefix', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $region = [ - 'attribute_code' => 'region', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $region_id = [ - 'attribute_code' => 'region_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'hidden', - ]; - - protected $street = [ - 'attribute_code' => 'street', - 'backend_type' => 'text', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'multiline', - ]; - - protected $suffix = [ - 'attribute_code' => 'suffix', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $telephone = [ - 'attribute_code' => 'telephone', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $vat_id = [ - 'attribute_code' => 'vat_id', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $vat_is_valid = [ - 'attribute_code' => 'vat_is_valid', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $vat_request_date = [ - 'attribute_code' => 'vat_request_date', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $vat_request_id = [ - 'attribute_code' => 'vat_request_id', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $vat_request_success = [ - 'attribute_code' => 'vat_request_success', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - public function getCity() - { - return $this->getData('city'); - } - - public function getDefaultShipping() - { - return $this->getData('default_shipping'); - } - - public function getDefaultBilling() - { - return $this->getData('default_billing'); - } - - public function getEmail() - { - return $this->getData('email'); - } - - public function getCompany() - { - return $this->getData('company'); - } - - public function getCountryId() - { - return $this->getData('country_id'); - } - - public function getFax() - { - return $this->getData('fax'); - } - - public function getFirstname() - { - return $this->getData('firstname'); - } - - public function getLastname() - { - return $this->getData('lastname'); - } - - public function getMiddlename() - { - return $this->getData('middlename'); - } - - public function getPostcode() - { - return $this->getData('postcode'); - } - - public function getPrefix() - { - return $this->getData('prefix'); - } - - public function getRegion() - { - return $this->getData('region'); - } - - public function getRegionId() - { - return $this->getData('region_id'); - } - - public function getStreet() - { - return $this->getData('street'); - } - - public function getSuffix() - { - return $this->getData('suffix'); - } - - public function getTelephone() - { - return $this->getData('telephone'); - } - - public function getVatId() - { - return $this->getData('vat_id'); - } - - public function getVatIsValid() - { - return $this->getData('vat_is_valid'); - } - - public function getVatRequestDate() - { - return $this->getData('vat_request_date'); - } - - public function getVatRequestId() - { - return $this->getData('vat_request_id'); - } - - public function getVatRequestSuccess() - { - return $this->getData('vat_request_success'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index 58e44ed9021f4..04169b45e2d43 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Customer eav customer_address @@ -24,14 +26,14 @@ default_billing varchar 1 - + checkbox default_shipping varchar 1 - + checkbox @@ -52,7 +54,7 @@ fax varchar 0 - + text @@ -80,7 +82,7 @@ middlename varchar 0 - + text @@ -94,14 +96,14 @@ prefix varchar 0 - + text region varchar 0 - + text @@ -122,7 +124,7 @@ suffix varchar 0 - + text @@ -136,35 +138,35 @@ vat_id varchar 0 - + text vat_is_valid int 0 - + text vat_request_date varchar 0 - + text vat_request_id varchar 0 - + text vat_request_success int 0 - + text diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php deleted file mode 100644 index 8367374caf1c0..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php +++ /dev/null @@ -1,70 +0,0 @@ - 'customer_code_%isolation%', - 'tax_class_id' => ['dataSet' => 'customer_tax_class'], - ]; - - protected $customer_group_code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'source' => 'Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds', - ]; - - protected $customer_group_id = [ - 'attribute_code' => 'customer_group_id', - 'backend_type' => 'virtual', - ]; - - public function getCustomerGroupCode() - { - return $this->getData('customer_group_code'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getCustomerGroupId() - { - return $this->getData('customer_group_id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index fa085e9ef0c80..110b39a5e7a8f 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Customer flat customer_group diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php deleted file mode 100644 index 6a662d177f228..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php +++ /dev/null @@ -1,403 +0,0 @@ - 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - ]; - - protected $address = [ - 'attribute_code' => 'address', - 'backend_type' => 'virtual', - 'source' => 'Magento\Customer\Test\Fixture\CustomerInjectable\Address', - ]; - - protected $confirmation = [ - 'attribute_code' => 'confirmation', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $created_in = [ - 'attribute_code' => 'created_in', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $default_billing = [ - 'attribute_code' => 'default_billing', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $default_shipping = [ - 'attribute_code' => 'default_shipping', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $disable_auto_group_change = [ - 'attribute_code' => 'disable_auto_group_change', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'boolean', - 'group' => 'account_information', - ]; - - protected $dob = [ - 'attribute_code' => 'dob', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - 'group' => 'account_information', - ]; - - protected $email = [ - 'attribute_code' => 'email', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $firstname = [ - 'attribute_code' => 'firstname', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $gender = [ - 'attribute_code' => 'gender', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - 'group' => 'account_information', - ]; - - protected $group_id = [ - 'attribute_code' => 'group_id', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'account_information', - 'source' => 'Magento\Customer\Test\Fixture\CustomerInjectable\GroupId', - ]; - - protected $lastname = [ - 'attribute_code' => 'lastname', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $middlename = [ - 'attribute_code' => 'middlename', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $password_hash = [ - 'attribute_code' => 'password_hash', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'hidden', - ]; - - protected $prefix = [ - 'attribute_code' => 'prefix', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $rp_token = [ - 'attribute_code' => 'rp_token', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'hidden', - ]; - - protected $rp_token_created_at = [ - 'attribute_code' => 'rp_token_created_at', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'account_information', - ]; - - protected $suffix = [ - 'attribute_code' => 'suffix', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $taxvat = [ - 'attribute_code' => 'taxvat', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'account_information', - ]; - - protected $website_id = [ - 'attribute_code' => 'website_id', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'select', - 'group' => 'account_information', - ]; - - protected $amount_delta = [ - 'attribute_code' => 'amount_delta', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'store_credit', - ]; - - protected $is_subscribed = [ - 'attribute_code' => 'is_subscribed', - 'backend_type' => 'virtual', - ]; - - protected $password = [ - 'attribute_code' => 'password', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $password_confirmation = [ - 'attribute_code' => 'password_confirmation', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $current_password = [ - 'attribute_code' => 'current_password', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - public function getId() - { - return $this->getData('id'); - } - - public function getAddress() - { - return $this->getData('address'); - } - - public function getConfirmation() - { - return $this->getData('confirmation'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCreatedIn() - { - return $this->getData('created_in'); - } - - public function getDefaultBilling() - { - return $this->getData('default_billing'); - } - - public function getDefaultShipping() - { - return $this->getData('default_shipping'); - } - - public function getDisableAutoGroupChange() - { - return $this->getData('disable_auto_group_change'); - } - - public function getDob() - { - return $this->getData('dob'); - } - - public function getEmail() - { - return $this->getData('email'); - } - - public function getFirstname() - { - return $this->getData('firstname'); - } - - public function getGender() - { - return $this->getData('gender'); - } - - public function getGroupId() - { - return $this->getData('group_id'); - } - - public function getLastname() - { - return $this->getData('lastname'); - } - - public function getMiddlename() - { - return $this->getData('middlename'); - } - - public function getPasswordHash() - { - return $this->getData('password_hash'); - } - - public function getAmountDelta() - { - return $this->getData('amount_delta'); - } - - public function getPrefix() - { - return $this->getData('prefix'); - } - - public function getRpToken() - { - return $this->getData('rp_token'); - } - - public function getRpTokenCreatedAt() - { - return $this->getData('rp_token_created_at'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getSuffix() - { - return $this->getData('suffix'); - } - - public function getTaxvat() - { - return $this->getData('taxvat'); - } - - public function getWebsiteId() - { - return $this->getData('website_id'); - } - - public function getIsSubscribed() - { - return $this->getData('is_subscribed'); - } - - public function getPassword() - { - return $this->getData('password'); - } - - public function getPasswordConfirmation() - { - return $this->getData('password_confirmation'); - } - - public function getCurrentPassword() - { - return $this->getData('current_password'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index a727267dcaa2d..3271878135468 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Customer eav customer @@ -23,7 +25,7 @@ confirmation varchar 0 - + text @@ -35,14 +37,14 @@ created_at static 0 - + date created_in varchar 0 - + text account_information @@ -50,21 +52,21 @@ default_billing int 0 - + text default_shipping int 0 - + text disable_auto_group_change static 0 - + boolean account_information @@ -72,7 +74,7 @@ dob datetime 0 - + date account_information @@ -96,7 +98,7 @@ gender int 0 - + select account_information @@ -104,7 +106,7 @@ group_id static 1 - + select account_information Magento\Customer\Test\Fixture\CustomerInjectable\GroupId @@ -121,7 +123,7 @@ middlename varchar 0 - + text account_information @@ -129,14 +131,14 @@ password_hash varchar 0 - + hidden prefix varchar 0 - + text account_information @@ -144,21 +146,21 @@ rp_token varchar 0 - + hidden rp_token_created_at datetime 0 - + date store_id static 1 - + select account_information @@ -166,7 +168,7 @@ suffix varchar 0 - + text account_information @@ -174,7 +176,7 @@ taxvat varchar 0 - + text account_information @@ -182,7 +184,7 @@ website_id static 1 - + select account_information @@ -190,7 +192,7 @@ amount_delta static 1 - + text store_credit diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php deleted file mode 100644 index dfdebe7ff0561..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php +++ /dev/null @@ -1,900 +0,0 @@ - 'downloadable', - 'create_url_params' => [ - 'type' => 'downloadable', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'DownloadableProduct_%isolation%', - 'sku' => 'DownloadableProduct_%isolation%', - 'url_key' => 'downloadableproduct_%isolation%', - 'price' => ['value' => 100.00], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'description' => 'This is description for downloadable product', - 'short_description' => 'This is short description for downloadable product', - 'quantity_and_stock_status' => [ - 'qty' => 1.0000, - 'is_in_stock' => 'In Stock', - ], - 'is_virtual' => 'Yes', - 'downloadable_links' => ['preset' => 'default'], - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - ]; - - protected $cost = [ - 'attribute_code' => 'cost', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => 'This is description for downloadable product', - 'input' => 'textarea', - 'group' => 'product-details', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $group_price = [ - 'attribute_code' => 'group_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $is_returnable = [ - 'attribute_code' => 'is_returnable', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '2', - 'input' => 'select', - ]; - - protected $links_exist = [ - 'attribute_code' => 'links_exist', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '0', - 'input' => '', - ]; - - protected $links_purchased_separately = [ - 'attribute_code' => 'links_purchased_separately', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $links_title = [ - 'attribute_code' => 'links_title', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $minimal_price = [ - 'attribute_code' => 'minimal_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp = [ - 'attribute_code' => 'msrp', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'price', - ]; - - protected $msrp_display_actual_price_type = [ - 'attribute_code' => 'msrp_display_actual_price_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '4', - 'input' => 'select', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'container2', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'decimal', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'price', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\Price', - ]; - - protected $stock_data = [ - 'attribute_code' => 'stock_data', - 'input' => 'text', - 'group' => 'advanced-inventory', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $related_tgtr_position_behavior = [ - 'attribute_code' => 'related_tgtr_position_behavior', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $related_tgtr_position_limit = [ - 'attribute_code' => 'related_tgtr_position_limit', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $samples_title = [ - 'attribute_code' => 'samples_title', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => 'This is short description for downloadable product', - 'input' => 'textarea', - 'group' => 'autosettings', - ]; - - protected $downloadable = [ - 'attribute_code' => 'downloadable', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'group' => 'downloadable_information', - ]; - - protected $downloadable_links = [ - 'attribute_code' => 'downloadable_items', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => 'dafault', - 'input' => 'text', - 'group' => 'downloadable_information', - 'source' => 'Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Links', - ]; - - protected $downloadable_sample = [ - 'attribute_code' => 'downloadable_sample', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => 'dafault', - 'input' => 'text', - 'group' => 'downloadable_information', - 'source' => 'Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $special_from_date = [ - 'attribute_code' => 'special_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $special_price = [ - 'attribute_code' => 'special_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '10', - 'group' => 'advanced-pricing', - ]; - - protected $special_to_date = [ - 'attribute_code' => 'special_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - 'group' => 'product-details', - ]; - - protected $tax_class_id = [ - 'attribute_code' => 'tax_class_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '2', - 'input' => 'select', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $tier_price = [ - 'attribute_code' => 'tier_price', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => 'default', - 'input' => 'text', - 'group' => 'advanced-pricing', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $upsell_tgtr_position_behavior = [ - 'attribute_code' => 'upsell_tgtr_position_behavior', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $upsell_tgtr_position_limit = [ - 'attribute_code' => 'upsell_tgtr_position_limit', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '4', - 'input' => 'select', - 'group' => 'autosettings', - ]; - - protected $weight = [ - 'attribute_code' => 'weight', - 'backend_type' => 'decimal', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'weight', - 'group' => 'product-details', - ]; - - protected $custom_options = [ - 'attribute_code' => 'custom_options', - 'backend_type' => 'virtual', - 'is_required' => '0', - 'default_value' => 'default', - 'group' => 'customer-options', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $is_virtual = [ - 'attribute_code' => 'is_virtual', - 'backend_type' => 'virtual', - 'group' => 'product-details', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => ['Main Website'], - 'group' => 'websites', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => null, - 'source' => 'Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\CheckoutData', - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getCost() - { - return $this->getData('cost'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getIsReturnable() - { - return $this->getData('is_returnable'); - } - - public function getLinksExist() - { - return $this->getData('links_exist'); - } - - public function getLinksPurchasedSeparately() - { - return $this->getData('links_purchased_separately'); - } - - public function getLinksTitle() - { - return $this->getData('links_title'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getMinimalPrice() - { - return $this->getData('minimal_price'); - } - - public function getMsrp() - { - return $this->getData('msrp'); - } - - public function getMsrpDisplayActualPriceType() - { - return $this->getData('msrp_display_actual_price_type'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRelatedTgtrPositionBehavior() - { - return $this->getData('related_tgtr_position_behavior'); - } - - public function getRelatedTgtrPositionLimit() - { - return $this->getData('related_tgtr_position_limit'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getSamplesTitle() - { - return $this->getData('samples_title'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getSpecialFromDate() - { - return $this->getData('special_from_date'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getSpecialToDate() - { - return $this->getData('special_to_date'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getTaxClassId() - { - return $this->getData('tax_class_id'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUpsellTgtrPositionBehavior() - { - return $this->getData('upsell_tgtr_position_behavior'); - } - - public function getUpsellTgtrPositionLimit() - { - return $this->getData('upsell_tgtr_position_limit'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getWeight() - { - return $this->getData('weight'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getCustomOptions() - { - return $this->getData('custom_options'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } - - public function getDownloadableLinks() - { - return $this->getData('downloadable_links'); - } - - public function getDownloadableSample() - { - return $this->getData('downloadable_sample'); - } - - public function getIsVirtual() - { - return $this->getData('is_virtual'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 3130e837fd6d3..53e5cdadc757f 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Downloadable eav catalog_product @@ -27,7 +29,7 @@ category_ids static 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds @@ -36,42 +38,42 @@ cost decimal 0 - + price created_at static 1 - + text custom_design varchar 0 - + select custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea @@ -86,21 +88,21 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select group_price decimal 0 - + text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions @@ -109,21 +111,21 @@ has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text @@ -144,56 +146,56 @@ links_purchased_separately int 1 - + links_title varchar 1 - + media_gallery varchar 0 - + gallery meta_description varchar 0 - + textarea meta_keyword text 0 - + textarea meta_title varchar 0 - + text minimal_price decimal 0 - + price msrp decimal 0 - + price @@ -215,21 +217,21 @@ news_from_date datetime 0 - + date news_to_date datetime 0 - + date old_id int 0 - + text @@ -243,7 +245,7 @@ page_layout varchar 0 - + select @@ -277,28 +279,28 @@ related_tgtr_position_behavior int 0 - + text related_tgtr_position_limit int 0 - + text required_options static 0 - + text samples_title varchar 1 - + @@ -347,21 +349,21 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text special_from_date datetime 0 - + date @@ -375,7 +377,7 @@ special_to_date datetime 0 - + date @@ -401,14 +403,14 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text @@ -424,21 +426,21 @@ updated_at static 1 - + text upsell_tgtr_position_behavior int 0 - + text upsell_tgtr_position_limit int 0 - + text @@ -453,7 +455,7 @@ url_path varchar 0 - + text @@ -468,7 +470,7 @@ weight decimal 0 - + weight product-details diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php deleted file mode 100644 index 6e65e3ae4fe7b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php +++ /dev/null @@ -1,137 +0,0 @@ - 'Yes', - 'allow_gift_messages_for_order' => 'Yes', - 'sender' => 'John Doe', - 'recipient' => 'Jane Doe', - 'message' => 'text_%isolation%', - ]; - - protected $gift_message_id = [ - 'attribute_code' => 'gift_message_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_id = [ - 'attribute_code' => 'customer_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $sender = [ - 'attribute_code' => 'sender', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $recipient = [ - 'attribute_code' => 'recipient', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $message = [ - 'attribute_code' => 'message', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $allow_gift_options = [ - 'attribute_code' => 'allow_gift_options', - 'backend_type' => 'virtual', - ]; - - protected $allow_gift_messages_for_order = [ - 'attribute_code' => 'allow_gift_messages_for_order', - 'backend_type' => 'virtual', - ]; - - protected $allow_gift_options_for_items = [ - 'attribute_code' => 'allow_gift_options_for_items', - 'backend_type' => 'virtual', - ]; - - protected $items = [ - 'attribute_code' => 'items', - 'backend_type' => 'virtual', - 'source' => 'Magento\GiftMessage\Test\Fixture\GiftMessage\Items', - ]; - - public function getGiftMessageId() - { - return $this->getData('gift_message_id'); - } - - public function getCustomerId() - { - return $this->getData('customer_id'); - } - - public function getSender() - { - return $this->getData('sender'); - } - - public function getRecipient() - { - return $this->getData('recipient'); - } - - public function getMessage() - { - return $this->getData('message'); - } - - public function getAllowGiftMessagesForOrder() - { - return $this->getData('allow_gift_messages_for_order'); - } - - public function getAllowGiftOptionsForItems() - { - return $this->getData('allow_gift_options_for_items'); - } - - public function getAllowGiftOptions() - { - return $this->getData('allow_gift_options'); - } - - public function getItems() - { - return $this->getData('items'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index c8624ab7944e3..89decea5847a7 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_GiftMessage flat gift_message @@ -17,7 +19,7 @@ gift_message_id int 1 - + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php deleted file mode 100644 index dcfa2ffe5ff36..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php +++ /dev/null @@ -1,88 +0,0 @@ - 'United States', - 'attribute_set_id' => ['dataSet' => 'default'], - 'category' => 'Apparel & Accessories', - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'source' => 'Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId', - ]; - - protected $target_country = [ - 'attribute_code' => 'target_country', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'US', - 'input' => '', - ]; - - protected $category = [ - 'attribute_code' => 'category', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - public function getTypeId() - { - return $this->getData('type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getTargetCountry() - { - return $this->getData('target_country'); - } - - public function getCategory() - { - return $this->getData('category'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index 2560c9437fb1b..ad9a94279fce4 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_GoogleShopping flat googleshopping_types @@ -13,5 +15,36 @@ Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface + + type_id + int + 1 + + + + + attribute_set_id + smallint + + + default + + + Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId + + + target_country + varchar + + United States + + + + category + varchar + + Apparel & Accessories + + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php deleted file mode 100644 index 16450294438d4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php +++ /dev/null @@ -1,699 +0,0 @@ - 'grouped', - 'create_url_params' => [ - 'type' => 'grouped', - 'set' => '4', - ], - 'input_prefix' => 'product', - ]; - - protected $defaultDataSet = [ - 'name' => 'GroupedProduct_%isolation%', - 'sku' => 'GroupedProduct_%isolation%', - 'tax_class' => 'taxable_goods', - 'description' => 'This is description for grouped product', - 'short_description' => 'This is short description for grouped product', - 'quantity_and_stock_status' => [ - 'qty' => '1', - 'is_in_stock' => 'In Stock', - ], - ]; - - protected $category_ids = [ - 'attribute_code' => 'category_ids', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds', - ]; - - protected $country_of_manufacture = [ - 'attribute_code' => 'country_of_manufacture', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $custom_design = [ - 'attribute_code' => 'custom_design', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $associated = [ - 'attribute_code' => 'associated', - 'backend_type' => 'virtual', - 'is_required' => '1', - 'group' => 'grouped', - 'source' => 'Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Associated', - ]; - - protected $custom_design_from = [ - 'attribute_code' => 'custom_design_from', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_design_to = [ - 'attribute_code' => 'custom_design_to', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $custom_layout_update = [ - 'attribute_code' => 'custom_layout_update', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => '', - 'group' => 'product-details', - ]; - - protected $gallery = [ - 'attribute_code' => 'gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $gift_message_available = [ - 'attribute_code' => 'gift_message_available', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $has_options = [ - 'attribute_code' => 'has_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $image = [ - 'attribute_code' => 'image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $image_label = [ - 'attribute_code' => 'image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $is_returnable = [ - 'attribute_code' => 'is_returnable', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '2', - 'input' => 'select', - ]; - - protected $media_gallery = [ - 'attribute_code' => 'media_gallery', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'gallery', - ]; - - protected $meta_description = [ - 'attribute_code' => 'meta_description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_keyword = [ - 'attribute_code' => 'meta_keyword', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $news_from_date = [ - 'attribute_code' => 'news_from_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $news_to_date = [ - 'attribute_code' => 'news_to_date', - 'backend_type' => 'datetime', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'date', - ]; - - protected $old_id = [ - 'attribute_code' => 'old_id', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $options_container = [ - 'attribute_code' => 'options_container', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => 'container2', - 'input' => 'select', - ]; - - protected $page_layout = [ - 'attribute_code' => 'page_layout', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'select', - ]; - - protected $quantity_and_stock_status = [ - 'attribute_code' => 'quantity_and_stock_status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - 'group' => 'product-details', - - ]; - - protected $stock_data = [ - 'attribute_code' => 'stock_data', - 'group' => 'advanced-inventory', - ]; - - protected $related_tgtr_position_behavior = [ - 'attribute_code' => 'related_tgtr_position_behavior', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $related_tgtr_position_limit = [ - 'attribute_code' => 'related_tgtr_position_limit', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $required_options = [ - 'attribute_code' => 'required_options', - 'backend_type' => 'static', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $short_description = [ - 'attribute_code' => 'short_description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => '', - 'group' => 'autosettings', - ]; - - protected $sku = [ - 'attribute_code' => 'sku', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - 'group' => 'product-details', - ]; - - protected $small_image = [ - 'attribute_code' => 'small_image', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $small_image_label = [ - 'attribute_code' => 'small_image_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '1', - 'input' => 'select', - ]; - - protected $thumbnail = [ - 'attribute_code' => 'thumbnail', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'media_image', - ]; - - protected $thumbnail_label = [ - 'attribute_code' => 'thumbnail_label', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'static', - 'is_required' => '1', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $upsell_tgtr_position_behavior = [ - 'attribute_code' => 'upsell_tgtr_position_behavior', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $upsell_tgtr_position_limit = [ - 'attribute_code' => 'upsell_tgtr_position_limit', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - 'group' => 'search-engine-optimization', - ]; - - protected $url_path = [ - 'attribute_code' => 'url_path', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $visibility = [ - 'attribute_code' => 'visibility', - 'backend_type' => 'int', - 'is_required' => '0', - 'default_value' => '4', - 'input' => 'select', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $type_id = [ - 'attribute_code' => 'type_id', - 'backend_type' => 'virtual', - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'virtual', - 'group' => 'product-details', - 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId', - ]; - - protected $website_ids = [ - 'attribute_code' => 'website_ids', - 'backend_type' => 'virtual', - 'default_value' => ['Main Website'], - 'group' => 'websites', - ]; - - protected $price = [ - 'attribute_code' => 'price', - 'backend_type' => 'virtual', - 'source' => 'Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Price', - ]; - - protected $checkout_data = [ - 'attribute_code' => 'checkout_data', - 'backend_type' => 'virtual', - 'group' => null, - 'source' => 'Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData', - ]; - - public function getCategoryIds() - { - return $this->getData('category_ids'); - } - - public function getCountryOfManufacture() - { - return $this->getData('country_of_manufacture'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getCustomDesign() - { - return $this->getData('custom_design'); - } - - public function getCustomDesignFrom() - { - return $this->getData('custom_design_from'); - } - - public function getCustomDesignTo() - { - return $this->getData('custom_design_to'); - } - - public function getCustomLayoutUpdate() - { - return $this->getData('custom_layout_update'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getGallery() - { - return $this->getData('gallery'); - } - - public function getGiftMessageAvailable() - { - return $this->getData('gift_message_available'); - } - - public function getHasOptions() - { - return $this->getData('has_options'); - } - - public function getImage() - { - return $this->getData('image'); - } - - public function getImageLabel() - { - return $this->getData('image_label'); - } - - public function getIsReturnable() - { - return $this->getData('is_returnable'); - } - - public function getMediaGallery() - { - return $this->getData('media_gallery'); - } - - public function getMetaDescription() - { - return $this->getData('meta_description'); - } - - public function getMetaKeyword() - { - return $this->getData('meta_keyword'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getNewsFromDate() - { - return $this->getData('news_from_date'); - } - - public function getNewsToDate() - { - return $this->getData('news_to_date'); - } - - public function getOldId() - { - return $this->getData('old_id'); - } - - public function getOptionsContainer() - { - return $this->getData('options_container'); - } - - public function getPageLayout() - { - return $this->getData('page_layout'); - } - - public function getQuantityAndStockStatus() - { - return $this->getData('quantity_and_stock_status'); - } - - public function getRelatedTgtrPositionBehavior() - { - return $this->getData('related_tgtr_position_behavior'); - } - - public function getRelatedTgtrPositionLimit() - { - return $this->getData('related_tgtr_position_limit'); - } - - public function getRequiredOptions() - { - return $this->getData('required_options'); - } - - public function getShortDescription() - { - return $this->getData('short_description'); - } - - public function getPrice() - { - return $this->getData('price'); - } - - public function getSpecialPrice() - { - return $this->getData('special_price'); - } - - public function getGroupPrice() - { - return $this->getData('group_price'); - } - - public function getTierPrice() - { - return $this->getData('tier_price'); - } - - public function getSku() - { - return $this->getData('sku'); - } - - public function getAssociated() - { - return $this->getData('associated'); - } - - public function getSmallImage() - { - return $this->getData('small_image'); - } - - public function getSmallImageLabel() - { - return $this->getData('small_image_label'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getThumbnail() - { - return $this->getData('thumbnail'); - } - - public function getThumbnailLabel() - { - return $this->getData('thumbnail_label'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getUpsellTgtrPositionBehavior() - { - return $this->getData('upsell_tgtr_position_behavior'); - } - - public function getUpsellTgtrPositionLimit() - { - return $this->getData('upsell_tgtr_position_limit'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getUrlPath() - { - return $this->getData('url_path'); - } - - public function getVisibility() - { - return $this->getData('visibility'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getTypeId() - { - return $this->getData('type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getWebsiteIds() - { - return $this->getData('website_ids'); - } - - public function getCheckoutData() - { - return $this->getData('checkout_data'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index cf4248cdefb65..6e0bd0be5e2bf 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_GroupedProduct eav catalog_product @@ -27,7 +29,7 @@ category_ids static 0 - + text product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds @@ -36,21 +38,21 @@ country_of_manufacture varchar 0 - + select created_at static 1 - + text custom_design varchar 0 - + select @@ -64,21 +66,21 @@ custom_design_from datetime 0 - + date custom_design_to datetime 0 - + date custom_layout_update text 0 - + textarea @@ -93,35 +95,35 @@ gallery varchar 0 - + gallery gift_message_available varchar 0 - + select has_options static 0 - + text image varchar 0 - + media_image image_label varchar 0 - + text @@ -135,28 +137,28 @@ media_gallery varchar 0 - + gallery meta_description varchar 0 - + textarea meta_keyword text 0 - + textarea meta_title varchar 0 - + text @@ -171,21 +173,21 @@ news_from_date datetime 0 - + date news_to_date datetime 0 - + date old_id int 0 - + text @@ -199,7 +201,7 @@ page_layout varchar 0 - + select @@ -221,21 +223,21 @@ related_tgtr_position_behavior int 0 - + text related_tgtr_position_limit int 0 - + text required_options static 0 - + text @@ -258,14 +260,14 @@ small_image varchar 0 - + media_image small_image_label varchar 0 - + text @@ -279,42 +281,42 @@ thumbnail varchar 0 - + media_image thumbnail_label varchar 0 - + text updated_at static 1 - + text upsell_tgtr_position_behavior int 0 - + text upsell_tgtr_position_limit int 0 - + text url_key varchar 0 - + text search-engine-optimization @@ -322,7 +324,7 @@ url_path varchar 0 - + text diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php deleted file mode 100644 index c825aff87c6b4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php +++ /dev/null @@ -1,73 +0,0 @@ - 'Products', - 'behavior' => 'CSV', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $entity = [ - 'attribute_code' => 'entity', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $behavior = [ - 'attribute_code' => 'behavior', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'append', - 'input' => '', - ]; - - protected $data_export = [ - 'attribute_code' => 'data', - 'backend_type' => 'longtext', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - public function getId() - { - return $this->getData('id'); - } - - public function getEntity() - { - return $this->getData('entity'); - } - - public function getBehavior() - { - return $this->getData('behavior'); - } - - public function getDataExport() - { - return $this->getData('data_export'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 9250ce0298fbc..4a31154c7e39f 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_ImportExport flat importexport_importdata @@ -14,7 +16,7 @@ id int 1 - + @@ -35,7 +37,7 @@ data longtext - + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php deleted file mode 100644 index fe297aeb0d966..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php +++ /dev/null @@ -1,220 +0,0 @@ - 'dbHost', - 'backend_type' => 'virtual', - ]; - - protected $dbUser = [ - 'attribute_code' => 'dbUser', - 'backend_type' => 'virtual', - ]; - - protected $dbPassword = [ - 'attribute_code' => 'dbPassword', - 'backend_type' => 'virtual', - ]; - - protected $dbName = [ - 'attribute_code' => 'dbName', - 'backend_type' => 'virtual', - ]; - - protected $web = [ - 'attribute_code' => 'web', - 'backend_type' => 'virtual', - ]; - - protected $admin = [ - 'attribute_code' => 'admin', - 'backend_type' => 'virtual', - ]; - - protected $adminUsername = [ - 'attribute_code' => 'adminUsername', - 'backend_type' => 'virtual', - ]; - - protected $adminEmail = [ - 'attribute_code' => 'adminEmail', - 'backend_type' => 'virtual', - ]; - - protected $adminPassword = [ - 'attribute_code' => 'adminPassword', - 'backend_type' => 'virtual', - ]; - - protected $adminConfirm = [ - 'attribute_code' => 'adminConfirm', - 'backend_type' => 'virtual', - ]; - - protected $apacheRewrites = [ - 'attribute_code' => 'apacheRewrites', - 'backend_type' => 'virtual', - ]; - - protected $dbTablePrefix = [ - 'attribute_code' => 'dbTablePrefix', - 'backend_type' => 'virtual', - ]; - - protected $keyOwn = [ - 'attribute_code' => 'keyOwn', - 'backend_type' => 'virtual', - ]; - - protected $httpsAdmin = [ - 'attribute_code' => 'httpsAdmin', - 'backend_type' => 'virtual', - ]; - - protected $https = [ - 'attribute_code' => 'https', - 'backend_type' => 'virtual', - ]; - - protected $httpsFront = [ - 'attribute_code' => 'httpsFront', - 'backend_type' => 'virtual', - ]; - - protected $keyValue = [ - 'attribute_code' => 'keyValue', - 'backend_type' => 'virtual', - ]; - - protected $language = [ - 'attribute_code' => 'language', - 'backend_type' => 'virtual', - ]; - - protected $currency = [ - 'attribute_code' => 'language', - 'backend_type' => 'virtual', - ]; - - public function getDbHost() - { - return $this->getData('dbHost'); - } - - public function getDbUser() - { - return $this->getData('dbUser'); - } - - public function getDbPassword() - { - return $this->getData('dbPassword'); - } - - public function getDbName() - { - return $this->getData('dbName'); - } - - public function getWeb() - { - return $this->getData('web'); - } - - public function getAdmin() - { - return $this->getData('admin'); - } - - public function getAdminUsername() - { - return $this->getData('adminUsername'); - } - - public function getAdminEmail() - { - return $this->getData('adminEmail'); - } - - public function getAdminPassword() - { - return $this->getData('adminPassword'); - } - - public function getAdminConfirm() - { - return $this->getData('adminConfirm'); - } - - public function getCurrency() - { - return $this->getData('currency'); - } - - public function getApacheRewrites() - { - return $this->getData('apacheRewrites'); - } - - public function getKeyOwn() - { - return $this->getData('keyOwn'); - } - - public function getKeyValue() - { - return $this->getData('keyValue'); - } - - public function getLanguage() - { - return $this->getData('language'); - } - - public function getHttpsAdmin() - { - return $this->getData('httpsAdmin'); - } - - public function getHttps() - { - return $this->getData('https'); - } - - public function getHttpsFront() - { - return $this->getData('httpsFront'); - } - - public function getDbTablePrefix() - { - return $this->getData('dbTablePrefix'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index c041d6a10b455..13881dd5c154a 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Install virtual install diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php deleted file mode 100644 index f914c3d507dff..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php +++ /dev/null @@ -1,381 +0,0 @@ - 'default_integration_%isolation%', - 'email' => 'test_%isolation%@example.com', - 'resource_access' => 'All', - ]; - - protected $integration_id = [ - 'attribute_code' => 'integration_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'integration_info', - ]; - - protected $email = [ - 'attribute_code' => 'email', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'integration_info', - ]; - - protected $endpoint = [ - 'attribute_code' => 'endpoint', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'integration_info', - ]; - - protected $status = [ - 'attribute_code' => 'status', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $consumer_id = [ - 'attribute_code' => 'consumer_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => 'CURRENT_TIMESTAMP', - 'input' => '', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $setup_type = [ - 'attribute_code' => 'setup_type', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $identity_link_url = [ - 'attribute_code' => 'identity_link_url', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'integration_info', - ]; - - protected $entity_id = [ - 'attribute_code' => 'entity_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $admin_id = [ - 'attribute_code' => 'admin_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_id = [ - 'attribute_code' => 'customer_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $type = [ - 'attribute_code' => 'type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $token = [ - 'attribute_code' => 'token', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $secret = [ - 'attribute_code' => 'secret', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $verifier = [ - 'attribute_code' => 'verifier', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $callback_url = [ - 'attribute_code' => 'callback_url', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $revoked = [ - 'attribute_code' => 'revoked', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $authorized = [ - 'attribute_code' => 'authorized', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $user_type = [ - 'attribute_code' => 'user_type', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $key = [ - 'attribute_code' => 'key', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $rejected_callback_url = [ - 'attribute_code' => 'rejected_callback_url', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $resource_access = [ - 'attribute_code' => 'resource_access', - 'backend_type' => 'virtual', - 'group' => 'api', - ]; - - protected $resources = [ - 'attribute_code' => 'resources', - 'backend_type' => 'virtual', - 'group' => 'api', - ]; - - protected $token_secret = [ - 'attribute_code' => 'token_secret', - 'backend_type' => 'virtual', - 'group' => 'integration_info', - ]; - - protected $consumer_secret = [ - 'attribute_code' => 'consumer_secret', - 'backend_type' => 'virtual', - 'group' => 'integration_info', - ]; - - public function getIntegrationId() - { - return $this->getData('integration_id'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getEmail() - { - return $this->getData('email'); - } - - public function getEndpoint() - { - return $this->getData('endpoint'); - } - - public function getStatus() - { - return $this->getData('status'); - } - - public function getConsumerId() - { - return $this->getData('consumer_id'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getSetupType() - { - return $this->getData('setup_type'); - } - - public function getIdentityLinkUrl() - { - return $this->getData('identity_link_url'); - } - - public function getEntityId() - { - return $this->getData('entity_id'); - } - - public function getAdminId() - { - return $this->getData('admin_id'); - } - - public function getCustomerId() - { - return $this->getData('customer_id'); - } - - public function getType() - { - return $this->getData('type'); - } - - public function getToken() - { - return $this->getData('token'); - } - - public function getSecret() - { - return $this->getData('secret'); - } - - public function getVerifier() - { - return $this->getData('verifier'); - } - - public function getCallbackUrl() - { - return $this->getData('callback_url'); - } - - public function getRevoked() - { - return $this->getData('revoked'); - } - - public function getAuthorized() - { - return $this->getData('authorized'); - } - - public function getUserType() - { - return $this->getData('user_type'); - } - - public function getKey() - { - return $this->getData('key'); - } - - public function getRejectedCallbackUrl() - { - return $this->getData('rejected_callback_url'); - } - - public function getResourceAccess() - { - return $this->getData('resource_access'); - } - - public function getResources() - { - return $this->getData('resources'); - } - - public function getTokenSecret() - { - return $this->getData('token_secret'); - } - - public function getConsumerSecret() - { - return $this->getData('consumer_secret'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index a5ba6f14a0944..2ef840a1445db 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Integration composite @@ -22,7 +24,7 @@ integration_id int 1 - + @@ -45,7 +47,7 @@ endpoint varchar - + integration_info @@ -53,14 +55,14 @@ status smallint - + consumer_id int - + @@ -74,7 +76,7 @@ updated_at timestamp - + @@ -88,7 +90,7 @@ identity_link_url varchar - + integration_info @@ -96,56 +98,56 @@ entity_id int 1 - + admin_id int - + customer_id int - + type varchar - + token varchar - + secret varchar - + verifier varchar - + callback_url varchar - + @@ -166,21 +168,21 @@ user_type int - + key varchar - + rejected_callback_url varchar - + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php deleted file mode 100644 index 44f92cc2b6fc4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php +++ /dev/null @@ -1,190 +0,0 @@ - 'TemplateName%isolation%', - 'subject' => 'TemplateSubject%isolation%', - 'sender_name' => 'SenderName%isolation%', - 'sender_email' => 'SenderName%isolation%@example.com', - 'text' => 'Some text %isolation%', - ]; - - protected $id = [ - 'attribute_code' => 'template_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'template_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $text = [ - 'attribute_code' => 'template_text', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $text_preprocessed = [ - 'attribute_code' => 'template_text_preprocessed', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $styles = [ - 'attribute_code' => 'template_styles', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $type = [ - 'attribute_code' => 'template_type', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $subject = [ - 'attribute_code' => 'template_subject', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sender_name = [ - 'attribute_code' => 'template_sender_name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sender_email = [ - 'attribute_code' => 'template_sender_email', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $actual = [ - 'attribute_code' => 'template_actual', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $added_at = [ - 'attribute_code' => 'added_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $modified_at = [ - 'attribute_code' => 'modified_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - public function getId() - { - return $this->getData('id'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getText() - { - return $this->getData('text'); - } - - public function getTextPreprocessed() - { - return $this->getData('text_preprocessed'); - } - - public function getStyles() - { - return $this->getData('styles'); - } - - public function getType() - { - return $this->getData('type'); - } - - public function getSubject() - { - return $this->getData('subject'); - } - - public function getSenderName() - { - return $this->getData('sender_name'); - } - - public function getSenderEmail() - { - return $this->getData('sender_email'); - } - - public function getActual() - { - return $this->getData('actual'); - } - - public function getAddedAt() - { - return $this->getData('added_at'); - } - - public function getModifiedAt() - { - return $this->getData('modified_at'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 004057ea46e27..5ef4f94ceec70 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Newsletter flat newsletter_template @@ -18,7 +20,7 @@ template_id int 1 - + @@ -39,21 +41,21 @@ template_text_preprocessed text - + template_styles text - + template_type int - + @@ -88,14 +90,14 @@ added_at timestamp - + modified_at timestamp - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php deleted file mode 100755 index efa7bb2458aa9..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php +++ /dev/null @@ -1,121 +0,0 @@ - 'Rating %isolation%', - 'stores' => 'Main Website/Main Website Store/Default Store View', - 'is_active' => 'Yes', - ]; - - protected $rating_id = [ - 'attribute_code' => 'rating_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $entity_id = [ - 'attribute_code' => 'entity_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $rating_code = [ - 'attribute_code' => 'rating_code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'rating_information', - ]; - - protected $position = [ - 'attribute_code' => 'position', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => 'rating_information', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - 'group' => 'rating_information', - ]; - - protected $stores = [ - 'attribute_code' => 'stores', - 'backend_type' => 'virtual', - 'group' => 'rating_information', - ]; - - protected $options = [ - 'attribute_code' => 'options', - 'backend_type' => 'virtual', - 'group' => 'rating_information', - ]; - - public function getRatingId() - { - return $this->getData('rating_id'); - } - - public function getEntityId() - { - return $this->getData('entity_id'); - } - - public function getRatingCode() - { - return $this->getData('rating_code'); - } - - public function getPosition() - { - return $this->getData('position'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getStores() - { - return $this->getData('stores'); - } - - public function getOptions() - { - return $this->getData('options'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index e18f938d59c93..b76feb6214c5b 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Review flat rating @@ -18,7 +20,7 @@ rating_id smallint 1 - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index 3e3a953a52f11..5473598ecb2ae 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Review composite @@ -58,7 +60,7 @@ detail_id bigint 1 - + @@ -93,7 +95,7 @@ customer_id int - + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php deleted file mode 100644 index 2984eaf84361c..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php +++ /dev/null @@ -1,109 +0,0 @@ - 'sitemap.xml', - 'sitemap_path' => '/', - ]; - - protected $sitemap_id = [ - 'attribute_code' => 'sitemap_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $sitemap_type = [ - 'attribute_code' => 'sitemap_type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sitemap_filename = [ - 'attribute_code' => 'sitemap_filename', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sitemap_path = [ - 'attribute_code' => 'sitemap_path', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sitemap_time = [ - 'attribute_code' => 'sitemap_time', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - public function getSitemapId() - { - return $this->getData('sitemap_id'); - } - - public function getSitemapType() - { - return $this->getData('sitemap_type'); - } - - public function getSitemapFilename() - { - return $this->getData('sitemap_filename'); - } - - public function getSitemapPath() - { - return $this->getData('sitemap_path'); - } - - public function getSitemapTime() - { - return $this->getData('sitemap_time'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index dbab61385307f..574baf025f147 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Sitemap flat sitemap @@ -17,14 +19,14 @@ sitemap_id int 1 - + sitemap_type varchar - + @@ -45,7 +47,7 @@ sitemap_time timestamp - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php deleted file mode 100644 index 081711218f0b4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php +++ /dev/null @@ -1,126 +0,0 @@ - ['dataSet' => 'default'], - 'name' => 'Default Store View', - 'code' => 'default', - 'is_active' => 'Enabled', - 'store_id' => 1, - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $website_id = [ - 'attribute_code' => 'website_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $group_id = [ - 'attribute_code' => 'group_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => 'select', - 'source' => 'Magento\Store\Test\Fixture\Store\GroupId', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $sort_order = [ - 'attribute_code' => 'sort_order', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => 'text', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => 'select', - ]; - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getWebsiteId() - { - return $this->getData('website_id'); - } - - public function getGroupId() - { - return $this->getData('group_id'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getSortOrder() - { - return $this->getData('sort_order'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index 88d887640fd77..fe34a2b51f5c7 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Store flat store diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php deleted file mode 100644 index b19288b37e0cc..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php +++ /dev/null @@ -1,96 +0,0 @@ - [ - 'dataSet' => 'main_website', - ], - 'name' => 'StoreGroup%isolation%', - 'root_category_id' => [ - 'dataSet' => 'default_category', - ], - ]; - - protected $group_id = [ - 'attribute_code' => 'group_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $website_id = [ - 'attribute_code' => 'website_id', - 'backend_type' => 'virtual', - 'source' => 'Magento\Store\Test\Fixture\StoreGroup\WebsiteId', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $root_category_id = [ - 'attribute_code' => 'root_category_id', - 'backend_type' => 'virtual', - 'source' => 'Magento\Store\Test\Fixture\StoreGroup\CategoryId', - ]; - - protected $default_store_id = [ - 'attribute_code' => 'default_store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - public function getGroupId() - { - return $this->getData('group_id'); - } - - public function getWebsiteId() - { - return $this->getData('website_id'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getRootCategoryId() - { - return $this->getData('root_category_id'); - } - - public function getDefaultStoreId() - { - return $this->getData('default_store_id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 41214bb7c4e70..8df070f9b532d 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Store flat store_group @@ -18,7 +20,7 @@ group_id smallint 1 - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php deleted file mode 100644 index 0dc41b477a6a5..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php +++ /dev/null @@ -1,109 +0,0 @@ - 'Main Website', - 'code' => 'base', - 'website_id' => '1', - ]; - - protected $website_id = [ - 'attribute_code' => 'website_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $sort_order = [ - 'attribute_code' => 'sort_order', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $default_group_id = [ - 'attribute_code' => 'default_group_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_default = [ - 'attribute_code' => 'is_default', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - public function getWebsiteId() - { - return $this->getData('website_id'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getSortOrder() - { - return $this->getData('sort_order'); - } - - public function getDefaultGroupId() - { - return $this->getData('default_group_id'); - } - - public function getIsDefault() - { - return $this->getData('is_default'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 5ca021b18a544..d9ba76ba70370 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Store flat store_website diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php deleted file mode 100644 index 8f161b790ab25..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php +++ /dev/null @@ -1,78 +0,0 @@ - 'Tax Class %isolation%', - ]; - - protected $class_id = [ - 'attribute_code' => 'class_id', - 'backend_type' => 'smallint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $class_name = [ - 'attribute_code' => 'class_name', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $class_type = [ - 'attribute_code' => 'class_type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'CUSTOMER', - 'input' => '', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - public function getClassId() - { - return $this->getData('class_id'); - } - - public function getClassName() - { - return $this->getData('class_name'); - } - - public function getClassType() - { - return $this->getData('class_type'); - } - - public function getId() - { - return $this->getData('id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index 1fcd22faccccd..dc0b9aba114a1 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Tax flat tax_class @@ -18,7 +20,7 @@ class_id smallint 1 - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php deleted file mode 100644 index e61fc1352cfdf..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php +++ /dev/null @@ -1,160 +0,0 @@ - 'Tax Rate %isolation%', - 'rate' => '10', - 'tax_country_id' => 'United States', - 'tax_postcode' => '*', - 'tax_region_id' => 'California', - ]; - - protected $tax_calculation_rate_id = [ - 'attribute_code' => 'tax_calculation_rate_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $tax_country_id = [ - 'attribute_code' => 'tax_country_id', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $tax_region_id = [ - 'attribute_code' => 'tax_region_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $tax_postcode = [ - 'attribute_code' => 'tax_postcode', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $rate = [ - 'attribute_code' => 'rate', - 'backend_type' => 'decimal', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $zip_is_range = [ - 'attribute_code' => 'zip_is_range', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $zip_from = [ - 'attribute_code' => 'zip_from', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $zip_to = [ - 'attribute_code' => 'zip_to', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - public function getTaxCalculationRateId() - { - return $this->getData('tax_calculation_rate_id'); - } - - public function getTaxCountryId() - { - return $this->getData('tax_country_id'); - } - - public function getTaxRegionId() - { - return $this->getData('tax_region_id'); - } - - public function getTaxPostcode() - { - return $this->getData('tax_postcode'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getRate() - { - return $this->getData('rate'); - } - - public function getZipIsRange() - { - return $this->getData('zip_is_range'); - } - - public function getZipFrom() - { - return $this->getData('zip_from'); - } - - public function getZipTo() - { - return $this->getData('zip_to'); - } - - public function getId() - { - return $this->getData('id'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index fe7e3e58623fc..ddeae57a7a7d3 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Tax flat tax_calculation_rate @@ -18,7 +20,7 @@ tax_calculation_rate_id int 1 - + @@ -60,21 +62,21 @@ zip_is_range smallint - + zip_from int - + zip_to int - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php deleted file mode 100644 index 00903a0d40733..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php +++ /dev/null @@ -1,119 +0,0 @@ - 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 'US-CA-Rate_1', - ], - ], - ]; - - protected $tax_calculation_rule_id = [ - 'attribute_code' => 'tax_calculation_rule_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $code = [ - 'attribute_code' => 'code', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $priority = [ - 'attribute_code' => 'priority', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $position = [ - 'attribute_code' => 'position', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $tax_rate = [ - 'attribute_code' => 'tax_rate', - 'backend_type' => 'virtual', - 'source' => 'Magento\Tax\Test\Fixture\TaxRule\TaxRate', - ]; - - protected $tax_customer_class = [ - 'attribute_code' => 'tax_customer_class', - 'backend_type' => 'virtual', - 'source' => 'Magento\Tax\Test\Fixture\TaxRule\TaxClass', - ]; - - protected $tax_product_class = [ - 'attribute_code' => 'tax_product_class', - 'backend_type' => 'virtual', - 'source' => 'Magento\Tax\Test\Fixture\TaxRule\TaxClass', - ]; - - public function getTaxCalculationRuleId() - { - return $this->getData('tax_calculation_rule_id'); - } - - public function getCode() - { - return $this->getData('code'); - } - - public function getPriority() - { - return $this->getData('priority'); - } - - public function getPosition() - { - return $this->getData('position'); - } - - public function getTaxRate() - { - return $this->getData('tax_rate'); - } - - public function getTaxCustomerClass() - { - return $this->getData('tax_customer_class'); - } - - public function getTaxProductClass() - { - return $this->getData('tax_product_class'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index 75eb83515fb81..a46074fcc5bbc 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_Tax flat tax_calculation_rule @@ -18,7 +20,7 @@ tax_calculation_rule_id int 1 - + @@ -32,14 +34,14 @@ priority int - + position int - + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php deleted file mode 100644 index 8d8459e15baad..0000000000000 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php +++ /dev/null @@ -1,118 +0,0 @@ - 'Main Website/Main Website Store/Default Store View', - 'request_path' => 'test_request%isolation%', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => 'Default Store View', - 'source' => 'Magento\UrlRewrite\Test\Fixture\UrlRewrite\StoreId', - 'input' => 'select', - ]; - - protected $redirect_type = [ - 'attribute_code' => 'redirect_type', - 'backend_type' => 'int', - 'is_required' => '0', - 'input' => 'select', - ]; - - protected $request_path = [ - 'attribute_code' => 'request_path', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => 'request_path%isolation%', - 'input' => 'text', - ]; - - protected $entity_type = [ - 'attribute_code' => 'entity_type', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'text', - ]; - - protected $target_path = [ - 'attribute_code' => 'target_path', - 'backend_type' => 'varchar', - 'is_required' => '1', - 'default_value' => 'target_path%isolation%', - 'input' => 'text', - 'source' => 'Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'input' => 'text', - ]; - - public function getId() - { - return $this->getData('id'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getRedirectType() - { - return $this->getData('redirect_type'); - } - - public function getRequestPath() - { - return $this->getData('request_path'); - } - - public function getEntityType() - { - return $this->getData('entity_type'); - } - - public function getTargetPath() - { - return $this->getData('target_path'); - } - - public function getDescription() - { - return $this->getData('description'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index d1b089e1eb780..23f0067b04a7e 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_UrlRewrite virtual url_rewrite @@ -43,7 +45,7 @@ entity_type varchar 0 - + text diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php deleted file mode 100644 index f88d9fa29c099..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php +++ /dev/null @@ -1,184 +0,0 @@ - 'AdminRole%isolation%', - 'resource_access' => 'All', - ]; - - protected $role_id = [ - 'attribute_code' => 'role_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $parent_id = [ - 'attribute_code' => 'parent_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $tree_level = [ - 'attribute_code' => 'tree_level', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $sort_order = [ - 'attribute_code' => 'sort_order', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $role_type = [ - 'attribute_code' => 'role_type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $user_id = [ - 'attribute_code' => 'user_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $rolename = [ - 'attribute_code' => 'rolename', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'role-info', - ]; - - protected $user_type = [ - 'attribute_code' => 'user_type', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $resource_access = [ - 'attribute_code' => 'resource_access', - 'backend_type' => 'virtual', - 'group' => 'role-resources', - ]; - - protected $roles_resources = [ - 'attribute_code' => 'roles_resources', - 'backend_type' => 'virtual', - 'group' => 'role-resources', - ]; - - protected $in_role_users = [ - 'attribute_code' => 'in_role_users', - 'backend_type' => 'virtual', - 'group' => 'in_role_users', - 'source' => 'Magento\User\Test\Fixture\AdminUserRole\InRoleUsers', - ]; - - public function getRoleId() - { - return $this->getData('role_id'); - } - - public function getParentId() - { - return $this->getData('parent_id'); - } - - public function getTreeLevel() - { - return $this->getData('tree_level'); - } - - public function getSortOrder() - { - return $this->getData('sort_order'); - } - - public function getRoleType() - { - return $this->getData('role_type'); - } - - public function getUserId() - { - return $this->getData('user_id'); - } - - public function getRoleName() - { - return $this->getData('rolename'); - } - - public function getUserType() - { - return $this->getData('user_type'); - } - - public function getGwsIsAll() - { - return $this->getData('gws_is_all'); - } - - public function getGwsWebsites() - { - return $this->getData('gws_websites'); - } - - public function getGwsStoreGroups() - { - return $this->getData('gws_store_groups'); - } - - public function getResourceAccess() - { - return $this->getData('resource_access'); - } - - public function getRolesResources() - { - return $this->getData('roles_resources'); - } - - public function getInRoleUsers() - { - return $this->getData('in_role_users'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index 21e8ebbefc6bb..accb13f5bad4f 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_User flat authorization_role @@ -17,7 +19,7 @@ role_id int 1 - + @@ -67,7 +69,7 @@ user_type varchar - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php deleted file mode 100644 index 7871ca78f06f4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php +++ /dev/null @@ -1,291 +0,0 @@ - 'AdminUser%isolation%', - 'firstname' => 'FirstName%isolation%', - 'lastname' => 'LastName%isolation%', - 'email' => 'email%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'current_password' => '%current_password%', - 'is_active' => 'Active', - ]; - - protected $user_id = [ - 'attribute_code' => 'user_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $firstname = [ - 'attribute_code' => 'firstname', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'user-info', - ]; - - protected $lastname = [ - 'attribute_code' => 'lastname', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'user-info', - ]; - - protected $email = [ - 'attribute_code' => 'email', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'user-info', - ]; - - protected $username = [ - 'attribute_code' => 'username', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'user-info', - ]; - - protected $password = [ - 'attribute_code' => 'password', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'user-info', - ]; - - protected $created = [ - 'attribute_code' => 'created', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => 'CURRENT_TIMESTAMP', - 'input' => '', - ]; - - protected $modified = [ - 'attribute_code' => 'modified', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $logdate = [ - 'attribute_code' => 'logdate', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $lognum = [ - 'attribute_code' => 'lognum', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $reload_acl_flag = [ - 'attribute_code' => 'reload_acl_flag', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '1', - 'input' => '', - ]; - - protected $extra = [ - 'attribute_code' => 'extra', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $rp_token = [ - 'attribute_code' => 'rp_token', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $rp_token_created_at = [ - 'attribute_code' => 'rp_token_created_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $interface_locale = [ - 'attribute_code' => 'interface_locale', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => 'en_US', - 'input' => '', - ]; - - protected $role_id = [ - 'attribute_code' => 'role_id', - 'backend_type' => 'virtual', - 'group' => 'user-role', - 'source' => 'Magento\User\Test\Fixture\User\RoleId', - ]; - - protected $password_confirmation = [ - 'attribute_code' => 'password_confirmation', - 'backend_type' => 'virtual', - 'group' => 'user-info', - ]; - - protected $current_password = [ - 'attribute_code' => 'current_password', - 'backend_type' => 'virtual', - 'group' => 'user-info', - 'source' => 'Magento\User\Test\Fixture\User\CurrentPassword', - ]; - - public function getUserId() - { - return $this->getData('user_id'); - } - - public function getFirstname() - { - return $this->getData('firstname'); - } - - public function getLastname() - { - return $this->getData('lastname'); - } - - public function getEmail() - { - return $this->getData('email'); - } - - public function getUsername() - { - return $this->getData('username'); - } - - public function getPassword() - { - return $this->getData('password'); - } - - public function getCreated() - { - return $this->getData('created'); - } - - public function getModified() - { - return $this->getData('modified'); - } - - public function getLogdate() - { - return $this->getData('logdate'); - } - - public function getLognum() - { - return $this->getData('lognum'); - } - - public function getReloadAclFlag() - { - return $this->getData('reload_acl_flag'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getExtra() - { - return $this->getData('extra'); - } - - public function getRpToken() - { - return $this->getData('rp_token'); - } - - public function getRpTokenCreatedAt() - { - return $this->getData('rp_token_created_at'); - } - - public function getInterfaceLocale() - { - return $this->getData('interface_locale'); - } - - public function getRoleId() - { - return $this->getData('role_id'); - } - - public function getPasswordConfirmation() - { - return $this->getData('password_confirmation'); - } - - public function getCurrentPassword() - { - return $this->getData('current_password'); - } -} diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index 7ca194f28da15..5363e6ad51721 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -5,7 +5,9 @@ * See COPYING.txt for license details. */ --> - + Magento_User flat admin_user @@ -17,7 +19,7 @@ user_id int 1 - + @@ -71,14 +73,14 @@ modified timestamp - + logdate timestamp - + @@ -106,21 +108,21 @@ extra text - + rp_token text - + rp_token_created_at timestamp - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php new file mode 100644 index 0000000000000..85c560b46bd50 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php @@ -0,0 +1,73 @@ +params = $params; + /** @var \Mtf\System\Config $systemConfig */ + $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config'); + $superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password'); + $this->data = $data == '%current_password%' ? $superAdminPassword : $data; + } + + /** + * Persist user role. + * + * @return void + */ + public function persist() + { + // + } + + /** + * Return prepared data set. + * + * @param string $key [optional] + * @return string|null + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getData($key = null) + { + return $this->data; + } + + /** + * Return data set configuration settings. + * + * @return array + */ + public function getDataConfig() + { + return $this->params; + } +} From ffea6c8bdc7bad4cef935af4b9f45d61bc507390 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Fri, 16 Jan 2015 10:11:37 +0200 Subject: [PATCH 10/29] MTA-1316: Apply fixture changes to Magento - Convert old Magento 2 fixture to new format - Fixed default value format --- .../Test/Fixture/CatalogProductSimple.xml | 4 +- .../Test/Fixture/CatalogProductVirtual.xml | 4 +- .../CatalogRule/Test/Fixture/CatalogRule.xml | 8 +- .../Fixture/ConfigurableProductInjectable.xml | 4 +- .../ConfigurableProductInjectable.xml | 403 +++++++++--------- .../Fixture/DownloadableProductInjectable.xml | 4 +- .../Test/Fixture/GroupedProductInjectable.xml | 4 +- .../Magento/Review/Test/Fixture/Review.xml | 14 +- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 8 +- 9 files changed, 227 insertions(+), 226 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 53e6fab28cb31..56b4e0cf70097 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -416,8 +416,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 34674a7a057ba..d36ab0c269ee3 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -426,8 +426,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index cb3897e8aaad3..8ca9145fc3324 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -41,8 +41,8 @@ website_ids smallint 1 - - Main Website + + Main Website multiselect rule_information @@ -51,8 +51,8 @@ customer_group_ids smallint 1 - - NOT LOGGED IN + + NOT LOGGED IN multiselect rule_information diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index fe461f2ab4b2c..dafb115f91a5f 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -454,8 +454,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml index a29242b3347a8..21dad1e386fe9 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -1,207 +1,208 @@ - - - Test configurable product %isolation% - sku_test_configurable_product_%isolation% - - 120 - - 30 - Product online - Catalog, Search - - taxable_goods - - configurable-product-%isolation% - - default - - - In Stock - - - Main Website - - - default - - - default - - - - Test configurable product with size %isolation% - sku_test_configurable_product_%isolation% - - 120 - - 30 - Product online - Catalog, Search - - taxable_goods - - configurable-product-%isolation% - - size - - - In Stock - - - Main Website - - - default - - - default - - - - Test configurable product with color and size %isolation% - sku_test_configurable_product_%isolation% - - 120 - - 30 - Product online - Catalog, Search - - taxable_goods - - configurable-product-%isolation% - - color_and_size - - - In Stock - - - Main Website - - - default - - - default - - - - Test configurable product %isolation% - sku_test_configurable_product_%isolation% - - 120 - - 30 - Product online - Catalog, Search - - taxable_goods - - test-configurable-product-%isolation% - - one_variation - - - In Stock - - - Main Website - - - default - - - - Test configurable product %isolation% - sku_test_configurable_product_%isolation% - - 120 - - No - 30 - Product online - Catalog, Search - - taxable_goods - - configurable-product-%isolation% - - default - - - In Stock - - - Main Website - - - default - - - default - - - - Test configurable product %isolation% - sku_test_configurable_product_%isolation% - - 10 - - 30 - Product online - Catalog, Search - - taxable_goods - - configurable-product-%isolation% - - with_one_option - - - In Stock - - - Main Website - - - default - - - with_one_option - - - - Test configurable product %isolation% - sku_test_configurable_product_%isolation% - - 120 - - 30 - Product online - Catalog, Search - - taxable_goods - - test-configurable-product-%isolation% - - with_out_of_stock_item - - - In Stock - - - Main Website - - - default - - + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + default + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product with size %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + size + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product with color and size %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + color_and_size + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + test-configurable-product-%isolation% + + one_variation + + + In Stock + + + Main Website + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + No + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + default + + + In Stock + + + Main Website + + + default + + + default + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 10 + + 30 + Product online + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + with_one_option + + + In Stock + + + Main Website + + + default + + + with_one_option + + + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + 120 + + 30 + Product online + Catalog, Search + + taxable_goods + + test-configurable-product-%isolation% + + with_out_of_stock_item + + + In Stock + + + Main Website + + + default + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 53e5cdadc757f..7ebcc46937068 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -495,8 +495,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index 6e0bd0be5e2bf..282943e05cd8f 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -351,8 +351,8 @@ website_ids virtual - - Main Website + + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index 5473598ecb2ae..b27e51e9c407b 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -102,8 +102,8 @@ select_stores virtual 1 - - Main Website/Main Website Store/Default Store View + + Main Website/Main Website Store/Default Store View multiselectgrouplist @@ -111,11 +111,11 @@ ratings virtual Magento\Review\Test\Fixture\Review\Ratings - - - visibleOnDefaultWebsite - 4 - + + + visibleOnDefaultWebsite + 4 + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index a46074fcc5bbc..462c9003c09be 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -48,10 +48,10 @@ tax_rate virtual Magento\Tax\Test\Fixture\TaxRule\TaxRate - - - US-CA-Rate_1 - + + + US-CA-Rate_1 + From a05d9c65317de10325c5246c36d449a6aebcd393 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Fri, 16 Jan 2015 13:39:14 +0200 Subject: [PATCH 11/29] MTA-1316: Apply fixture changes to Magento - Fixed xml code style --- .../Backend/Test/Fixture/GlobalSearch.xml | 4 +- .../Bundle/Test/Fixture/BundleProduct.xml | 140 ++-- .../Bundle/Test/Repository/BundleProduct.php | 122 ---- .../Bundle/Test/Repository/BundleProduct.xml | 27 +- .../Test/Fixture/CatalogAttributeSet.xml | 34 +- .../Test/Fixture/CatalogProductAttribute.xml | 226 +++---- .../Test/Fixture/CatalogProductSimple.xml | 137 ++-- .../Test/Fixture/CatalogProductVirtual.xml | 116 ++-- .../Magento/Catalog/Test/Fixture/Category.xml | 96 +-- .../Test/Repository/CatalogAttributeSet.php | 45 -- .../Test/Repository/CatalogAttributeSet.xml | 8 +- .../Test/Repository/CatalogCategory.xml | 52 -- .../Repository/CatalogProductAttribute.php | 140 ---- .../Repository/CatalogProductAttribute.xml | 40 +- .../Test/Repository/CatalogProductSimple.php | 629 ------------------ .../Test/Repository/CatalogProductSimple.xml | 191 +++--- .../Test/Repository/CatalogProductVirtual.php | 99 --- .../Test/Repository/CatalogProductVirtual.xml | 19 +- .../Catalog/Test/Repository/Category.php | 66 -- .../Catalog/Test/Repository/Category.xml | 55 +- .../Test/Repository/ConfigData.xml | 3 + .../CatalogRule/Test/Fixture/CatalogRule.xml | 39 +- .../Test/Repository/CatalogRule.php | 92 --- .../Test/Repository/CatalogRule.xml | 53 +- .../CatalogRule/Test/etc/constraint.xml | 38 +- .../Test/Fixture/CatalogSearchQuery.xml | 68 +- .../Test/Repository/CatalogSearchQuery.php | 35 - .../Test/Repository/CatalogSearchQuery.xml | 2 +- .../Magento/Checkout/Test/Fixture/Cart.xml | 318 ++++----- .../Fixture/ConfigurableProductInjectable.xml | 126 ++-- .../ConfigurableProductInjectable.php | 153 ----- .../ConfigurableProductInjectable.xml | 6 + .../Magento/Core/Test/Fixture/ConfigData.xml | 2 +- .../Core/Test/Fixture/SystemVariable.xml | 44 +- .../Core/Test/Repository/SystemVariable.php | 33 - .../Core/Test/Repository/SystemVariable.xml | 6 +- .../Test/Fixture/AddressInjectable.xml | 54 +- .../Test/Fixture/CustomerGroupInjectable.xml | 8 +- .../Test/Fixture/CustomerInjectable.xml | 60 +- .../Test/Repository/AddressInjectable.php | 265 -------- .../Test/Repository/AddressInjectable.xml | 53 +- .../Repository/CustomerGroupInjectable.php | 54 -- .../Repository/CustomerGroupInjectable.xml | 14 +- .../Test/Repository/CustomerInjectable.php | 120 ---- .../Test/Repository/CustomerInjectable.xml | 29 +- .../app/Magento/Customer/Test/etc/curl/di.xml | 4 +- .../Dhl/Test/Repository/ConfigData.xml | 1 + .../Fixture/DownloadableProductInjectable.xml | 144 ++-- .../DownloadableProductInjectable.php | 78 --- .../DownloadableProductInjectable.xml | 10 +- .../Fedex/Test/Repository/ConfigData.xml | 1 + .../GiftMessage/Test/Fixture/GiftMessage.xml | 42 +- .../Test/Repository/GiftMessage.php | 32 - .../Test/Repository/GiftMessage.xml | 2 +- .../Test/Fixture/GoogleShoppingAttribute.xml | 2 +- .../Repository/GoogleShoppingAttribute.php | 33 - .../Repository/GoogleShoppingAttribute.xml | 9 +- .../Test/Fixture/GroupedProductInjectable.xml | 108 +-- .../Repository/GroupedProductInjectable.php | 93 --- .../Repository/GroupedProductInjectable.xml | 19 +- .../Test/Fixture/ImportExport.xml | 26 +- .../Magento/Install/Test/Fixture/Install.xml | 44 +- .../Integration/Test/Fixture/Integration.xml | 146 ++-- .../Test/Repository/Integration.php | 44 -- .../Test/Repository/Integration.xml | 24 +- .../Newsletter/Test/Fixture/Template.xml | 76 +-- .../Newsletter/Test/Repository/Template.php | 33 - .../Newsletter/Test/Repository/Template.xml | 2 +- .../Test/Repository/ConfigData.xml | 15 + .../Test/Repository/ConfigData.xml | 5 + .../Magento/Review/Test/Fixture/Rating.xml | 34 +- .../Magento/Review/Test/Fixture/Review.xml | 76 +-- .../Magento/Review/Test/Repository/Rating.php | 38 -- .../Magento/Review/Test/Repository/Rating.xml | 9 +- .../Magento/Review/Test/Repository/Review.xml | 17 - .../Test/Repository/ReviewInjectable.xml | 11 +- .../Magento/Review/Test/etc/constraint.xml | 4 +- .../app/Magento/Review/Test/etc/curl/di.xml | 4 +- .../Shipping/Test/Repository/ConfigData.xml | 1 + .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 38 +- .../Sitemap/Test/Repository/Sitemap.php | 30 - .../Sitemap/Test/Repository/Sitemap.xml | 2 +- .../app/Magento/Store/Test/Fixture/Store.xml | 34 +- .../Magento/Store/Test/Fixture/StoreGroup.xml | 24 +- .../Magento/Store/Test/Fixture/Website.xml | 38 +- .../Magento/Store/Test/Repository/Store.php | 58 -- .../Magento/Store/Test/Repository/Store.xml | 39 +- .../Store/Test/Repository/StoreGroup.php | 47 -- .../Store/Test/Repository/StoreGroup.xml | 5 +- .../Magento/Store/Test/Repository/Website.php | 43 -- .../Magento/Store/Test/Repository/Website.xml | 8 +- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 22 +- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 58 +- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 32 +- .../Tax/Test/Repository/ConfigData.xml | 22 + .../Magento/Tax/Test/Repository/TaxClass.php | 60 -- .../Magento/Tax/Test/Repository/TaxClass.xml | 21 +- .../Magento/Tax/Test/Repository/TaxRate.php | 174 ----- .../Magento/Tax/Test/Repository/TaxRate.xml | 62 +- .../Magento/Tax/Test/Repository/TaxRule.php | 166 ----- .../Magento/Tax/Test/Repository/TaxRule.xml | 80 ++- .../Ups/Test/Repository/ConfigData.xml | 1 + .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 16 +- .../UrlRewrite/Test/Repository/UrlRewrite.php | 46 -- .../UrlRewrite/Test/Repository/UrlRewrite.xml | 8 +- .../UrlRewrite/Test/etc/constraint.xml | 34 +- .../User/Test/Fixture/AdminUserRole.xml | 54 +- .../app/Magento/User/Test/Fixture/User.xml | 102 +-- .../User/Test/Repository/AdminUserRole.xml | 11 - .../app/Magento/User/Test/Repository/User.php | 60 -- .../app/Magento/User/Test/Repository/User.xml | 8 +- .../app/Magento/User/Test/etc/curl/di.xml | 4 +- .../Usps/Test/Repository/ConfigData.xml | 1 + 113 files changed, 1900 insertions(+), 4616 deletions(-) delete mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml delete mode 100755 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php delete mode 100755 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php delete mode 100755 dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php delete mode 100644 dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php delete mode 100644 dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php delete mode 100644 dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php delete mode 100644 dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php delete mode 100644 dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php delete mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php delete mode 100755 dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php delete mode 100644 dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml delete mode 100644 dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php delete mode 100644 dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php delete mode 100644 dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php delete mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml delete mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index dd6bc8b4ef8a2..ee925127bbe01 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -7,10 +7,10 @@ --> + class="Magento\Backend\Test\Fixture\GlobalSearch"> Magento_Backend - + query virtual Magento\Backend\Test\Fixture\GlobalSearch\Query diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 97b164bc4693d..cddc50c05fb1d 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -7,7 +7,7 @@ --> + class="Magento\Bundle\Test\Fixture\BundleProduct"> Magento_Bundle eav catalog_product @@ -16,7 +16,7 @@ sku Magento\Bundle\Test\Repository\BundleProduct Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface - + bundle bundle @@ -25,7 +25,7 @@ product - + category_ids static 0 @@ -34,49 +34,49 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + country_of_manufacture varchar 0 select - + created_at static 1 text - + custom_design varchar 0 select - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 @@ -84,21 +84,21 @@ textarea product-details - + enable_googlecheckout int 0 1 select - + gallery varchar 0 gallery - + gift_message_available varchar 0 @@ -106,7 +106,7 @@ select autosettings - + use_config_gift_message_available varchar 0 @@ -114,7 +114,7 @@ checkbox autosettings - + group_price decimal 0 @@ -123,77 +123,77 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + media_gallery varchar 0 gallery - + meta_description varchar 0 textarea - + meta_keyword text 0 textarea - + meta_title varchar 0 text - + minimal_price decimal 0 price - + msrp decimal 0 price - + msrp_display_actual_price_type varchar 0 4 select - + name varchar 1 @@ -201,42 +201,42 @@ text product-details - + news_from_date datetime 0 date - + news_to_date datetime 0 date - + old_id int 0 text - + options_container varchar 0 container2 select - + page_layout varchar 0 select - + price decimal 1 @@ -245,7 +245,7 @@ Magento\Bundle\Test\Fixture\BundleProduct\Price product-details - + price_from decimal 1 @@ -253,7 +253,7 @@ price product-details - + price_to decimal 1 @@ -261,7 +261,7 @@ price product-details - + price_type int 1 @@ -269,7 +269,7 @@ select product-details - + status int 0 @@ -277,7 +277,7 @@ checkbox product-details - + price_view int 1 @@ -285,7 +285,7 @@ select advanced-pricing - + quantity_and_stock_status int 0 @@ -293,24 +293,24 @@ select product-details - + required_options static 0 text - + use_config_manage_stock checkbox advanced-inventory - + manage_stock select advanced-inventory - + shipment_type int 1 @@ -318,7 +318,7 @@ select product-details - + short_description text 0 @@ -326,7 +326,7 @@ textarea autosettings - + sku static 1 @@ -334,7 +334,7 @@ text product-details - + sku_type int 1 @@ -342,7 +342,7 @@ select product-details - + weight_type int 1 @@ -350,7 +350,7 @@ select product-details - + weight decimal 0 @@ -358,21 +358,21 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + special_price decimal 0 @@ -380,7 +380,7 @@ price advanced-pricing - + special_from_date data 0 @@ -389,7 +389,7 @@ advanced-pricing Magento\Backend\Test\Fixture\Source\Date - + special_to_date data 0 @@ -398,7 +398,7 @@ advanced-pricing Magento\Backend\Test\Fixture\Source\Date - + tax_class_id int 0 @@ -407,21 +407,21 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + tier_price decimal 0 @@ -430,14 +430,14 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - + updated_at static 1 text - + url_key varchar 0 @@ -445,14 +445,14 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 @@ -460,50 +460,50 @@ select autosettings - + id virtual - + bundle_selections virtual 1 bundle Magento\Bundle\Test\Fixture\BundleProduct\BundleSelections - + checkout_data virtual 1 null Magento\Bundle\Test\Fixture\BundleProduct\CheckoutData - + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - + type_id virtual - + new_variations_attribute_set_id - + affect_bundle_product_selection - + stock_data advanced-inventory - + category_id product-details - + website_ids virtual diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php deleted file mode 100644 index 3f66ba98f02eb..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php +++ /dev/null @@ -1,122 +0,0 @@ -_data['BundleDynamic_sku_1073507449'] = [ - 'sku' => 'BundleDynamic_sku_10735074493', - 'name' => 'BundleDynamic 1073507449', - 'price' => [ - 'price_from' => 1, - 'price_to' => 2, - ], - 'short_description' => '', - 'description' => '', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'sku_type' => '0', - 'price_type' => '0', - 'weight_type' => '0', - 'status' => 'Product online', - 'shipment_type' => '1', - 'url_key' => 'bundle-dynamic-product-%isolation%', - 'mtf_dataset_name' => 'BundleDynamic_sku_1073507449', - 'website_ids' => ['Main Website'], - ]; - - $this->_data['BundleDynamic_sku_215249172'] = [ - 'sku' => 'BundleDynamic_sku_215249172', - 'name' => 'BundleDynamic 215249172', - 'price' => [ - 'price_from' => 3, - 'price_to' => 4, - ], - 'short_description' => '', - 'description' => '', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'sku_type' => '0', - 'weight_type' => '0', - 'price_type' => '0', - 'shipment_type' => '1', - 'url_key' => 'bundle-dynamic-product-%isolation%', - 'mtf_dataset_name' => 'BundleDynamic_sku_215249172', - 'website_ids' => ['Main Website'], - ]; - - $this->_data['bundle_dynamic_product'] = [ - 'name' => 'Bundle dynamic product %isolation%', - 'sku' => 'sku_bundle_dynamic_product_%isolation%', - 'sku_type' => 'Dynamic', - 'price_type' => 'Dynamic', - 'price' => ['value' => '-', 'preset' => 'default_dynamic'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight_type' => 'Dynamic', - 'shipment_type' => 'Separately', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'stock_data' => [ - 'manage_stock' => 'Yes', - 'use_config_enable_qty_increments' => 'Yes', - 'use_config_qty_increments' => 'Yes', - 'is_in_stock' => 'In Stock', - ], - 'url_key' => 'bundle-dynamic-product-%isolation%', - 'visibility' => 'Catalog, Search', - 'bundle_selections' => ['preset' => 'default_dynamic'], - 'attribute_set_id' => 'Default', - 'checkout_data' => ['preset' => 'default_dynamic'], - ]; - - $this->_data['bundle_fixed_product'] = [ - 'name' => 'Bundle fixed product %isolation%', - 'sku' => 'sku_bundle_fixed_product_%isolation%', - 'sku_type' => 'Fixed', - 'price_type' => 'Fixed', - 'price' => ['value' => 750.00, 'preset' => 'default_fixed'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1.0000, - 'weight_type' => 'Fixed', - 'status' => 'Product online', - 'shipment_type' => 'Together', - 'website_ids' => ['Main Website'], - 'stock_data' => [ - 'manage_stock' => 'Yes', - 'use_config_enable_qty_increments' => 'Yes', - 'use_config_qty_increments' => 'Yes', - 'is_in_stock' => 'In Stock', - ], - 'url_key' => 'bundle-fixed-product-%isolation%', - 'visibility' => 'Catalog, Search', - 'bundle_selections' => ['preset' => 'default_fixed'], - 'attribute_set_id' => 'Default', - 'checkout_data' => ['preset' => 'default_fixed'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml index c70d99020c6a6..9feb33d25afcb 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -7,15 +7,15 @@ --> - + BundleDynamic_sku_10735074493 BundleDynamic 1073507449 1 2 - - + + taxable_goods @@ -27,18 +27,19 @@ bundle-dynamic-product-%isolation% BundleDynamic_sku_1073507449 - Main Website + Main Website - + + BundleDynamic_sku_215249172 BundleDynamic 215249172 3 4 - - + + taxable_goods @@ -49,10 +50,11 @@ bundle-dynamic-product-%isolation% BundleDynamic_sku_215249172 - Main Website + Main Website - + + Bundle dynamic product %isolation% sku_bundle_dynamic_product_%isolation% Dynamic @@ -71,7 +73,7 @@ taxable_goods - Main Website + Main Website Yes @@ -89,7 +91,8 @@ default_dynamic - + + Bundle fixed product %isolation% sku_bundle_fixed_product_%isolation% Fixed @@ -110,7 +113,7 @@ Product online Together - Main Website + Main Website Yes diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index b3f2fdcba99f5..0470a2ebc45f8 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -7,7 +7,7 @@ --> + class="Magento\Catalog\Test\Fixture\CatalogAttributeSet"> Magento_Catalog flat eav_attribute_set @@ -15,50 +15,50 @@ Magento\Catalog\Test\Repository\CatalogAttributeSet Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface - + attribute_set_id smallint 1 - + - + entity_type_id smallint - + 0 - + - + attribute_set_name varchar - + Default_attribute_set_%isolation% - + - + sort_order smallint - + 0 - + - + skeleton_set varchar - + default - + Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet - + assigned_attributes virtual Magento\Catalog\Test\Fixture\CatalogAttributeSet\AssignedAttributes - + group virtual diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index 1726d525669f9..9e7b1079687d3 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -7,7 +7,7 @@ --> + class="Magento\Catalog\Test\Fixture\CatalogProductAttribute"> Magento_Catalog composite @@ -18,301 +18,301 @@ Magento\Catalog\Test\Repository\CatalogProductAttribute Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface - + attribute_id smallint 1 - + - + entity_type_id smallint - + 0 - + - + attribute_code varchar - + - + advanced-properties - + attribute_model varchar - + - + - + backend_model varchar - + - + - + backend_type varchar - + static - + - + backend_table varchar - + - + - + frontend_model varchar - + - + - + frontend_input varchar - + Text Field select properties - + frontend_label varchar - + attribute_label%isolation% - + properties - + manage_frontend_label varchar - + - + manage-labels - + frontend_class varchar - + - + - + source_model varchar - + - + - + is_required smallint - + No select properties - + is_user_defined smallint - + 0 - + - + is_unique smallint - + 0 - + advanced-properties - + note varchar - + - + - + frontend_input_renderer varchar - + - + - + is_global smallint - + 1 - + advanced-properties - + is_visible smallint - + 1 - + - + is_searchable smallint - + 0 - + frontend-properties - + is_filterable smallint - + 0 - + frontend-properties - + is_comparable smallint - + 0 - + frontend-properties - + is_visible_on_front smallint - + 0 - + frontend-properties - + is_html_allowed_on_front smallint - + 0 - + frontend-properties - + is_used_for_price_rules smallint - + 0 - + frontend-properties - + is_filterable_in_search smallint - + 0 - + frontend-properties - + used_in_product_listing smallint - + 0 - + frontend-properties - + used_for_sort_by smallint - + 0 - + frontend-properties - + apply_to varchar - + - + - + is_visible_in_advanced_search smallint - + 0 - + frontend-properties - + position int - + 0 - + - + is_wysiwyg_enabled smallint - + 0 - + - + is_used_for_promo_rules smallint - + 0 - + - + is_configurable smallint - + - + advanced-properties - + search_weight smallint - + 1 - + - + options smallint - + - + Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options - + default_value_text text advanced-properties - + default_value_textarea text advanced-properties - + default_value_date text advanced-properties Magento\Backend\Test\Fixture\Source\Date - + default_value_yesno text advanced-properties diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 56b4e0cf70097..59f4411343db6 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -7,7 +7,7 @@ --> + class="Magento\Catalog\Test\Fixture\CatalogProductSimple"> Magento_Catalog eav catalog_product @@ -15,8 +15,9 @@ Magento\Catalog\Model\Resource\Product\Collection sku Magento\Catalog\Test\Repository\CatalogProductSimple - Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface - + Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface + + simple simple @@ -25,7 +26,7 @@ product - + category_ids static 0 @@ -34,56 +35,56 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + color int 0 select - + country_of_manufacture varchar 0 select - + created_at static 1 text - + custom_design varchar 0 select - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 @@ -91,21 +92,21 @@ textarea product-details - + gallery varchar 0 gallery - + gift_message_available varchar 0 select - + group_price decimal 0 @@ -114,42 +115,42 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + manufacturer int 0 select - + media_gallery varchar 0 gallery - + meta_description varchar 0 @@ -157,7 +158,7 @@ search-engine-optimization textarea - + meta_keyword text 0 @@ -165,7 +166,7 @@ search-engine-optimization textarea - + meta_title varchar 0 @@ -173,28 +174,28 @@ search-engine-optimization text - + minimal_price decimal 0 price - + msrp decimal 0 price - + msrp_display_actual_price_type varchar 0 Use config select - + name varchar 1 @@ -202,28 +203,28 @@ text product-details - + old_id int 0 text - + options_container varchar 0 Block after Info Column select - + page_layout varchar 0 select - + price decimal 1 @@ -234,7 +235,7 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - + quantity_and_stock_status array 0 @@ -242,17 +243,17 @@ 10 In Stock - + product-details - + required_options static 0 text - + sku static 1 @@ -260,28 +261,28 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + special_from_date datetime 0 date - + short_description text 0 @@ -289,7 +290,7 @@ textarea autosettings - + special_price decimal 0 @@ -297,14 +298,14 @@ price advanced-pricing - + special_to_date datetime 0 date - + status int 0 @@ -312,7 +313,7 @@ checkbox product-details - + tax_class_id int 0 @@ -321,21 +322,21 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + tier_price decimal 0 @@ -344,14 +345,14 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - + updated_at static 1 text - + url_key varchar 0 @@ -359,14 +360,14 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 @@ -374,7 +375,7 @@ select autosettings - + weight decimal 0 @@ -382,16 +383,16 @@ weight product-details - + id virtual null - + type_id virtual - + attribute_set_id virtual product-details @@ -400,20 +401,20 @@ default - + custom_attribute virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomAttribute - + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - + website_ids virtual @@ -421,7 +422,7 @@ websites - + is_returnable varchar 0 @@ -429,7 +430,7 @@ select autosettings - + news_from_date datetime 0 @@ -437,7 +438,7 @@ date Magento\Backend\Test\Fixture\Source\Date - + news_to_date datetime 0 @@ -445,45 +446,45 @@ date Magento\Backend\Test\Fixture\Source\Date - + stock_data virtual advanced-inventory - + checkout_data virtual null Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData - + cross_sell_products virtual crosssells Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts - + up_sell_products virtual upsells Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts - + related_products virtual related-products Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts - + is_virtual virtual product-details - + attributes virtual - + fpt decimal 0 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index d36ab0c269ee3..d05a1e61c6507 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -7,7 +7,7 @@ --> + class="Magento\Catalog\Test\Fixture\CatalogProductVirtual"> Magento_Catalog eav catalog_product @@ -16,7 +16,7 @@ sku Magento\Catalog\Test\Repository\CatalogProductVirtual Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface - + virtual virtual @@ -25,13 +25,13 @@ product - + is_virtual virtual product-details Yes - + category_ids static 0 @@ -40,56 +40,56 @@ Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds product-details - + color int 0 select - + country_of_manufacture varchar 0 select - + created_at static 1 text - + custom_design varchar 0 select - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 @@ -97,21 +97,21 @@ textarea product-details - + gallery varchar 0 gallery - + gift_message_available varchar 0 select - + group_price decimal 0 @@ -120,42 +120,42 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + manufacturer int 0 select - + media_gallery varchar 0 gallery - + meta_description varchar 0 @@ -163,7 +163,7 @@ search-engine-optimization textarea - + meta_keyword text 0 @@ -171,7 +171,7 @@ search-engine-optimization textarea - + meta_title varchar 0 @@ -179,28 +179,28 @@ search-engine-optimization text - + minimal_price decimal 0 price - + msrp decimal 0 price - + msrp_display_actual_price_type varchar 0 Use config select - + name varchar 1 @@ -208,42 +208,42 @@ text product-details - + news_from_date datetime 0 date - + news_to_date datetime 0 date - + old_id int 0 text - + options_container varchar 0 Block after Info Column select - + page_layout varchar 0 select - + price decimal 1 @@ -254,7 +254,7 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - + quantity_and_stock_status int 0 @@ -265,14 +265,14 @@ select product-details - + required_options static 0 text - + sku static 1 @@ -280,28 +280,28 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + special_from_date datetime 0 date - + short_description text 0 @@ -309,7 +309,7 @@ textarea autosettings - + special_price decimal 0 @@ -317,14 +317,14 @@ price advanced-pricing - + special_to_date datetime 0 date - + status int 0 @@ -332,7 +332,7 @@ checkbox product-details - + tax_class_id int 0 @@ -341,21 +341,21 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + tier_price decimal 0 @@ -364,14 +364,14 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - + updated_at static 1 text - + url_key varchar 0 @@ -379,14 +379,14 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 @@ -394,7 +394,7 @@ select autosettings - + weight decimal 0 @@ -402,28 +402,28 @@ weight product-details - + id virtual - + type_id virtual - + attribute_set_id virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - + website_ids virtual @@ -431,7 +431,7 @@ websites - + checkout_data virtual null diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index 6e55586ff53dd..a26b1c1139678 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -7,7 +7,7 @@ --> + class="Magento\Catalog\Test\Fixture\Category"> Magento_Catalog eav catalog_category_entity @@ -15,95 +15,95 @@ Magento\Catalog\Test\Repository\Category Magento\Catalog\Test\Handler\Category\CategoryInterface - + entity_id int 1 - + - + entity_type_id smallint - + 0 - + - + attribute_set_id smallint - + 0 - + - + description text 0 textarea - + parent_id int - + 2 - + null Magento\Catalog\Test\Fixture\Category\ParentId - + created_at timestamp - + - + - + updated_at timestamp - + - + - + path varchar - + Default Category null - + - + position int - + - + - + level int - + 0 - + - + children_count int - + - + - + available_product_listing_config int - + display_setting checkbox - + available_sort_by varchar 0 @@ -111,7 +111,7 @@ display_setting multiselect - + default_product_listing_config varchar 0 @@ -119,7 +119,7 @@ display_setting checkbox - + default_sort_by varchar 0 @@ -127,62 +127,62 @@ display_setting select - + meta_title text - + - + general_information - + id virtual null - + name virtual general_information Category%isolation% - + is_active virtual general_information Yes - + is_anchor virtual display_setting - + url_key virtual general_information category%isolation% - + include_in_menu virtual general_information Yes - + landing_page virtual select display_setting \Magento\Catalog\Test\Fixture\Category\LandingPage - + display_mode virtual select display_setting - + category_products virtual category_products diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php deleted file mode 100644 index 87da5eb4b6f4b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php +++ /dev/null @@ -1,45 +0,0 @@ -_data['default'] = [ - 'attribute_set_name' => 'Default', - 'attribute_set_id' => 4, - ]; - - $this->_data['custom_attribute_set'] = [ - 'attribute_set_name' => 'Custom_attribute_set%isolation%', - 'skeleton_set' => ['dataSet' => 'default'], - ]; - - $this->_data['custom_attribute_set_with_fpt'] = [ - 'attribute_set_name' => 'Custom_attribute_set%isolation%', - 'skeleton_set' => ['dataSet' => 'default'], - 'assigned_attributes' => [ - 'presets' => 'attribute_type_fpt', - ], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml index 294c5cec5a627..af0c211e69118 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml @@ -7,17 +7,19 @@ --> - + Default 4 - + + Custom_attribute_set%isolation% default - + + Custom_attribute_set%isolation% default diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml deleted file mode 100644 index cda5a061ca949..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogCategory.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - Default Category - 1 - Yes - 2 - - - DefaultSubcategory%isolation% - default-subcategory-%isolation% - - default_category - - Yes - Yes - - - DefaultSubcategory%isolation% - default-subcategory-%isolation% - - default_category - - Yes - Yes - Yes - - - RootCategory%isolation% - root-category-%isolation% - 1 - Yes - Yes - - - RootSubCategory%isolation% - root-sub-category-%isolation% - - root_category - - Yes - Yes - - - diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php deleted file mode 100755 index fc5aacdd8e4f3..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php +++ /dev/null @@ -1,140 +0,0 @@ -_data['attribute_type_text_field'] = [ - 'frontend_label' => 'attribute_text%isolation%', - 'attribute_code' => 'attribute_text%isolation%', - 'frontend_input' => 'Text Field', - 'is_required' => 'No', - ]; - - $this->_data['attribute_type_dropdown'] = [ - 'frontend_label' => 'attribute_dropdown%isolation%', - 'attribute_code' => 'attribute_dropdown%isolation%', - 'frontend_input' => 'Dropdown', - 'is_required' => 'No', - 'is_configurable' => 'Yes', - 'options' => [ - [ - 'is_default' => 'Yes', - 'admin' => 'black', - 'view' => 'option_0_%isolation%', - ], - [ - 'is_default' => 'No', - 'admin' => 'white', - 'view' => 'option_1_%isolation%', - ], - [ - 'is_default' => 'No', - 'admin' => 'green', - 'view' => 'option_2_%isolation%', - ], - ], - ]; - - $this->_data['attribute_type_dropdown_two_options'] = [ - 'frontend_label' => 'attribute_dropdown%isolation%', - 'attribute_code' => 'attribute_dropdown%isolation%', - 'frontend_input' => 'Dropdown', - 'is_required' => 'No', - 'is_configurable' => 'Yes', - 'options' => [ - [ - 'is_default' => 'Yes', - 'admin' => 'black', - 'view' => 'option_0_%isolation%', - ], - [ - 'is_default' => 'No', - 'admin' => 'white', - 'view' => 'option_1_%isolation%', - ], - ], - ]; - - $this->_data['attribute_type_dropdown_one_option'] = [ - 'frontend_label' => 'attribute_dropdown%isolation%', - 'attribute_code' => 'attribute_dropdown%isolation%', - 'frontend_input' => 'Dropdown', - 'is_required' => 'No', - 'is_configurable' => 'Yes', - 'options' => [ - [ - 'is_default' => 'Yes', - 'admin' => 'black', - 'view' => 'option_0_%isolation%', - ], - ], - ]; - - $this->_data['color'] = [ - 'frontend_label' => 'color_%isolation%', - 'attribute_code' => 'color_%isolation%', - 'frontend_input' => 'Dropdown', - 'is_required' => 'No', - 'is_configurable' => 'Yes', - 'options' => [ - [ - 'is_default' => 'Yes', - 'admin' => 'black', - 'view' => 'black_%isolation%', - ], - [ - 'is_default' => 'No', - 'admin' => 'white', - 'view' => 'white_%isolation%', - ], - ], - ]; - - $this->_data['size'] = [ - 'frontend_label' => 'size_%isolation%', - 'attribute_code' => 'size_%isolation%', - 'frontend_input' => 'Dropdown', - 'is_required' => 'No', - 'is_configurable' => 'Yes', - 'options' => [ - [ - 'is_default' => 'Yes', - 'admin' => 'xl', - 'view' => 'xl_%isolation%', - ], - [ - 'is_default' => 'No', - 'admin' => 'xxl', - 'view' => 'xxl_%isolation%', - ], - ], - ]; - - $this->_data['attribute_type_fpt'] = [ - 'frontend_label' => 'fpt_%isolation%', - 'frontend_input' => 'Fixed Product Tax', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml index b389a42074cde..c8ee79fff6d2e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml @@ -7,108 +7,114 @@ --> - + attribute_text%isolation% attribute_text%isolation% Text Field No - + + attribute_dropdown%isolation% attribute_dropdown%isolation% Dropdown No Yes - + Yes black option_0_%isolation% - + No white option_1_%isolation% - + No green option_2_%isolation% - + + attribute_dropdown%isolation% attribute_dropdown%isolation% Dropdown No Yes - + Yes black option_0_%isolation% - + No white option_1_%isolation% - + + attribute_dropdown%isolation% attribute_dropdown%isolation% Dropdown No Yes - + Yes black option_0_%isolation% - + + color_%isolation% color_%isolation% Dropdown No Yes - + Yes black black_%isolation% - + No white white_%isolation% - + + size_%isolation% size_%isolation% Dropdown No Yes - + Yes xl xl_%isolation% - + No xxl xxl_%isolation% - + + fpt_%isolation% Fixed Product Tax diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php deleted file mode 100755 index e673616eae1e4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php +++ /dev/null @@ -1,629 +0,0 @@ -_data['default'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'is_virtual' => 'No', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - 'checkout_data' => ['preset' => 'order_default'], - ]; - - $this->_data['product_with_url_key'] = [ - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'is_virtual' => 'No', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'url_key' => 'simple-product-%isolation%', - 'price' => ['value' => 560.00, 'preset' => '-'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - ]; - - $this->_data['simple_big_qty'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 1000.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - 'checkout_data' => ['preset' => 'order_big_qty'], - ]; - - $this->_data['simple_for_sales'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - 'checkout_data' => ['preset' => 'order_custom_price'], - ]; - - $this->_data['product_100_dollar'] = [ - 'sku' => 'product_100_dollar%isolation%', - 'name' => 'product_100_dollar%isolation%', - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100, 'preset' => '-'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - 'checkout_data' => ['preset' => 'two_products'] - ]; - - $this->_data['product_40_dollar'] = [ - 'sku' => 'product_40_dollar%isolation%', - 'name' => 'product_40_dollar%isolation%', - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 40, 'preset' => '-'], - 'mtf_dataset_name' => 'product_40_dollar', - 'url_key' => 'simple-product-%isolation%', - 'website_ids' => ['Main Website'], - ]; - - $this->_data['MAGETWO-23036'] = [ - 'sku' => 'MAGETWO-23036_%isolation%', - 'name' => 'simple_with_category %isolation%', - 'attribute_set_id' => ['dataSet' => 'default'], - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'price' => ['value' => 100, 'preset' => 'MAGETWO-23036'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'mtf_dataset_name' => 'simple_with_category', - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_with_category'] = [ - 'sku' => 'simple_product_with_category_%isolation%', - 'name' => 'Simple product with category %isolation%', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100, 'preset' => ''], - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'mtf_dataset_name' => 'simple_with_category', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_for_salesrule_1'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 100, 'preset' => ''], - 'weight' => 100, - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - 'category_ids' => ['presets' => 'default_subcategory'] - ]; - - $this->_data['simple_for_composite_products'] = [ - 'name' => 'simple_for_composite_products%isolation%', - 'sku' => 'simple_for_composite_products%isolation%', - 'price' => ['value' => 560, 'preset' => '-'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 111, - 'is_in_stock' => 'In Stock', - ], - 'weight' => '1', - 'status' => '1', - 'website_ids' => ['Main Website'], - 'stock_data' => [ - 'manage_stock' => 'Yes', - 'qty' => '111', - 'is_in_stock' => 'In Stock' - ], - 'url_key' => 'simple-for-composite-products%isolation%', - 'visibility' => 'Catalog, Search' - ]; - - $this->_data['simple_for_salesrule_2'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 50, 'preset' => ''], - 'weight' => 50, - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - 'category_ids' => ['presets' => 'default_subcategory'] - ]; - - $this->_data['product_with_special_price_and_category'] = [ - 'sku' => 'simple_product_with_special_price_and_category%isolation%', - 'name' => 'Simple product with special price and category %isolation%', - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100, 'preset' => ''], - 'special_price' => 90, - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_with_special_price'] = [ - 'sku' => 'simple_product_with_special_price_and_category%isolation%', - 'name' => 'Simple with Special Price 1$ off %isolation%', - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 10, 'preset' => ''], - 'special_price' => 9, - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['adc_123_simple_for_advancedsearch'] = [ - 'name' => 'adc_123_%isolation%', - 'sku' => 'adc_123', - 'price' => ['value' => 100.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'None'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1.0000, - 'description' => '

dfj_full

', - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_with_weight_0_1'] = [ - 'name' => 'Simple with Weight 0.1 %isolation%', - 'sku' => 'adc_123', - 'price' => ['value' => 100.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'None'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 0.1, - 'description' => '

Simple with Weight 0.1

', - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_with_weight_150_1'] = [ - 'name' => 'Simple with Weight 150.1 %isolation%', - 'sku' => 'adc_123', - 'price' => ['value' => 100.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'None'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 150.1, - 'description' => '

Simple with Weight 150.1

', - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['abc_dfj_simple_for_advancedsearch'] = [ - 'name' => 'abc_dfj_%isolation%', - 'sku' => 'abc_dfj', - 'price' => ['value' => 50.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1.0000, - 'description' => '

adc_Full

', - 'status' => 'Product online', - 'short_description' => '

abc_short

', - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_100_dollar_for_tax_rule'] = [ - 'sku' => 'product_100_dollar%isolation%', - 'name' => 'product_100_dollar%isolation%', - 'attribute_set_id' => ['dataSet' => 'default'], - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'price' => ['value' => 100, 'preset' => '-'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['withSpecialPrice'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 100, 'preset' => '-'], - 'weight' => 1, - 'url_key' => 'simple-product-%isolation%', - 'special_price' => 9 - ]; - - $this->_data['simple_with_group_price'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 100, 'preset' => '-'], - 'weight' => 1, - 'group_price' => ['preset' => 'default'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_with_group_price_and_category'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 100, 'preset' => '-'], - 'weight' => 1, - 'group_price' => ['preset' => 'tax_calculation'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_with_tier_price'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'tier_price' => ['preset' => 'default'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_with_tier_price_and_category'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'tier_price' => ['preset' => 'default'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['with_two_custom_option'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'custom_options' => ['preset' => 'two_options'], - 'url_key' => 'simple-product-%isolation%', - 'checkout_data' => ['preset' => 'with_two_custom_option'] - ]; - - $this->_data['with_one_custom_option_and_category'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - 'category_ids' => ['presets' => 'default_subcategory'], - ]; - - $this->_data['with_all_custom_option'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product With Custom Option %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'url_key' => 'simple-product-%isolation%', - 'custom_options' => ['preset' => 'all_types'], - ]; - - $this->_data['low_stock_product'] = [ - 'sku' => 'low_stock_product%isolation%', - 'name' => 'low_stock_product%isolation%', - 'type_id' => 'simple', - 'quantity_and_stock_status' => [ - 'qty' => 1.0000, - 'is_in_stock' => 'In Stock', - ], - 'stock_data' => [ - 'use_config_notify_stock_qty' => 'No', - 'notify_stock_qty' => 2, - ], - 'weight' => 1, - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100, 'preset' => '-'], - 'website_ids' => ['Main Website'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['out_of_stock'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product out of stock %isolation%', - 'sku' => 'sku_simple_product_out_of_stock%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'Out of Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['offline'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product offline %isolation%', - 'sku' => 'sku_simple_product_offline_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - 'status' => 'Product offline', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['not_visible_individually'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product not visible %isolation%', - 'sku' => 'sku_simple_product_not_visible_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Not Visible Individually', - 'checkout_data' => ['preset' => 'order_default'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_with_cart_limits'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product with cart limit %isolation%', - 'sku' => 'sku_simple_product_with_cart_limit_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - 'stock_data' => [ - 'min_sale_qty' => '2', - 'max_sale_qty' => '5', - ], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['with_one_custom_option'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'url_key' => 'simple-product-%isolation%', - 'website_ids' => ['Main Website'] - ]; - - $this->_data['simple_with_qty_increments'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product with qty increments %isolation%', - 'sku' => 'sku_simple_product_with_qty_increments_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - 'stock_data' => [ - 'enable_qty_increments' => 'Yes', - 'qty_increments' => '2', - ], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['simple_with_tier_price_and_qty'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'url_key' => 'simple-product-%isolation%', - 'tier_price' => ['preset' => 'default'], - 'website_ids' => ['Main Website'] - ]; - - $this->_data['with_msrp'] = [ - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product with msrp %isolation%', - 'sku' => 'sku_simple_product_with_msrp_%isolation%', - 'weight' => 1, - 'quantity_and_stock_status' => [ - 'qty' => 25.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 560.00, 'preset' => '-'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'website_ids' => ['Main Website'], - 'visibility' => 'Catalog, Search', - 'checkout_data' => ['preset' => 'order_default'], - 'msrp' => 600.00, - 'msrp_display_actual_price_type' => 'Before Order Confirmation' - ]; - - $this->_data['with_one_custom_option_and_category'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Simple Product %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 300, 'preset' => '-'], - 'weight' => 1, - 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'checkout_data' => ['preset' => 'drop_down_with_one_option_percent_price'], - 'website_ids' => ['Main Website'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['product_with_category_with_anchor'] = [ - 'sku' => 'simple_product_with_category_%isolation%', - 'name' => 'Simple product with category %isolation%', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'weight' => 1, - 'attribute_set_id' => ['dataSet' => 'default'], - 'price' => ['value' => 100, 'preset' => ''], - 'category_ids' => ['presets' => 'default_anchor_subcategory'], - 'website_ids' => ['Main Website'], - 'mtf_dataset_name' => 'simple_with_category', - 'url_key' => 'simple-product-%isolation%', - ]; - - $this->_data['with_custom_option_and_fpt'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'name' => 'Simple Product With Fpt %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 70, 'preset' => '-'], - 'weight' => 1, - 'custom_options' => ['preset' => 'drop_down_with_one_option_fixed_price'], - 'checkout_data' => ['preset' => 'drop_down_with_one_option_fixed_price'], - 'url_key' => 'simple-product-%isolation%', - 'fpt' => ['preset' => 'one_fpt_for_all_states'] - ]; - - $this->_data['with_special_price_and_fpt'] = [ - 'type_id' => 'simple', - 'attribute_set_id' => ['dataSet' => 'default'], - 'category_ids' => ['presets' => 'default_subcategory'], - 'website_ids' => ['Main Website'], - 'name' => 'Simple Product With Fpt %isolation%', - 'sku' => 'sku_simple_product_%isolation%', - 'price' => ['value' => 110, 'preset' => '-'], - 'special_price' => 100, - 'weight' => 1, - 'url_key' => 'simple-product-%isolation%', - 'fpt' => ['preset' => 'one_fpt_for_all_states'] - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 58f858760c628..439f2cdd4be91 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -7,7 +7,7 @@ --> - + default @@ -27,7 +27,7 @@ taxable_goods - Main Website + Main Website Catalog, Search simple-product-%isolation% @@ -35,7 +35,8 @@ order_default - + + Simple Product %isolation% sku_simple_product_%isolation% No @@ -50,14 +51,15 @@ - - Main Website + Main Website Catalog, Search order_default - + + default @@ -76,7 +78,7 @@ taxable_goods - Main Website + Main Website Catalog, Search simple-product-%isolation% @@ -84,7 +86,8 @@ order_big_qty - + + default @@ -103,7 +106,7 @@ taxable_goods - Main Website + Main Website Catalog, Search simple-product-%isolation% @@ -111,7 +114,8 @@ order_custom_price - + + product_100_dollar%isolation% product_100_dollar%isolation% simple @@ -128,14 +132,15 @@ - - Main Website + Main Website simple-product-%isolation% two_products - + + product_40_dollar%isolation% product_40_dollar%isolation% simple @@ -154,10 +159,11 @@ product_40_dollar simple-product-%isolation% - Main Website + Main Website - + + MAGETWO-23036_%isolation% simple_with_category %isolation% @@ -178,11 +184,12 @@ simple_with_category - Main Website + simple-product-%isolation% - + + simple_product_with_category_%isolation% Simple product with category %isolation% @@ -195,18 +202,19 @@ 100 - + default_subcategory - Main Website + Ma"bsite simple_with_category simple-product-%isolation% - + + default @@ -219,18 +227,19 @@ sku_simple_product_%isolation% 100 - + 100 - Main Website + Main W"e simple-product-%isolation% default_subcategory - + + simple_for_composite_products%isolation% simple_for_composite_products%isolation% @@ -250,7 +259,7 @@ 1 1 - Main Website + Main Websi"tem> Yes @@ -260,7 +269,8 @@ simple-for-composite-products%isolation% Catalog, Search - + + default @@ -268,18 +278,19 @@ sku_simple_product_%isolation% 50 - + 50 - Main Website + Main Website simple-product-%isolation% default_subcategory - + + simple_product_with_special_price_and_category%isolation% Simple product with special price and category %isolation% @@ -287,18 +298,19 @@ 100 - + 90 default_subcategory - Main Website + Main Website simple-product-%isolation% - + + simple_product_with_special_price_and_category%isolation% Simple with Special Price 1$ off %isolation% @@ -306,15 +318,16 @@ 10 - + 9 - Main Website + Main Website simple-product-%isolation% - + + adc_123_%isolation% adc_123 @@ -334,12 +347,13 @@ Product online - Main Website + Main Website Catalog, Search simple-product-%isolation% - + + Simple with Weight 0.1 %isolation% adc_123 @@ -359,12 +373,13 @@ Product online - Main Website + Main Website Catalog, Search simple-product-%isolation% - + + Simple with Weight 150.1 %isolation% adc_123 @@ -384,12 +399,13 @@ Product online - Main Website + Main Website Catalog, Search simple-product-%isolation% - + + abc_dfj_%isolation% abc_dfj @@ -412,12 +428,13 @@ abc_short - Main Website + Main Website Catalog, Search simple-product-%isolation% - + + product_100_dollar%isolation% product_100_dollar%isolation% @@ -434,11 +451,12 @@ - - Main Website + Main Website simple-product-%isolation% - + + simple default @@ -453,7 +471,8 @@ simple-product-%isolation% 9 - + + simple default @@ -470,7 +489,8 @@ simple-product-%isolation% - + + simple default @@ -489,11 +509,12 @@ default_subcategory - Main Website + Main Website simple-product-%isolation% - + + simple default @@ -510,7 +531,8 @@ simple-product-%isolation% - + + simple default @@ -529,11 +551,12 @@ default_subcategory - Main Website + Main Website simple-product-%isolation% - + + simple default @@ -553,7 +576,8 @@ with_two_custom_option - + + simple default @@ -572,14 +596,15 @@ drop_down_with_one_option_percent_price - Main Website + Main Website default_subcategory simple-product-%isolation% - + + simple default @@ -596,7 +621,8 @@ all_types - + + low_stock_product%isolation% low_stock_product%isolation% simple @@ -617,11 +643,12 @@ - - Main Website + Main Website simple-product-%isolation% - + + default @@ -640,7 +667,7 @@ taxable_goods - Main Website + Main Website Catalog, Search @@ -648,7 +675,8 @@ simple-product-%isolation% - + + default @@ -667,7 +695,7 @@ taxable_goods - Main Website + Main Website Catalog, Search @@ -676,7 +704,8 @@ Product offline simple-product-%isolation% - + + default @@ -695,7 +724,7 @@ taxable_goods - Main Website + Main Website Not Visible Individually @@ -703,7 +732,8 @@ simple-product-%isolation% - + + default @@ -722,7 +752,7 @@ taxable_goods - Main Website + Main Website Catalog, Search @@ -734,7 +764,8 @@ simple-product-%isolation% - + + simple default @@ -754,10 +785,11 @@ simple-product-%isolation% - Main Website + Main Website - + + default @@ -776,7 +808,7 @@ taxable_goods - Main Website + Main Website Catalog, Search @@ -788,7 +820,8 @@ simple-product-%isolation% - + + simple default @@ -809,10 +842,11 @@ default - Main Website + Main Website - + + default @@ -831,7 +865,7 @@ taxable_goods - Main Website + Main Website Catalog, Search @@ -840,7 +874,8 @@ 600 Before Order Confirmation - + + simple_product_with_category_%isolation% Simple product with category %isolation% @@ -853,18 +888,19 @@ 100 - + default_anchor_subcategory - Main Website + Main Website simple_with_category simple-product-%isolation% - + + simple default @@ -873,7 +909,7 @@ default_subcategory - Main Website + Main Website Simple Product With Fpt %isolation% sku_simple_product_%isolation% @@ -893,7 +929,8 @@ one_fpt_for_all_states - + + simple default @@ -902,7 +939,7 @@ default_subcategory - Main Website + Main Website Simple Product With Fpt %isolation% sku_simple_product_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php deleted file mode 100644 index 89fcf7accf497..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php +++ /dev/null @@ -1,99 +0,0 @@ -_data['default'] = [ - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'is_virtual' => 'Yes', - 'url_key' => 'virtual-product%isolation%', - 'visibility' => 'Catalog, Search', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Virtual product %isolation%', - 'sku' => 'sku_virtual_product_%isolation%', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 10.00, 'preset' => '-'], - 'checkout_data' => ['preset' => 'order_default'], - ]; - - $this->_data['virtual_big_qty'] = [ - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'is_virtual' => 'Yes', - 'url_key' => 'virtual-product%isolation%', - 'visibility' => 'Catalog, Search', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Virtual product %isolation%', - 'sku' => 'sku_virtual_product_%isolation%', - 'quantity_and_stock_status' => [ - 'qty' => 1000.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 10.00, 'preset' => '-'], - 'checkout_data' => ['preset' => 'order_big_qty'], - ]; - - $this->_data['virtual_for_sales'] = [ - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'is_virtual' => 'Yes', - 'url_key' => 'virtual-product%isolation%', - 'visibility' => 'Catalog, Search', - 'attribute_set_id' => ['dataSet' => 'default'], - 'name' => 'Virtual product %isolation%', - 'sku' => 'sku_virtual_product_%isolation%', - 'quantity_and_stock_status' => [ - 'qty' => 666.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 10.00, 'preset' => '-'], - 'checkout_data' => ['preset' => 'order_custom_price'], - ]; - - $this->_data['product_50_dollar'] = [ - 'name' => 'product_50_dollar %isolation%', - 'sku' => 'product_50_dollar_%isolation%', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'status' => 'Product online', - 'website_ids' => ['Main Website'], - 'is_virtual' => 'Yes', - 'url_key' => 'virtual-product%isolation%', - 'visibility' => 'Catalog, Search', - 'attribute_set_id' => ['dataSet' => 'default'], - 'quantity_and_stock_status' => [ - 'qty' => 111.0000, - 'is_in_stock' => 'In Stock', - ], - 'price' => ['value' => 50.00, 'preset' => '-'], - 'checkout_data' => ['preset' => 'product_50_dollar'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml index bdcacd0af236c..71369a45046e5 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml @@ -7,13 +7,13 @@ --> - + taxable_goods Product online - Main Website + Main Website Yes virtual-product%isolation% @@ -35,13 +35,14 @@ order_default - + + taxable_goods Product online - Main Website + Main Website Yes virtual-product%isolation% @@ -63,13 +64,14 @@ order_big_qty - + + taxable_goods Product online - Main Website + Main Website Yes virtual-product%isolation% @@ -91,7 +93,8 @@ order_custom_price - + + product_50_dollar %isolation% product_50_dollar_%isolation% @@ -99,7 +102,7 @@ Product online - Main Website + Main Website Yes virtual-product%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php deleted file mode 100644 index ecb9febd09a02..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php +++ /dev/null @@ -1,66 +0,0 @@ -_data['default_category'] = [ - 'name' => 'Default Category', - 'parent_id' => 1, - 'is_active' => 'Yes', - 'id' => 2, - ]; - - $this->_data['default_subcategory'] = [ - 'name' => 'DefaultSubcategory%isolation%', - 'url_key' => 'default-subcategory-%isolation%', - 'parent_id' => ['dataSet' => 'default_category'], - 'is_active' => 'Yes', - 'include_in_menu' => 'Yes', - ]; - - $this->_data['default_anchor_subcategory'] = [ - 'name' => 'DefaultSubcategory%isolation%', - 'url_key' => 'default-subcategory-%isolation%', - 'parent_id' => ['dataSet' => 'default_category'], - 'is_active' => 'Yes', - 'is_anchor' => 'Yes', - 'include_in_menu' => 'Yes', - ]; - - $this->_data['root_category'] = [ - 'name' => 'RootCategory%isolation%', - 'url_key' => 'root-category-%isolation%', - 'parent_id' => 1, - 'is_active' => 'Yes', - 'include_in_menu' => 'Yes', - ]; - - $this->_data['root_subcategory'] = [ - 'name' => 'RootSubCategory%isolation%', - 'url_key' => 'root-sub-category-%isolation%', - 'parent_id' => ['dataSet' => 'root_category'], - 'is_active' => 'Yes', - 'include_in_menu' => 'Yes', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml index 704dae0d25c04..9aca370ce3f42 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml @@ -7,25 +7,50 @@ --> - - - - + + Default Category + 1 + Yes + 2 + + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + Yes + Yes - - + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category - - - - Yes - 1 - display_setting - select - - + Yes + Yes + Yes + + + + RootCategory%isolation% + root-category-%isolation% + 1 + Yes + Yes + + + + RootSubCategory%isolation% + root-sub-category-%isolation% + + root_category + Yes + Yes diff --git a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml index 659249da5e5c2..f5296a0c70fc3 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml @@ -10,12 +10,15 @@ 1 + 1 + 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index 8ca9145fc3324..d1acf7284f8fd 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -7,7 +7,7 @@ --> + class="Magento\CatalogRule\Test\Fixture\CatalogRule"> Magento_CatalogRule eav catalog_rule @@ -15,7 +15,7 @@ Magento\CatalogRule\Test\Repository\CatalogRule Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface - + name varchar 1 @@ -23,21 +23,20 @@ text rule_information - - description + description Catalog Price Rule Description text rule_information - - is_active + + is_active smallint 1 Active select rule_information - + website_ids smallint 1 @@ -47,7 +46,7 @@ multiselect rule_information - + customer_group_ids smallint 1 @@ -57,7 +56,7 @@ multiselect rule_information - + from_date date 0 @@ -65,7 +64,7 @@ text rule_information - + to_date date 0 @@ -73,7 +72,7 @@ text rule_information - + simple_action smallint 0 @@ -81,7 +80,7 @@ select actions - + discount_amount decimal 1 @@ -89,41 +88,41 @@ text actions - + condition_type virtual 0 conditions select - + condition_value virtual 0 conditions - + rule virtual 0 conditions - + conditions virtual conditions - + id virtual - - sort_order + + attribute_code>sort_order text rule_information - + stop_rules_processing select diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php deleted file mode 100755 index a2d1254e13cff..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php +++ /dev/null @@ -1,92 +0,0 @@ -_data['active_catalog_rule'] = [ - 'name' => 'Active Catalog Rule', - 'description' => 'Rule Description', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'], - 'from_date' => '3/25/14', - 'to_date' => '3/29/14', - 'sort_order' => '1', - 'simple_action' => 'By Percentage of the Original Price', - 'discount_amount' => '50', - ]; - - $this->_data['inactive_catalog_price_rule'] = [ - 'name' => 'Inactive Catalog Price Rule', - 'is_active' => 'Inactive', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN'], - 'simple_action' => 'By Percentage of the Original Price', - 'discount_amount' => '50', - ]; - - $this->_data['active_catalog_price_rule_with_conditions'] = [ - 'name' => 'Active Catalog Rule with conditions %isolation%', - 'description' => 'Rule Description', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'], - 'rule' => '[Category|is|2]', - 'simple_action' => 'By Percentage of the Original Price', - 'discount_amount' => '10', - ]; - - $this->_data['catalog_price_rule_priority_0'] = [ - 'name' => 'catalog_price_rule_priority_0', - 'description' => '-50% of price, Priority = 0', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN'], - 'sort_order' => '0', - 'simple_action' => 'By Percentage of the Original Price', - 'discount_amount' => '50', - ]; - - $this->_data['catalog_price_rule_priority_1_stop_further_rules'] = [ - 'name' => 'catalog_price_rule_priority_1_stop_further_rules', - 'description' => 'Priority 1, -5 By fixed amount', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN'], - 'sort_order' => '1', - 'simple_action' => 'By Fixed Amount', - 'discount_amount' => '5', - 'stop_rules_processing' => 'Yes', - ]; - - $this->_data['catalog_price_rule_priority_2'] = [ - 'name' => 'catalog_price_rule_priority_2', - 'description' => 'Priority 2, -10 By fixed amount', - 'is_active' => 'Active', - 'website_ids' => ['Main Website'], - 'customer_group_ids' => ['NOT LOGGED IN'], - 'sort_order' => '2', - 'simple_action' => 'By Fixed Amount', - 'discount_amount' => '10', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml index 4315ba6742cc6..41eb5733b9b78 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -7,18 +7,18 @@ --> - + Active Catalog Rule Rule Description Active - Main Website + Main Website - NOT LOGGED IN - General - Wholesale - Retailer + NOT LOGGED IN + General + Wholesale + Retailer 3/25/14 3/29/14 @@ -26,73 +26,78 @@ By Percentage of the Original Price 50 - + + Inactive Catalog Price Rule Inactive - Main Website + Main Website - NOT LOGGED IN + NOT LOGGED IN By Percentage of the Original Price 50 - + + Active Catalog Rule with conditions %isolation% Rule Description Active - Main Website + Main Website - NOT LOGGED IN - General - Wholesale - Retailer + NOT LOGGED IN + General + Wholesale + Retailer [Category|is|2] By Percentage of the Original Price 10 - + + catalog_price_rule_priority_0 -50% of price, Priority = 0 Active - Main Website + Main Website - NOT LOGGED IN + NOT LOGGED IN 0 By Percentage of the Original Price 50 - + + catalog_price_rule_priority_1_stop_further_rules Priority 1, -5 By fixed amount Active - Main Website + Main Website - NOT LOGGED IN + NOT LOGGED IN 1 By Fixed Amount 5 Yes - + + catalog_price_rule_priority_2 Priority 2, -10 By fixed amount Active - Main Website + Main Website - NOT LOGGED IN + NOT LOGGED IN 2 By Fixed Amount 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 2128ca0763ccd..d319be94ed9c1 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 @@ -9,68 +9,68 @@ low - + low - - - + > + /> + "/> low - - + e"/> + ex"/> low - + dex"/> high - + ndex"/> - - + tView"/> + ryView"/> low - + leIndex"/> low - - + alogRule"/> + RuleIndex"/> high - + e\CmsIndex"/> - + ategoryView"/> high - + age\CmsIndex"/> - - - + ogProductView"/> + ogCategoryView"/> + ge\CheckoutCart"/> diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index acbb5b459c393..ba866ea19677a 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -7,7 +7,7 @@ --> + class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery"> Magento_CatalogSearch flat search_query @@ -15,83 +15,83 @@ Magento\CatalogSearch\Test\Repository\CatalogSearchQuery Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface - + query_id int 1 - + - + query_text varchar - + - + Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery\QueryText - - num_results + + num_results int - + 0 - + - + popularity int - + 0 - + - + redirect varchar - + - + - + synonym_for varchar - + - + - + store_id smallint - + 0 - + - + display_in_terms smallint - + null - + - + is_active smallint - + null - + - + is_processed smallint - + 0 - + - + updated_at timestamp - + null - + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php deleted file mode 100644 index 789e3312ad197..0000000000000 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php +++ /dev/null @@ -1,35 +0,0 @@ -_data['default'] = [ - 'query_text' => ['value' => 'Query text %isolation%'], - 'store_id' => 'Main Website/Main Website Store/Default Store View', - 'synonym_for' => 'Synonym word %isolation%', - 'redirect' => 'http://example.com/', - 'display_in_terms' => 'No', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml index a20357e90f0f1..75f42645b95dd 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml @@ -7,7 +7,7 @@ --> - + Query text %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index 9bd75b5d6e1fb..182a30c44d925 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -7,7 +7,7 @@ --> + class="Magento\Checkout\Test\Fixture\Cart"> Magento_Checkout flat sales_quote @@ -15,372 +15,372 @@ Magento\Checkout\Test\Repository\Cart Magento\Checkout\Test\Handler\Cart\CartInterface - + entity_id int 1 - + - + store_id smallint - + 0 - + - - created_at + + created_at timestamp - + CURRENT_TIMESTAMP - + - + updated_at timestamp - + 0000-00-00 00:00:00 - + - + converted_at timestamp - + - + - + is_active smallint - + 1 - + - + is_virtual smallint - + 0 - + - + is_multi_shipping smallint - + 0 - + - + items virtual Magento\Checkout\Test\Fixture\Cart\Items - + items_count int - + 0 - + - + items_qty decimal - + 0.0000 - + - + orig_order_id int - + 0 - + - + store_to_base_rate decimal - + 0.0000 - + - + store_to_quote_rate decimal - + 0.0000 - + - + base_currency_code varchar - + - + - + store_currency_code varchar - + - + - + quote_currency_code varchar - + - + - + grand_total decimal - + 0.0000 - + - + base_grand_total decimal - + 0.0000 - + - + checkout_method varchar - + - + - + customer_id int - + 0 - + - + customer_tax_class_id int - + 0 - + - + customer_group_id int - + 0 - + - + customer_email varchar - + - + - + customer_prefix varchar - + - + - + customer_firstname varchar - + - + - + customer_middlename varchar - + - + - + customer_lastname varchar - + - + - + customer_suffix varchar - + - + - + customer_dob datetime - + - + - + customer_note varchar - + - + - + customer_note_notify smallint - + 1 - + - + customer_is_guest smallint - + 0 - + - + remote_ip varchar - + - + - + applied_rule_ids varchar - + - + - + reserved_order_id varchar - + - + - + password_hash varchar - + - + - + coupon_code varchar - + - + - + global_currency_code varchar - + - + - + base_to_global_rate decimal - + - + - + base_to_quote_rate decimal - + - + - + customer_taxvat varchar - + - + - + customer_gender varchar - + - + - + subtotal decimal - + - + - + base_subtotal decimal - + - + - + subtotal_with_discount decimal - + - + - + base_subtotal_with_discount decimal - + - + - + is_changed int - + - + - - trigger_recollect + + trigger_recollec">attribute_code> smallint - + 0 - + - - ext_shipping_info + + ext_shipping_info">ttribute_code> text - + - + - + is_persistent smallint - + 0 - + - + gift_message_id int - + - + - + checkout_data virtual - + Magento\Checkout\Test\Fixture\Cart\CheckoutData diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index dafb115f91a5f..a2895842a6460 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable"> Magento_ConfigurableProduct eav catalog_product @@ -16,7 +16,7 @@ sku Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface - + configurable configurable @@ -25,7 +25,7 @@ product - + category_ids static 0 @@ -34,56 +34,56 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + color int 0 select - + country_of_manufacture varchar 0 select - + created_at static 1 text - + custom_design varchar 0 select - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 @@ -91,28 +91,28 @@ textarea product-details - + enable_googlecheckout int 0 No select - + gallery varchar 0 gallery - + gift_message_available varchar 0 select - + group_price decimal 0 @@ -121,84 +121,84 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + manufacturer int 0 select - + media_gallery varchar 0 gallery - + meta_description varchar 0 textarea - + meta_keyword text 0 textarea - + meta_title varchar 0 text - + minimal_price decimal 0 price - + msrp decimal 0 price - + msrp_display_actual_price_type varchar 0 select - + name varchar 1 @@ -206,42 +206,42 @@ text product-details - + news_from_date datetime 0 date - + news_to_date datetime 0 date - + old_id int 0 text - + options_container varchar 0 select - + page_layout varchar 0 select - + price decimal 1 @@ -252,7 +252,7 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - + quantity_and_stock_status int 0 @@ -262,14 +262,14 @@ select product-details - + required_options static 0 text - + short_description text 0 @@ -277,7 +277,7 @@ textarea autosettings - + sku static 1 @@ -285,28 +285,28 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + special_from_date datetime 0 date - + special_price decimal 0 @@ -314,14 +314,14 @@ price advanced-pricing - + special_to_date datetime 0 date - + status int 0 @@ -329,7 +329,7 @@ checkbox product-details - + tax_class_id int 0 @@ -338,21 +338,21 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + tier_price decimal 0 @@ -361,14 +361,14 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - + updated_at static 1 text - + url_key varchar 0 @@ -376,14 +376,14 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 @@ -391,7 +391,7 @@ select autosettings - + weight decimal 0 @@ -399,22 +399,22 @@ weight product-details - + is_virtual virtual product-details - + id virtual - + type_id virtual null configurable - + attribute_set_id virtual product-details @@ -423,24 +423,24 @@ default - + attribute_set_name virtual variations - + affected_attribute_set virtual null - + custom_options virtual 0 customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - + configurable_attributes_data virtual 0 @@ -451,7 +451,7 @@ default - + website_ids virtual @@ -459,13 +459,13 @@ websites - + checkout_data virtual null Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData - + up_sell_products virtual upsells diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php deleted file mode 100644 index 80858fb13562e..0000000000000 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php +++ /dev/null @@ -1,153 +0,0 @@ -_data['default'] = [ - 'name' => 'Test configurable product %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'default'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'default'], - ]; - - $this->_data['product_with_size'] = [ - 'name' => 'Test configurable product with size %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'size'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'default'], - ]; - - $this->_data['product_with_color_and_size'] = [ - 'name' => 'Test configurable product with color and size %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'color_and_size'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'default'], - ]; - - $this->_data['one_variation'] = [ - 'name' => 'Test configurable product %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'one_variation'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - ]; - - $this->_data['not_virtual_for_type_switching'] = [ - 'name' => 'Test configurable product %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'is_virtual' => 'No', - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'default'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'default'], - ]; - - $this->_data['with_one_option'] = [ - 'name' => 'Test configurable product %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 10.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'with_one_option'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'with_one_option'], - ]; - - $this->_data['with_out_of_stock_item'] = [ - 'name' => 'Test configurable product %isolation%', - 'sku' => 'sku_test_configurable_product_%isolation%', - 'price' => ['value' => 120.00], - 'weight' => 30.0000, - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-configurable-product-%isolation%', - 'configurable_attributes_data' => ['preset' => 'with_out_of_stock_item'], - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml index 21dad1e386fe9..fcfbfcc535dcb 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -35,6 +35,7 @@ default + Test configurable product with size %isolation% sku_test_configurable_product_%isolation% @@ -64,6 +65,7 @@ default + Test configurable product with color and size %isolation% sku_test_configurable_product_%isolation% @@ -93,6 +95,7 @@ default + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -119,6 +122,7 @@ default + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -149,6 +153,7 @@ default + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -178,6 +183,7 @@ with_one_option + Test configurable product %isolation% sku_test_configurable_product_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index c4b3522b80917..887a3b99ca41a 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -7,7 +7,7 @@ --> + class="Magento\Core\Test\Fixture\ConfigData"> Magento_Core flat core_config_data diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 0a99089b8dec3..d287ff9d68184 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -7,7 +7,7 @@ --> + class="Magento\Core\Test\Fixture\SystemVariable"> Magento_Core composite @@ -17,58 +17,58 @@ Magento\Core\Model\Resource\Variable\Collection Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface - + variable_id int - + 0 - + - + code varchar - + variableCode%isolation% - + - + name varchar - + variableName%isolation% - + - + value_id int 1 - + - + store_id smallint - + 0 - + - + plain_value text - + plain_value - + - + html_value text - +

html_value

 - + - + use_default_value virtual select diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php deleted file mode 100644 index 330590dcb95a4..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php +++ /dev/null @@ -1,33 +0,0 @@ -_data['custom_variable'] = [ - 'variable[code]' => 'variableCode%isolation%', - 'variable[name]' => 'variableName%isolation%', - 'variable[html_value]' => "

variableName%isolation%

", - 'variable[plain_value]' => 'variableName%isolation%', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index 5162901f0fe76..366b39c35f3e2 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -7,13 +7,11 @@ --> - + variableCode%isolation% variableName%isolation% - - variableName%isolation% - +

variableName%isolation%

 variableName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index 04169b45e2d43..d4ac97caf539b 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\Customer\Test\Fixture\AddressInjectable"> Magento_Customer eav customer_address @@ -15,154 +15,154 @@ Magento\Customer\Test\Repository\AddressInjectable Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface - + city varchar 1 Culver City text - + default_billing varchar 1 checkbox - - default_shipping + + default_shipping varchar 1 checkbox - + company varchar 0 Magento %isolation% text - + country_id varchar 1 United States select - + fax varchar 0 text - + firstname varchar 1 John text - + lastname varchar 1 Doe text - + email varchar 1 John.Doe%isolation%@example.com text - + middlename varchar 0 text - + postcode varchar 0 90230 text - + prefix varchar 0 text - + region varchar 0 text - + region_id int 0 California hidden - + street text 1 6161 West Centinela Avenue multiline - + suffix varchar 0 text - + telephone varchar 1 555-55-555-55 text - + vat_id varchar 0 text - - vat_is_valid + + ibute_code>vat_is_valid int 0 text - - vat_request_date + + bute_code>vat_request_date varchar 0 text - - vat_request_id + + ute_code>vat_request_id varchar 0 text - + vat_request_success int 0 diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 110b39a5e7a8f..6c4bc9e619e48 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\Customer\Test\Fixture\CustomerGroupInjectable"> Magento_Customer flat customer_group @@ -15,14 +15,14 @@ Magento\Customer\Test\Repository\CustomerGroupInjectable Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface - + code varchar 1 customer_code_%isolation% text - + tax_class varchar 1 @@ -32,7 +32,7 @@ select Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds - + customer_group_id virtual diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index 3271878135468..d82c05e488a2b 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\Customer\Test\Fixture\CustomerInjectable"> Magento_Customer eav customer @@ -16,31 +16,31 @@ Magento\Customer\Test\Repository\CustomerInjectable Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface - + address virtual Magento\Customer\Test\Fixture\CustomerInjectable\Address - + confirmation varchar 0 text - - id + + id virtual null - + created_at static 0 date - + created_in varchar 0 @@ -48,21 +48,21 @@ text account_information - + default_billing int 0 text - + default_shipping int 0 text - + disable_auto_group_change static 0 @@ -70,7 +70,7 @@ boolean account_information - + dob datetime 0 @@ -78,7 +78,7 @@ date account_information - + email static 1 @@ -86,7 +86,7 @@ text account_information - + firstname varchar 1 @@ -94,7 +94,7 @@ text account_information - + gender int 0 @@ -102,7 +102,7 @@ select account_information - + group_id static 1 @@ -111,7 +111,7 @@ account_information Magento\Customer\Test\Fixture\CustomerInjectable\GroupId - + lastname varchar 1 @@ -119,7 +119,7 @@ text account_information - + middlename varchar 0 @@ -127,14 +127,14 @@ text account_information - + password_hash varchar 0 hidden - + prefix varchar 0 @@ -142,21 +142,21 @@ text account_information - + rp_token varchar 0 hidden - + rp_token_created_at datetime 0 date - + store_id static 1 @@ -164,7 +164,7 @@ select account_information - + suffix varchar 0 @@ -172,7 +172,7 @@ text account_information - + taxvat varchar 0 @@ -180,7 +180,7 @@ text account_information - + website_id static 1 @@ -188,7 +188,7 @@ select account_information - + amount_delta static 1 @@ -196,23 +196,23 @@ text store_credit - + is_subscribed virtual - + password virtual null 123123q - + password_confirmation virtual null 123123q - + current_password virtual null diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php deleted file mode 100644 index ea198cb5e265b..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php +++ /dev/null @@ -1,265 +0,0 @@ -_data['US_address'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - 'default_billing' => 'Yes', - 'default_shipping' => 'Yes', - ]; - - $this->_data['US_address_default_billing'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - 'default_billing' => 'Yes', - 'default_shipping' => 'No', - ]; - - $this->_data['US_NY_address_billing'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '6262 Fifth Avenue', - 'city' => 'New York', - 'region_id' => 'New York', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - 'default_billing' => 'No', - 'default_shipping' => 'No', - ]; - - $this->_data['US_address_default_shipping'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - 'default_billing' => 'Yes', - 'default_shipping' => 'No', - ]; - - $this->_data['default_US_address'] = [ - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - 'default_billing' => 'Yes', - 'default_shipping' => 'Yes', - ]; - - $this->_data['US_address_without_email'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'street' => '6161 West Centinela Avenue', - 'city' => 'Culver City', - 'region_id' => 'California', - 'postcode' => '90230', - 'country_id' => 'United States', - 'telephone' => '555-55-555-55', - ]; - - $this->_data['US_address_NY'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '3222 Cliffside Drive', - 'city' => 'Binghamton', - 'region_id' => 'New York', - 'postcode' => '13901', - 'country_id' => 'United States', - 'telephone' => '607-481-7802', - 'default_billing' => 'Yes', - 'default_shipping' => 'Yes', - ]; - - $this->_data['US_address_TX'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'John.Doe%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'street' => '7700 W. Parmer Lane Bldg. D', - 'city' => 'Austin', - 'region_id' => 'Texas', - 'postcode' => '78729 ', - 'country_id' => 'United States', - 'telephone' => '512-691-4400', - 'default_billing' => 'Yes', - 'default_shipping' => 'Yes', - ]; - - $this->_data['customer_US'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'JohnDoe_%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'city' => 'Culver City', - 'street' => '6161 West Centinela Avenue', - 'postcode' => '90230', - 'country_id' => 'United States', - 'region_id' => 'California', - 'telephone' => '555-55-555-55', - 'fax' => '555-55-555-55', - ]; - - $this->_data['customer_UK'] = [ - 'firstname' => 'Jane', - 'lastname' => 'Doe', - 'email' => 'JaneDoe_%isolation%@example.com', - 'company' => 'Magento %isolation%', - 'city' => 'London', - 'street' => '172, Westminster Bridge Rd', - 'postcode' => 'SE1 7RW', - 'country_id' => 'United Kingdom', - 'region' => 'London', - 'telephone' => '444-44-444-44', - 'fax' => '444-44-444-44', - ]; - - $this->_data['address_US_1'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'email' => 'John.Doe%isolation%@example.com', - 'city' => 'Culver City', - 'street' => '6161 West Centinela Avenue', - 'postcode' => '90230', - 'country_id' => 'United States', - 'region_id' => 'California', - 'telephone' => '555-55-555-55', - ]; - - $this->_data['address_US_2'] = [ - 'firstname' => 'Billy', - 'lastname' => 'Holiday', - 'company' => 'Magento %isolation%', - 'email' => 'b.holliday@example.net', - 'city' => 'New York', - 'street' => '727 5th Ave', - 'postcode' => '10022', - 'country_id' => 'United States', - 'region_id' => 'New York', - 'telephone' => '777-77-77-77', - ]; - - $this->_data['address_data_US_1'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'city' => 'Culver City', - 'street' => '6161 West Centinela Avenue', - 'postcode' => '90230', - 'country_id' => 'United States', - 'region_id' => 'California', - 'telephone' => '555-55-555-55', - ]; - - $this->_data['address_DE'] = [ - 'firstname' => 'Jan', - 'lastname' => 'Jansen', - 'company' => 'Magento %isolation%', - 'city' => 'Berlin', - 'street' => 'Augsburger Strabe 41', - 'postcode' => '10789', - 'country_id' => 'Germany', - 'region_id' => 'Berlin', - 'telephone' => '333-33-333-33', - ]; - - $this->_data['address_UK'] = [ - 'firstname' => 'Jane', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'city' => 'London', - 'street' => '172, Westminster Bridge Rd', - 'postcode' => 'SE1 7RW', - 'country_id' => 'United Kingdom', - 'region_id' => 'London', - 'telephone' => '444-44-444-44', - ]; - - $this->_data['address_UK_2'] = [ - 'firstname' => 'Jane', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'city' => 'Manchester', - 'street' => '42 King Street West', - 'postcode' => 'M3 2WY', - 'country_id' => 'United Kingdom', - 'region_id' => 'Manchester', - 'telephone' => '444-44-444-44', - ]; - - $this->_data['address_UK_with_VAT'] = [ - 'firstname' => 'Jane', - 'lastname' => 'Doe', - 'company' => 'Magento %isolation%', - 'city' => 'London', - 'street' => '172, Westminster Bridge Rd', - 'postcode' => 'SE1 7RW', - 'country_id' => 'United Kingdom', - 'region_id' => 'London', - 'telephone' => '444-44-444-44', - 'vat_id' => '584451913', - ]; - - $this->_data['address_US_pay_pal'] = [ - 'firstname' => 'Dmytro', - 'lastname' => 'Aponasenko', - 'city' => 'Culver City', - 'street' => '1 Main St', - 'postcode' => '90230', - 'country_id' => 'United States', - 'region_id' => 'Culver City', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml index f5fceddcb74a2..321376ce25eec 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml @@ -7,7 +7,7 @@ --> - + John Doe John.Doe%isolation%@example.com @@ -21,7 +21,8 @@ Yes Yes - + + John Doe John.Doe%isolation%@example.com @@ -35,7 +36,8 @@ Yes No - + + John Doe John.Doe%isolation%@example.com @@ -49,7 +51,8 @@ No No - + + John Doe John.Doe%isolation%@example.com @@ -63,7 +66,8 @@ Yes No - + + Magento %isolation% 6161 West Centinela Avenue Culver City @@ -74,7 +78,8 @@ Yes Yes - + + John Doe Magento %isolation% @@ -85,7 +90,8 @@ United States 555-55-555-55 - + + John Doe John.Doe%isolation%@example.com @@ -99,7 +105,8 @@ Yes Yes - + + John Doe John.Doe%isolation%@example.com @@ -113,7 +120,8 @@ Yes Yes - + + John Doe JohnDoe_%isolation%@example.com @@ -126,7 +134,8 @@ 555-55-555-55 555-55-555-55 - + + Jane Doe JaneDoe_%isolation%@example.com @@ -139,7 +148,8 @@ 444-44-444-44 444-44-444-44 - + + John Doe Magento %isolation% @@ -151,7 +161,8 @@ California 555-55-555-55 - + + Billy Holiday Magento %isolation% @@ -163,7 +174,8 @@ New York 777-77-77-77 - + + John Doe Magento %isolation% @@ -174,7 +186,8 @@ California 555-55-555-55 - + + Jan Jansen Magento %isolation% @@ -185,7 +198,8 @@ Berlin 333-33-333-33 - + + Jane Doe Magento %isolation% @@ -196,7 +210,8 @@ London 444-44-444-44 - + + Jane Doe Magento %isolation% @@ -207,7 +222,8 @@ Manchester 444-44-444-44 - + + Jane Doe Magento %isolation% @@ -219,7 +235,8 @@ 444-44-444-44 584451913 - + + Dmytro Aponasenko Culver City diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php deleted file mode 100644 index ad47c85e77253..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php +++ /dev/null @@ -1,54 +0,0 @@ -_data['General'] = [ - 'customer_group_id' => '1', - 'customer_group_code' => 'General', - 'tax_class_id' => ['dataSet' => 'retail_customer'], - ]; - - $this->_data['Retailer'] = [ - 'customer_group_id' => '3', - 'customer_group_code' => 'Retailer', - 'tax_class_id' => ['dataSet' => 'retail_customer'], - ]; - - $this->_data['Wholesale'] = [ - 'customer_group_id' => '2', - 'customer_group_code' => 'Wholesale', - 'tax_class_id' => ['dataSet' => 'retail_customer'], - ]; - - $this->_data['All_Customer_Groups'] = [ - 'customer_group_id' => '0', - 'customer_group_code' => 'All Customer Groups', - ]; - - $this->_data['NOT_LOGGED_IN'] = [ - 'customer_group_id' => '0', - 'customer_group_code' => 'NOT LOGGED IN', - 'tax_class_id' => ['dataSet' => 'retail_customer'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml index acedb06628885..b9148ef750e66 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml @@ -7,32 +7,36 @@ --> - + 1 General retail_customer - + + 3 Retailer retail_customer - + + 2 Wholesale retail_customer - + + 0 All Customer Groups - + + 0 NOT LOGGED IN diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php deleted file mode 100644 index 13fcff343ea83..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php +++ /dev/null @@ -1,120 +0,0 @@ -_data['default'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'group_id' => ['dataSet' => 'General'], - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - ]; - - $this->_data['johndoe'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'dob' => '01/01/1990', - 'gender' => 'Male', - 'group_id' => ['dataSet' => 'General'], - ]; - - $this->_data['johndoe_retailer'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'group_id' => ['dataSet' => 'Retailer'], - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'dob' => '01/01/1990', - 'gender' => 'Male', - ]; - - $this->_data['johndoe_with_balance'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'dob' => '01/01/1990', - 'gender' => 'Male', - 'amount_delta' => 501, - ]; - - $this->_data['defaultBackend'] = [ - 'website_id' => 'Main Website', - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'JohnDoe_%isolation%@example.com', - ]; - - $this->_data['johndoe_with_addresses'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'group_id' => ['dataSet' => 'General'], - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'address' => ['presets' => 'US_address'], - ]; - - $this->_data['customer_US'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe', - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - ]; - - $this->_data['customer_UK'] = [ - 'firstname' => 'Jane', - 'lastname' => 'Doe', - 'email' => 'JaneDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - ]; - - $this->_data['johndoe_unique'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe%isolation%', - 'group_id' => ['dataSet' => 'General'], - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'address' => ['presets' => 'US_address_NY'], - ]; - - $this->_data['johndoe_unique_TX'] = [ - 'firstname' => 'John', - 'lastname' => 'Doe%isolation%', - 'group_id' => ['dataSet' => 'General'], - 'email' => 'JohnDoe_%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'address' => ['presets' => 'US_address_TX'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml index d1369fb4dc8a2..902e91e9e7215 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -7,7 +7,7 @@ --> - + John Doe @@ -17,7 +17,8 @@ 123123q 123123q - + + John Doe JohnDoe_%isolation%@example.com @@ -29,7 +30,8 @@ General - + + John Doe @@ -41,7 +43,8 @@ 01/01/1990 Male - + + John Doe JohnDoe_%isolation%@example.com @@ -51,13 +54,15 @@ Male 501 - + + Main Website John Doe JohnDoe_%isolation%@example.com - + + John Doe @@ -70,21 +75,24 @@ US_address - + + John Doe JohnDoe_%isolation%@example.com 123123q 123123q - + + Jane Doe JaneDoe_%isolation%@example.com 123123q 123123q - + + John Doe%isolation% @@ -97,7 +105,8 @@ US_address_NY - + + John Doe%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml index ca70f2e2f78e2..068699cc9ef5f 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml @@ -6,6 +6,6 @@ */ --> - - + + > diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml index 27d1d4c32f434..2eb9977cfe03d 100644 --- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -10,6 +10,7 @@ 0 + 1 https://xmlpitest-ea.dhl.com/XMLShippingServlet diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 7ebcc46937068..26ed8ed9bb52f 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\Downloadable\Test\Fixture\DownloadableProductInjectable"> Magento_Downloadable eav catalog_product @@ -16,7 +16,7 @@ sku Magento\Downloadable\Test\Repository\DownloadableProductInjectable Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface - + downloadable downloadable @@ -25,7 +25,7 @@ product - + category_ids static 0 @@ -34,49 +34,49 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - - cost + + cost decimal 0 price - + created_at static 1 text - + custom_design varchar 0 select - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 @@ -84,21 +84,21 @@ textarea product-details - + gallery varchar 0 gallery - + gift_message_available varchar 0 select - + group_price decimal 0 @@ -107,105 +107,105 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + is_returnable varchar 0 2 select - + links_exist int 0 0 - + - + links_purchased_separately int 1 - + - + links_title varchar 1 - + - + media_gallery varchar 0 gallery - + meta_description varchar 0 textarea - + meta_keyword text 0 textarea - + meta_title varchar 0 text - + minimal_price decimal 0 price - + msrp decimal 0 price - + msrp_display_actual_price_type varchar 0 4 select - + name varchar 1 @@ -213,42 +213,42 @@ text product-details - + news_from_date datetime 0 date - + news_to_date datetime 0 date - + old_id int 0 text - + options_container varchar 0 container2 select - + page_layout varchar 0 select - + price decimal 1 @@ -259,12 +259,12 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\Price - + stock_data text advanced-inventory - + quantity_and_stock_status int 0 @@ -275,35 +275,35 @@ select product-details - + related_tgtr_position_behavior int 0 text - + related_tgtr_position_limit int 0 text - + required_options static 0 text - + samples_title varchar 1 - + - + short_description text 0 @@ -311,13 +311,13 @@ textarea autosettings - + downloadable virtual 0 downloadable_information - + downloadable_items text 0 @@ -328,7 +328,7 @@ downloadable_information Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Links - + downloadable_sample text 0 @@ -337,7 +337,7 @@ downloadable_information Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples - + sku static 1 @@ -345,42 +345,42 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + special_from_date datetime 0 date - + special_price decimal 0 10 advanced-pricing - + special_to_date datetime 0 date - + status int 0 @@ -388,7 +388,7 @@ select product-details - + tax_class_id int 0 @@ -399,21 +399,21 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + tier_price decimal 0 @@ -422,28 +422,28 @@ advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions - + updated_at static 1 text - + upsell_tgtr_position_behavior int 0 text - + upsell_tgtr_position_limit int 0 text - + url_key varchar 0 @@ -451,14 +451,14 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 @@ -466,7 +466,7 @@ select autosettings - + weight decimal 0 @@ -474,7 +474,7 @@ weight product-details - + custom_options virtual 0 @@ -482,17 +482,17 @@ customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions - + id virtual - + is_virtual virtual product-details Yes - + website_ids virtual @@ -500,7 +500,7 @@ websites - + checkout_data virtual null diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php deleted file mode 100644 index 6c3880fd533dd..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php +++ /dev/null @@ -1,78 +0,0 @@ -_data['default'] = [ - 'name' => 'Test downloadable product %isolation%', - 'sku' => 'sku_test_downloadable_product_%isolation%', - 'price' => ['value' => 280.00, 'preset' => '-'], - 'type_id' => 'downloadable', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 90.0000, - 'is_in_stock' => 'In Stock', - ], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'url_key' => 'test-downloadable-product-%isolation%', - 'is_virtual' => 'Yes', - 'downloadable_links' => ['preset' => 'default'], - 'website_ids' => ['Main Website'], - 'checkout_data' => ['preset' => 'default'], - ]; - $this->_data['with_two_separately_links'] = [ - 'name' => 'Downloadable product %isolation%', - 'sku' => 'downloadable_product_%isolation%', - 'url_key' => 'downloadable-product-%isolation%', - 'price' => ['value' => '20'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 1111, - 'is_in_stock' => 'In Stock', - ], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'is_virtual' => 'Yes', - 'downloadable_links' => ['preset' => 'with_two_separately_links'], - 'checkout_data' => ['preset' => 'with_two_separately_links'], - ]; - $this->_data['with_two_bought_links'] = [ - 'name' => 'Downloadable product %isolation%', - 'sku' => 'downloadable_product_%isolation%', - 'url_key' => 'downloadable-product-%isolation%', - 'price' => ['value' => '20'], - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'quantity_and_stock_status' => [ - 'qty' => 1111, - 'is_in_stock' => 'In Stock', - ], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'is_virtual' => 'Yes', - 'downloadable_links' => ['preset' => 'with_two_separately_links'], - 'checkout_data' => ['preset' => 'with_two_bought_links'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml index cbbad6b15f862..0629e9ea608b6 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml @@ -7,7 +7,7 @@ --> - + Test downloadable product %isolation% sku_test_downloadable_product_%isolation% @@ -30,13 +30,14 @@ default - Main Website + Main Website default - + + Downloadable product %isolation% downloadable_product_%isolation% downloadable-product-%isolation% @@ -60,7 +61,8 @@ with_two_separately_links - + + Downloadable product %isolation% downloadable_product_%isolation% downloadable-product-%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml index cdfb685f04283..013e3db6cdfc5 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -10,6 +10,7 @@ 0 + 1 510087801 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index 89decea5847a7..e1bb96fce62cc 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -7,7 +7,7 @@ --> + class="Magento\GiftMessage\Test\Fixture\GiftMessage"> Magento_GiftMessage flat gift_message @@ -15,56 +15,56 @@ gift_message_id Magento\GiftMessage\Test\Repository\GiftMessage - + gift_message_id int 1 - + - + customer_id int - + 0 - + - - sender + + sender varchar - + John Doe - + - + recipient varchar - + Jane Doe - + - - message + + message text - + text_%isolation% - + - + allow_gift_options virtual Yes - + allow_gift_messages_for_order virtual Yes - + allow_gift_options_for_items virtual - + items virtual Magento\GiftMessage\Test\Fixture\GiftMessage\Items diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php deleted file mode 100644 index 436fee4c6bcd0..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php +++ /dev/null @@ -1,32 +0,0 @@ -_data['default'] = [ - 'sender' => 'John Doe', - 'recipient' => 'Jane Doe', - 'message' => 'text_%isolation%', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml index 3e133ac339750..fe991095c8f65 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml @@ -7,7 +7,7 @@ --> - + John Doe Jane Doe text_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index ad9a94279fce4..7f025b2d592e1 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -7,7 +7,7 @@ --> + class="Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute"> Magento_GoogleShopping flat googleshopping_types diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php deleted file mode 100644 index a7977ac9b2c19..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php +++ /dev/null @@ -1,33 +0,0 @@ -_data['default'] = [ - 'target_country' => 'United States', - 'attribute_set_id' => ['dataSet' => 'default'], - 'category' => 'Apparel & Accessories', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml index 1483dd488dbb5..cf8c48b043f15 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -6,6 +6,13 @@ */ --> - + + + United States + + default + + Apparel & Accessories + diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index 282943e05cd8f..e45c1b312f91f 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -7,7 +7,7 @@ --> + class="Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable"> Magento_GroupedProduct eav catalog_product @@ -16,7 +16,7 @@ sku Magento\GroupedProduct\Test\Repository\GroupedProductInjectable Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface - + grouped grouped @@ -25,7 +25,7 @@ product - + category_ids static 0 @@ -34,134 +34,134 @@ product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds - + country_of_manufacture varchar 0 select - + created_at static 1 text - + custom_design varchar 0 select - + associated virtual 1 grouped Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Associated - + custom_design_from datetime 0 date - + custom_design_to datetime 0 date - + custom_layout_update text 0 textarea - + description text 0 This is description for grouped product - + product-details - + gallery varchar 0 gallery - + gift_message_available varchar 0 select - + has_options static 0 text - + image varchar 0 media_image - + image_label varchar 0 text - + is_returnable varchar 0 2 select - + media_gallery varchar 0 gallery - + meta_description varchar 0 textarea - + meta_keyword text 0 textarea - + meta_title varchar 0 text - + name varchar 1 @@ -169,42 +169,42 @@ text product-details - + news_from_date datetime 0 date - + news_to_date datetime 0 date - + old_id int 0 text - + options_container varchar 0 container2 select - + page_layout varchar 0 select - + quantity_and_stock_status int 0 @@ -215,40 +215,40 @@ select product-details - + stock_data advanced-inventory - + related_tgtr_position_behavior int 0 text - + related_tgtr_position_limit int 0 text - + required_options static 0 text - + short_description text 0 This is short description for grouped product - + autosettings - + sku static 1 @@ -256,63 +256,63 @@ text product-details - + small_image varchar 0 media_image - + small_image_label varchar 0 text - + status int 0 1 select - + thumbnail varchar 0 media_image - + thumbnail_label varchar 0 text - + updated_at static 1 text - + upsell_tgtr_position_behavior int 0 text - + upsell_tgtr_position_limit int 0 text - + url_key varchar 0 @@ -320,35 +320,35 @@ text search-engine-optimization - + url_path varchar 0 text - + visibility int 0 4 select - + id virtual - + type_id virtual - + attribute_set_id virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - + website_ids virtual @@ -356,18 +356,18 @@ websites - + price virtual Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\Price - + checkout_data virtual null Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData - + taxable_goods diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php deleted file mode 100644 index 17843c6dee64e..0000000000000 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php +++ /dev/null @@ -1,93 +0,0 @@ -_data['default'] = [ - 'name' => 'Test grouped product %isolation%', - 'sku' => 'sku_test_grouped_product_%isolation%', - 'category_ids' => ['presets' => 'default'], - 'associated' => ['preset' => 'defaultSimpleProduct'], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-grouped-product-%isolation%', - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - ]; - - $this->_data['grouped_product_out_of_stock'] = [ - 'name' => 'Test grouped product %isolation%', - 'sku' => 'sku_test_grouped_product_%isolation%', - 'category_ids' => ['presets' => 'default'], - 'associated' => ['preset' => 'defaultSimpleProduct'], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-grouped-product-%isolation%', - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'Out of Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - ]; - - $this->_data['grouped_product_with_price'] = [ - 'name' => 'Test grouped product %isolation%', - 'sku' => 'sku_test_grouped_product_%isolation%', - 'price' => ['value' => '-', 'preset' => 'starting-560'], - 'category_ids' => ['presets' => 'default'], - 'associated' => ['preset' => 'defaultSimpleProduct'], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-grouped-product-%isolation%', - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - ]; - - $this->_data['three_simple_products'] = [ - 'name' => 'Grouped product %isolation%', - 'sku' => 'grouped_product_%isolation%', - 'category_ids' => ['presets' => 'default'], - 'associated' => ['preset' => 'three_simple_products'], - 'status' => 'Product online', - 'visibility' => 'Catalog, Search', - 'tax_class_id' => ['dataSet' => 'taxable_goods'], - 'url_key' => 'test-grouped-product-%isolation%', - 'quantity_and_stock_status' => [ - 'is_in_stock' => 'In Stock', - ], - 'website_ids' => ['Main Website'], - 'attribute_set_id' => ['dataSet' => 'default'], - 'checkout_data' => ['preset' => 'three_simple_products'], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml index 8601364fb7091..7469adfb2cd54 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml @@ -7,7 +7,7 @@ --> - + Test grouped product %isolation% sku_test_grouped_product_%isolation% @@ -26,13 +26,14 @@ In Stock - Main Website + Main Website default - + + Test grouped product %isolation% sku_test_grouped_product_%isolation% @@ -51,13 +52,14 @@ Out of Stock - Main Website + Main Website default - + + Test grouped product %isolation% sku_test_grouped_product_%isolation% @@ -80,13 +82,14 @@ In Stock - Main Website + Main Website default - + + Grouped product %isolation% grouped_product_%isolation% @@ -105,7 +108,7 @@ In Stock - Main Website + Main Website default diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 4a31154c7e39f..b0e95a66f72a4 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -7,38 +7,38 @@ --> + class="Magento\ImportExport\Test\Fixture\ImportExport"> Magento_ImportExport flat importexport_importdata - + id int 1 - + - + entity varchar - + Products - + - - behavior + + behavior varchar - + CSV - + - + data longtext - + - + diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index 13881dd5c154a..26145eb47cdb0 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -7,86 +7,86 @@ --> + class="Magento\Install\Test\Fixture\Install"> Magento_Install virtual install Magento\Install\Test\Repository\Install Magento\Install\Test\Handler\Install\InstallInterface - + dbHost virtual - + dbUser virtual - - dbPassword + + dbPassword virtual - + dbName virtual - - web + + web virtual - + admin virtual - + adminUsername virtual - + adminEmail virtual - + adminPassword virtual - + adminConfirm virtual - + apacheRewrites virtual - + dbTablePrefix virtual - + keyOwn virtual - + httpsAdmin virtual - + https virtual - + httpsFront virtual - + keyValue virtual - + language virtual - + language virtual diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 2ef840a1445db..95ba80ea35722 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -7,7 +7,7 @@ --> + class="Magento\Integration\Test\Fixture\Integration"> Magento_Integration composite @@ -20,188 +20,188 @@ Magento\Integration\Test\Repository\Integration Magento\Integration\Test\Handler\Integration\IntegrationInterface - + integration_id int 1 - + - + name varchar - + default_integration_%isolation% - + integration_info - - email + + email varchar - + test_%isolation%@example.com - + integration_info - + endpoint varchar - + - + integration_info - + status smallint - + - + - + consumer_id int - + - + - + created_at timestamp - + CURRENT_TIMESTAMP - + - + updated_at timestamp - + - + - + setup_type smallint - + 0 - + - + identity_link_url varchar - + - + integration_info - + entity_id int 1 - + - + admin_id int - + - + - + customer_id int - + - + - + type varchar - + - + - + token varchar - + - + - + secret varchar - + - + - + verifier varchar - + - + - + callback_url varchar - + - + - + revoked smallint - + 0 - + - + authorized smallint - + 0 - + - + user_type int - + - + - + key varchar - + - + - + rejected_callback_url varchar - + - + - + resource_access virtual api All - + resources virtual api - + token_secret virtual integration_info - + consumer_secret virtual integration_info diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php deleted file mode 100644 index af4e955fca7c8..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php +++ /dev/null @@ -1,44 +0,0 @@ -_data['default_with_all_resources'] = [ - 'name' => 'default_integration_%isolation%', - 'email' => 'test_%isolation%@example.com', - 'resource_access' => 'All', - 'resources' => [ - 'Dashboard', - 'Sales', - 'Products', - 'Customers', - 'My Account', - 'Marketing', - 'Content', - 'Reports', - 'Stores', - 'System', - 'Global Search', - ], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml index 2887f907ae519..19b87ceb9cf82 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml @@ -7,22 +7,22 @@ --> - + default_integration_%isolation% test_%isolation%@example.com All - Dashboard - Sales - Products - Customers - My Account - Marketing - Content - Reports - Stores - System - Global Search + Dashboard + Sales + Products + Customers + My Account + Marketing + Content + Reports + Stores + System + Global Search diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 5ef4f94ceec70..7da2397470ef0 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -7,7 +7,7 @@ --> + class="Magento\Newsletter\Test\Fixture\Template"> Magento_Newsletter flat newsletter_template @@ -16,89 +16,89 @@ Magento\Newsletter\Test\Repository\Template Magento\Newsletter\Test\Handler\Template\TemplateInterface - + template_id int 1 - + - + template_code varchar - + TemplateName%isolation% - + - - template_text + + template_text text - + Some text %isolation% - + - + template_text_preprocessed text - + - + - - template_styles + + template_styles text - + - + - + template_type int - + - + - + template_subject varchar - + TemplateSubject%isolation% - + - + template_sender_name varchar - + SenderName%isolation% - + - + template_sender_email varchar - + SenderName%isolation%@example.com - + - + template_actual smallint - + 1 - + - + added_at timestamp - + - + - + modified_at timestamp - + - + diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php deleted file mode 100644 index 00f90b9ced37c..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php +++ /dev/null @@ -1,33 +0,0 @@ -_data['default'] = [ - 'code' => 'Newsletter Template %isolation%', - 'subject' => 'Newsletter Subject %isolation%', - 'sender_name' => 'Sender Name %isolation%', - 'sender_email' => 'support%isolation%@example.com', - 'text' => 'Template Content %isolation%', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml index 7f8fed30effa3..4aa8886a786a7 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml @@ -7,7 +7,7 @@ --> - + Newsletter Template %isolation% Newsletter Subject %isolation% Sender Name %isolation% diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml index 760de60ee86fa..a5ff783b9253c 100644 --- a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml @@ -10,59 +10,74 @@ 1 + 0 + 1 1 GB + 0 0 + 1 + 0 + 1 1 GB + 0 0 + 1 + 0 + 1 1 GB + 0 0 + 1 + 0 + 1 1 GB + 0 0 diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml index 958fe1cdd7fb4..dad7740f4b51a 100644 --- a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml @@ -10,22 +10,27 @@ 1 + 0 + 1 1 GB + 0 0 + 0 0 + 1 Flat Rate diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index b76feb6214c5b..4d77973255691 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -7,7 +7,7 @@ --> + class="Magento\Review\Test\Fixture\Rating"> Magento_Review flat rating @@ -16,51 +16,51 @@ Magento\Review\Test\Repository\Rating Magento\Review\Test\Handler\Rating\RatingInterface - + rating_id smallint 1 - + - + entity_id smallint - + 0 - + - + rating_code varchar - + Rating %isolation% - + rating_information - + position smallint - + 0 - + rating_information - + is_active smallint - + Yes - + rating_information - + stores virtual rating_information Main Website/Main Website Store/Default Store View - + options virtual rating_information diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index b27e51e9c407b..56b153d0a6f52 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -7,7 +7,7 @@ --> + class="Magento\Review\Test\Fixture\Review"> Magento_Review composite @@ -18,87 +18,87 @@ Magento\Review\Test\Repository\ReviewInjectable Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface - + review_id bigint - + 0 - + - + created_at timestamp - + CURRENT_TIMESTAMP - + - + entity_id smallint - + catalogProductSimple::default - + Magento\Review\Test\Fixture\Review\EntityId - + entity_pk_value int - + 0 - + - + status_id smallint - + Approved - + - + detail_id bigint 1 - + - + store_id smallint - + 0 - + - + title varchar - + Summary review %isolation% - + - + detail text - + Text review %isolation% - + - + nickname varchar - + Guest customer %isolation% - + - + customer_id int - + - + - + select_stores virtual 1 @@ -107,7 +107,7 @@ multiselectgrouplist - + ratings virtual Magento\Review\Test\Fixture\Review\Ratings @@ -118,12 +118,12 @@ - + type string - + Administrator - + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php deleted file mode 100755 index e3422aa73d4c5..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php +++ /dev/null @@ -1,38 +0,0 @@ -_data['default'] = [ - 'rating_code' => 'Rating %isolation%', - 'stores' => ['Main Website/Main Website Store/Default Store View'], - 'is_active' => 'Yes', - ]; - - $this->_data['visibleOnDefaultWebsite'] = [ - 'rating_code' => 'productRating_%isolation%', - 'stores' => ['Main Website/Main Website Store/Default Store View'], - 'is_active' => 'Yes', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml index 92b41eb96032c..f33e6e8c44530 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml @@ -7,17 +7,18 @@ --> - + Rating %isolation% - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View Yes - + + productRating_%isolation% - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View Yes diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml deleted file mode 100644 index 6c40fd6c77671..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml index 6615127e31907..7e6724de2aea5 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml @@ -7,16 +7,16 @@ --> - + Approved - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View nickname_%isolation% title_%isolation% review_detail_%isolation% - + visibleOnDefaultWebsite 5 @@ -25,10 +25,11 @@ catalogProductSimple::default - + + Pending - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View nickname_%isolation% title_%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 d42feb0cbe872..3a477cce94b1f 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 @@ -42,13 +42,13 @@ high - + high - + > diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml index 8d60a37bb98c1..7972aa636057d 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml @@ -6,6 +6,6 @@ */ --> - - + + > diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml index 590a9959da1c5..e0789bc5ef0bd 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml @@ -15,6 +15,7 @@ 10441 Jefferson Blvd Suite 200 + US 12 diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index 574baf025f147..29528286cf247 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -7,7 +7,7 @@ --> + class="Magento\Sitemap\Test\Fixture\Sitemap"> Magento_Sitemap flat sitemap @@ -15,47 +15,47 @@ Magento\Sitemap\Test\Repository\Sitemap Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface - + sitemap_id int 1 - + - + sitemap_type varchar - + - + - - sitemap_filename + + sitemap_filename varchar - + sitemap.xml - + - + sitemap_path varchar - + / - + - + sitemap_time timestamp - + - + - + store_id smallint - + 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php deleted file mode 100644 index 80077b4fead7f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php +++ /dev/null @@ -1,30 +0,0 @@ -_data['default'] = [ - 'sitemap_filename' => 'sitemap.xml', - 'sitemap_path' => '/', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml index 50d20752bc31f..ebbeff18fe061 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml @@ -7,7 +7,7 @@ --> - + sitemap.xml / diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index fe34a2b51f5c7..cba22ff97b072 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -7,7 +7,7 @@ --> + class="Magento\Store\Test\Fixture\Store"> Magento_Store flat store @@ -15,55 +15,55 @@ Magento\Store\Test\Repository\Store Magento\Store\Test\Handler\Store\StoreInterface - + store_id smallint 1 1 - + - + code varchar - + default text - + website_id smallint - + 0 - + - + group_id smallint - + default select Magento\Store\Test\Fixture\Store\GroupId - - name + + name varchar - + Default Store View text - + sort_order smallint - + 0 text - + is_active smallint - + Enabled select diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 8df070f9b532d..de5cbaf8ccdfc 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -7,23 +7,23 @@ --> + class="Magento\Store\Test\Fixture\StoreGroup"> Magento_Store flat store_group Magento\Store\Model\Resource\Group\Collection - + Magento\Store\Test\Repository\StoreGroup Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface - + group_id smallint 1 - + - + website_id virtual Magento\Store\Test\Fixture\StoreGroup\WebsiteId @@ -31,14 +31,14 @@ main_website - + name varchar - + StoreGroup%isolation% - + - + root_category_id virtual Magento\Store\Test\Fixture\StoreGroup\CategoryId @@ -46,12 +46,12 @@ default_category - + default_store_id smallint - + 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index d9ba76ba70370..5499ced5c489d 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -7,7 +7,7 @@ --> + class="Magento\Store\Test\Fixture\Website"> Magento_Store flat store_website @@ -16,47 +16,47 @@ Magento\Store\Test\Repository\Website Magento\Store\Test\Handler\Website\WebsiteInterface - + website_id smallint 1 1 - + - + code varchar - + base - + - - name + + name varchar - + Main Website - + - + sort_order smallint - + 0 - + - + default_group_id smallint - + 0 - + - + is_default smallint - + 0 - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php deleted file mode 100644 index b839bb08082e9..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php +++ /dev/null @@ -1,58 +0,0 @@ -_data['default'] = [ - 'group_id' => ['dataSet' => 'default'], - 'name' => 'Default Store View', - 'code' => 'base', - 'is_active' => 'Enabled', - 'store_id' => 1, - ]; - - $this->_data['custom'] = [ - 'group_id' => ['dataSet' => 'default'], - 'name' => 'Custom_Store_%isolation%', - 'code' => 'code_%isolation%', - 'is_active' => 'Enabled', - ]; - - $this->_data['default_store_view'] = [ - 'store_id' => 1, - 'name' => 'Default Store View', - ]; - - $this->_data['All Store Views'] = [ - 'name' => 'All Store Views', - 'store_id' => 0, - ]; - - $this->_data['german'] = [ - 'group_id' => ['dataSet' => 'default'], - 'name' => 'DE%isolation%', - 'code' => 'de%isolation%', - 'is_active' => 'Enabled', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml index 1483dd488dbb5..9993e1128975e 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -6,6 +6,43 @@ */ --> - + + + + default + + Default Store View + base + Enabled + 1 + + + + + default + + Custom_Store_%isolation% + code_%isolation% + Enabled + + + + Default Store View + 1 + + + + All Store Views + 0 + + + + + default + + DE%isolation% + de%isolation% + Enabled + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php deleted file mode 100644 index a51aaba9dafee..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php +++ /dev/null @@ -1,47 +0,0 @@ -_data['default'] = [ - 'website_id' => [ - 'dataSet' => 'main_website', - ], - 'name' => 'Main Website Store', - 'group_id' => 1, - 'root_category_id' => [ - 'dataSet' => 'default_category', - ], - ]; - - $this->_data['custom'] = [ - 'website_id' => [ - 'dataSet' => 'main_website', - ], - 'name' => 'store_name_%isolation%', - 'root_category_id' => [ - 'dataSet' => 'default_category', - ], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml index 331974851fc59..7a21d1b544077 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml @@ -7,7 +7,7 @@ --> - + main_website @@ -17,7 +17,8 @@ default_category - + + main_website diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php deleted file mode 100644 index 97cef07a17e39..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php +++ /dev/null @@ -1,43 +0,0 @@ -_data['all_websites'] = [ - 'name' => 'All Websites', - 'website_id' => 0, - ]; - - $this->_data['main_website'] = [ - 'name' => 'Main Website', - 'code' => 'base', - 'sort_order' => 0, - 'website_id' => 1, - ]; - - $this->_data['custom_website'] = [ - 'name' => 'Web_Site_%isolation%', - 'code' => 'code_%isolation%', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml index 924127c963cfc..5173bc5fb3c96 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml @@ -7,17 +7,19 @@ --> - + All Websites 0 - + + Main Website base 0 1 - + + Web_Site_%isolation% code_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index dc0b9aba114a1..0c8e1562ca1b2 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -7,7 +7,7 @@ --> + class="Magento\Tax\Test\Fixture\TaxClass"> Magento_Tax flat tax_class @@ -16,28 +16,28 @@ Magento\Tax\Test\Repository\TaxClass Magento\Tax\Test\Handler\TaxClass\TaxClassInterface - + class_id smallint 1 - + - + class_name varchar - + Tax Class %isolation% - + - - class_type + + class_type varchar - + CUSTOMER - + - + id virtual diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index ddeae57a7a7d3..7419210e61321 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -7,7 +7,7 @@ --> + class="Magento\Tax\Test\Fixture\TaxRate"> Magento_Tax flat tax_calculation_rate @@ -16,70 +16,70 @@ Magento\Tax\Test\Repository\TaxRate Magento\Tax\Test\Handler\TaxRate\TaxRateInterface - + tax_calculation_rate_id int 1 - + - + tax_country_id varchar - + United States - + - + tax_region_id int - + California - + - + tax_postcode varchar - + * - + - - code + + code varchar - + Tax Rate %isolation% - + - + rate decimal - + 10 - + - + zip_is_range smallint - + - + - + zip_from int - + - + - + zip_to int - + - + - + id virtual diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index 462c9003c09be..a00ce61a52902 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -7,7 +7,7 @@ --> + class="Magento\Tax\Test\Fixture\TaxRule"> Magento_Tax flat tax_calculation_rule @@ -16,36 +16,36 @@ Magento\Tax\Test\Repository\TaxRule Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface - + tax_calculation_rule_id int 1 - + - + code varchar - + TaxIdentifier%isolation% - + - + priority int - + - + - + position int - + - + - - tax_rate + + tax_rate virtual Magento\Tax\Test\Fixture\TaxRule\TaxRate @@ -54,12 +54,12 @@ - + tax_customer_class virtual Magento\Tax\Test\Fixture\TaxRule\TaxClass - + tax_product_class virtual Magento\Tax\Test\Fixture\TaxRule\TaxClass diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml index 9305b85b1c65e..49c119ceb1c8b 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml @@ -10,9 +10,11 @@ 2 + 0 + ROW_BASE_CALCULATION 1 @@ -28,6 +30,7 @@ 0 0 + ROW_BASE_CALCULATION 0 @@ -43,6 +46,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -58,6 +62,7 @@ 0 0 + ROW_BASE_CALCULATION 1 @@ -73,6 +78,7 @@ 0 0 + UNIT_BASE_CALCULATION 1 @@ -88,6 +94,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -103,6 +110,7 @@ 0 0 + UNIT_BASE_CALCULATION 0 @@ -118,6 +126,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 @@ -133,6 +142,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -148,6 +158,7 @@ 0 0 + UNIT_BASE_CALCULATION 0 @@ -163,6 +174,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -178,6 +190,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 @@ -193,6 +206,7 @@ 0 1 + TOTAL_BASE_CALCULATION 0 @@ -208,6 +222,7 @@ 0 1 + TOTAL_BASE_CALCULATION 0 @@ -223,6 +238,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 @@ -238,6 +254,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 @@ -253,6 +270,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -268,6 +286,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -283,6 +302,7 @@ 0 0 + TOTAL_BASE_CALCULATION 0 @@ -298,6 +318,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 @@ -313,6 +334,7 @@ 0 0 + TOTAL_BASE_CALCULATION 1 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php deleted file mode 100644 index 83b78bcda1d10..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php +++ /dev/null @@ -1,60 +0,0 @@ -_data['taxable_goods'] = [ - 'class_id' => '2', - 'class_name' => 'Taxable Goods', - 'class_type' => 'PRODUCT', - 'id' => '2', - 'mtf_dataset_name' => 'Taxable Goods', - ]; - - $this->_data['retail_customer'] = [ - 'class_id' => '3', - 'class_name' => 'Retail Customer', - 'class_type' => 'CUSTOMER', - 'id' => '3', - 'mtf_dataset_name' => 'Retail Customer', - ]; - - $this->_data['customer_tax_class'] = [ - 'class_name' => 'Customer Tax Class %isolation%', - 'class_type' => 'CUSTOMER', - ]; - - $this->_data['product_tax_class'] = [ - 'class_name' => 'Product Tax Class %isolation%', - 'class_type' => 'PRODUCT', - ]; - - $this->_data['None'] = [ - 'class_name' => 'None', - 'class_type' => 'PRODUCT', - 'id' => '0', - ]; - - $this->_data['all'] = [ - 'class_name' => 'All', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml index fd4a9abe2f4e0..f158cfbc7fab6 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml @@ -7,34 +7,39 @@ --> - + 2 Taxable Goods PRODUCT 2 Taxable Goods - + + 3 Retail Customer CUSTOMER 3 Retail Customer - - Customer Tax Class %isolation% + + + Customer Tax Class %isolation% CUSTOMER - + + Product Tax Class %isolation% PRODUCT - - None + + + None PRODUCT 0 - + + All diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php deleted file mode 100644 index ac70b70f26104..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php +++ /dev/null @@ -1,174 +0,0 @@ -_data['US-CA-Rate_1'] = [ - 'tax_calculation_rate_id' => '1', - 'tax_country_id' => 'US', - 'tax_region_id' => '12', - 'tax_postcode' => '*', - 'code' => 'US-CA-*-Rate 1', - 'rate' => '8.2500', - 'zip_is_range' => '', - 'zip_from' => '', - 'zip_to' => '', - 'id' => '1', - 'mtf_dataset_name' => 'US-CA-*-Rate 1', - ]; - - $this->_data['US-NY-Rate_1'] = [ - 'tax_calculation_rate_id' => '2', - 'tax_country_id' => 'US', - 'tax_region_id' => '43', - 'tax_postcode' => '*', - 'code' => 'US-NY-*-Rate 1', - 'rate' => '8.3750', - 'zip_is_range' => '', - 'zip_from' => '', - 'zip_to' => '', - 'id' => '2', - 'mtf_dataset_name' => 'US-NY-*-Rate 1', - ]; - - $this->_data['us_ca_rate_8_25'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.25', - 'tax_country_id' => 'United States', - 'tax_postcode' => '90230', - 'tax_region_id' => 'California', - ]; - - $this->_data['us_ca_rate_8_25_no_zip'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.25', - 'tax_country_id' => 'United States', - 'tax_postcode' => '*', - 'tax_region_id' => 'California', - ]; - - $this->_data['us_ca_rate_8_375'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.375', - 'tax_country_id' => 'United States', - 'tax_postcode' => '*', - 'tax_region_id' => 'California', - ]; - - $this->_data['us_ny_rate_8_375'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.375', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'New York', - 'tax_postcode' => '*', - ]; - - $this->_data['us_ny_rate_8_25'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.25', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'New York', - 'tax_postcode' => '*', - ]; - - $this->_data['us_ny_rate_8_1'] = [ - 'code' => 'US-NY-*-%isolation%', - 'rate' => '8.1', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'New York', - 'tax_postcode' => '*', - ]; - - $this->_data['paypal_rate_8_25'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '8.25', - 'tax_country_id' => 'United States', - 'tax_postcode' => '95131', - 'tax_region_id' => 'California', - ]; - - $this->_data['uk_full_tax_rate'] = [ - 'code' => 'Tax Rate %isolation%', - 'rate' => '20', - 'tax_country_id' => 'United Kingdom', - 'tax_postcode' => '*', - ]; - - $this->_data['default'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '*', - 'tax_country_id' => 'Australia', - 'rate' => '20', - ]; - - $this->_data['withZipRange'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'zip_is_range' => 'Yes', - 'zip_from' => '90001', - 'zip_to' => '96162', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'California', - 'rate' => '15.5', - ]; - - $this->_data['withFixedZip'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '*', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'Texas', - 'rate' => '20', - ]; - - $this->_data['us_ut_fixed_zip_rate_20'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '84001', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'Utah', - 'rate' => '20', - ]; - - $this->_data['tx_rate_10'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '*', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'Texas', - 'rate' => '10', - ]; - - $this->_data['ny_rate_20'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '*', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'New York', - 'rate' => '20', - ]; - - $this->_data['ca_rate_30'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_postcode' => '*', - 'tax_country_id' => 'United States', - 'tax_region_id' => 'California', - 'rate' => '30', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml index 1059bff315e0c..e842c0ead0235 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml @@ -7,94 +7,105 @@ --> - + 1 US 12 * US-CA-*-Rate 1 8.2500 - - - + + + 1 US-CA-*-Rate 1 - + + 2 US 43 * US-NY-*-Rate 1 8.3750 - - - + + + 2 US-NY-*-Rate 1 - + + Tax Rate %isolation% 8.25 United States 90230 California - + + Tax Rate %isolation% 8.25 United States * California - + + Tax Rate %isolation% 8.375 United States * California - + + Tax Rate %isolation% 8.375 United States New York * - + + Tax Rate %isolation% 8.25 United States New York * - + + US-NY-*-%isolation% 8.1 United States New York * - + + Tax Rate %isolation% 8.25 United States 95131 California - + + Tax Rate %isolation% 20 United Kingdom * - + + TaxIdentifier%isolation% * Australia 20 - + + TaxIdentifier%isolation% Yes 90001 @@ -103,35 +114,40 @@ California 15.5 - + + TaxIdentifier%isolation% * United States Texas 20 - + + TaxIdentifier%isolation% 84001 United States Utah 20 - + + TaxIdentifier%isolation% * United States Texas 10 - + + TaxIdentifier%isolation% * United States New York 20 - + + TaxIdentifier%isolation% * United States diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php deleted file mode 100644 index c56b03539d841..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php +++ /dev/null @@ -1,166 +0,0 @@ -_data['custom_rule'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'us_ca_rate_8_25', - 1 => 'us_ny_rate_8_375', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['us_ca_ny_rule'] = [ - 'code' => 'Tax Rule %isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'US-CA-Rate_1', - 1 => 'us_ny_rate_8_1', - ], - ], - 'tax_customer_class' => [ - 'dataSet' => [ - 0 => 'retail_customer', - 1 => 'customer_tax_class', - ], - ], - 'tax_product_class' => [ - 'dataSet' => [ - 0 => 'taxable_goods', - 1 => 'product_tax_class', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['uk_full_tax_rule'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'uk_full_tax_rate', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['tax_rule_default'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'US-CA-Rate_1', - ], - ], - 'tax_customer_class' => [ - 'dataSet' => [ - 0 => 'retail_customer', - ], - ], - 'tax_product_class' => [ - 'dataSet' => [ - 0 => 'taxable_goods', - ], - ], - 'priority' => '1', - 'position' => '1', - ]; - - $this->_data['tax_rule_with_custom_tax_classes'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'US-CA-Rate_1', - 1 => 'US-NY-Rate_1', - ], - ], - 'tax_customer_class' => [ - 'dataSet' => [ - 0 => 'retail_customer', - 1 => 'customer_tax_class', - ], - ], - 'tax_product_class' => [ - 'dataSet' => [ - 0 => 'product_tax_class', - 1 => 'taxable_goods', - ], - ], - 'priority' => '1', - 'position' => '1', - ]; - - $this->_data['customer_equals_store_rate'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'us_ca_rate_8_25_no_zip', - 1 => 'us_ny_rate_8_25', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['customer_less_store_rate'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'us_ca_rate_8_375', - 1 => 'us_ny_rate_8_25', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['customer_greater_store_rate'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'us_ca_rate_8_25_no_zip', - 1 => 'us_ny_rate_8_375', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - - $this->_data['cross_border_tax_rule'] = [ - 'code' => 'TaxIdentifier%isolation%', - 'tax_rate' => [ - 'dataSet' => [ - 0 => 'tx_rate_10', - 1 => 'ny_rate_20', - 2 => 'ca_rate_30', - ], - ], - 'priority' => '0', - 'position' => '0', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml index 1c31f0d3cdebb..b1b4e9f0aba4e 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml @@ -7,133 +7,141 @@ --> - + TaxIdentifier%isolation% - us_ca_rate_8_25 - us_ny_rate_8_375 + us_ca_rate_8_25 + us_ny_rate_8_375 0 0 - + + Tax Rule %isolation% - US-CA-Rate_1 - us_ny_rate_8_1 + US-CA-Rate_1 + us_ny_rate_8_1 - retail_customer - customer_tax_class + retail_customer + customer_tax_class - taxable_goods - product_tax_class + taxable_goods + product_tax_class 0 0 - + + TaxIdentifier%isolation% - uk_full_tax_rate + uk_full_tax_rate 0 0 - + + TaxIdentifier%isolation% - US-CA-Rate_1 + US-CA-Rate_1 - retail_customer + retail_customer - taxable_goods + taxable_goods 1 1 - + + TaxIdentifier%isolation% - US-CA-Rate_1 - US-NY-Rate_1 + US-CA-Rate_1 + US-NY-Rate_1 - retail_customer - customer_tax_class + retail_customer + customer_tax_class - product_tax_class - taxable_goods + product_tax_class + taxable_goods 1 1 - + + TaxIdentifier%isolation% - us_ca_rate_8_25_no_zip - us_ny_rate_8_25 + us_ca_rate_8_25_no_zip + us_ny_rate_8_25 0 0 - + + TaxIdentifier%isolation% - us_ca_rate_8_375 - us_ny_rate_8_25 + us_ca_rate_8_375 + us_ny_rate_8_25 0 0 - + + TaxIdentifier%isolation% - us_ca_rate_8_25_no_zip - us_ny_rate_8_375 + us_ca_rate_8_25_no_zip + us_ny_rate_8_375 0 0 - + + TaxIdentifier%isolation% - tx_rate_10 - ny_rate_20 - ca_rate_30 + tx_rate_10 + ny_rate_20 + ca_rate_30 0 diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml index e59441cb3ff4a..63fec194d2f96 100644 --- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -10,6 +10,7 @@ 0 + 1 1 diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index 23f0067b04a7e..f7789db76308e 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -7,7 +7,7 @@ --> + class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"> Magento_UrlRewrite virtual url_rewrite @@ -16,11 +16,11 @@ Magento\UrlRewrite\Test\Repository\UrlRewrite Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface - + id virtual - + store_id varchar 1 @@ -28,27 +28,27 @@ Magento\UrlRewrite\Test\Fixture\UrlRewrite\StoreId select - + redirect_type int 0 select - + request_path varchar 1 test_request%isolation% text - + entity_type varchar 0 text - + target_path varchar 1 @@ -56,7 +56,7 @@ text Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath - + description varchar 0 diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php deleted file mode 100644 index 4c830610af11f..0000000000000 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php +++ /dev/null @@ -1,46 +0,0 @@ -_data['default'] = [ - 'request_path' => 'test-test-test%isolation%.html', - 'target_path' => 'http://www.ebayinc.com/', - 'redirect_type' => 'Temporary (302)', - 'store_id' => 'Main Website/Main Website Store/Default Store View', - ]; - - $this->_data['default_without_target'] = [ - 'request_path' => 'test-test-test%isolation%.html', - 'redirect_type' => 'Temporary (302)', - 'store_id' => 'Main Website/Main Website Store/Default Store View', - ]; - - $this->_data['custom_rewrite_wishlist'] = [ - 'store_id' => 'Main Website/Main Website Store/Default Store View', - 'request_path' => 'wishlist/%isolation%', - 'target_path' => 'http://google.com', - 'redirect_type' => 'Temporary (302)', - 'description' => 'test description', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml index f79f99cb7c53b..9e65d3460c51b 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml @@ -7,18 +7,20 @@ --> - + test-test-test%isolation%.html http://www.ebayinc.com/ Temporary (302) Main Website/Main Website Store/Default Store View - + + test-test-test%isolation%.html Temporary (302) Main Website/Main Website Store/Default Store View - + + Main Website/Main Website Store/Default Store View wishlist/%isolation% http://google.com 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 df293a41289e3..4257e4531e636 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 @@ -9,8 +9,8 @@ low - - + + > @@ -22,31 +22,31 @@ low - - - - + /> + "/> + e"/> + er"/> low - + dex"/> low - - + ndex"/> + write"/> low - - - + ctView"/> + Rewrite"/> + \Browser"/> @@ -55,16 +55,16 @@ low - - + rlRewrite"/> + nt\Browser"/> low - - - + \UrlRewrite"/> + ient\Browser"/> + gCategoryView"/> diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index accb13f5bad4f..20e0125b5f954 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -7,7 +7,7 @@ --> + class="Magento\User\Test\Fixture\AdminUserRole"> Magento_User flat authorization_role @@ -15,75 +15,75 @@ Magento\User\Test\Repository\AdminUserRole Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface - + role_id int 1 - + - + parent_id int - + 0 - + - + tree_level smallint - + 0 - + - + sort_order smallint - + 0 - + - + role_type varchar - + 0 - + - + user_id int - + 0 - + - + rolename varchar - + AdminRole%isolation% - + role-info - + user_type varchar - + - + - + resource_access virtual role-resources All - + roles_resources virtual role-resources - + in_role_users virtual in_role_users diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index 5363e6ad51721..29a7547c19e03 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -7,7 +7,7 @@ --> + class="Magento\User\Test\Fixture\User"> Magento_User flat admin_user @@ -15,136 +15,136 @@ Magento\User\Test\Repository\User Magento\User\Test\Handler\User\UserInterface - + user_id int 1 - + - + firstname varchar - + FirstName%isolation% - + user-info - + lastname varchar - + LastName%isolation% - + user-info - + email varchar - + email%isolation%@example.com - + user-info - + username varchar - + AdminUser%isolation% - + user-info - + password varchar - + 123123q - + user-info - + created timestamp - + CURRENT_TIMESTAMP - + - + modified timestamp - + - + - + logdate timestamp - + - + - + lognum smallint - + 0 - + - + reload_acl_flag smallint - + 0 - + - + is_active smallint - + Active - + - + extra text - + - + - + rp_token text - + - + - + rp_token_created_at timestamp - + - + - + interface_locale varchar - + en_US - + - + role_id virtual user-role Magento\User\Test\Fixture\User\RoleId - + password_confirmation virtual user-info 123123q - + current_password virtual user-info diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml deleted file mode 100644 index 1483dd488dbb5..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php deleted file mode 100644 index 1a27372e5f9cd..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php +++ /dev/null @@ -1,60 +0,0 @@ -_data['default'] = [ - 'username' => 'admin', - 'firstname' => 'FirstName%isolation%', - 'lastname' => 'LastName%isolation%', - 'email' => 'email%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'user_id' => 1, - 'current_password' => '%current_password%', - ]; - - $this->_data['custom_admin'] = [ - 'username' => 'AdminUser%isolation%', - 'firstname' => 'FirstName%isolation%', - 'lastname' => 'LastName%isolation%', - 'email' => 'email%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'current_password' => '%current_password%', - ]; - - $this->_data['custom_admin_with_default_role'] = [ - 'username' => 'AdminUser%isolation%', - 'firstname' => 'FirstName%isolation%', - 'lastname' => 'LastName%isolation%', - 'email' => 'email%isolation%@example.com', - 'password' => '123123q', - 'password_confirmation' => '123123q', - 'role_id' => ['dataSet' => 'default'], - 'current_password' => '%current_password%', - 'is_active' => 'Active', - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml index 76f156b4ca86f..4be62392dd494 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml @@ -7,7 +7,7 @@ --> - + admin FirstName%isolation% LastName%isolation% @@ -17,7 +17,8 @@ 1 %current_password% - + + AdminUser%isolation% FirstName%isolation% LastName%isolation% @@ -26,7 +27,8 @@ 123123q %current_password% - + + AdminUser%isolation% FirstName%isolation% LastName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml index 0a357e3bc1411..2223b5b244c63 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml @@ -6,6 +6,6 @@ */ --> - - + + > \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml index 2485941f13753..97a81ffcffd01 100644 --- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -10,6 +10,7 @@ 0 + 1 http://production.shippingapis.com/ShippingAPI.dll From 8cb8c04d72466617ced85bb3387b3d21bd68e22e Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Mon, 19 Jan 2015 12:07:25 +0200 Subject: [PATCH 12/29] MTA-1355: Update tests with configuration fixture --- dev/tests/functional/composer.json | 8 +- .../Backend/Test/Fixture/GlobalSearch.xml | 2 +- .../Backend/Test/Repository/ConfigData.xml | 4 +- .../Bundle/Test/Fixture/BundleProduct.xml | 24 +- .../Test/Fixture/CatalogAttributeSet.xml | 10 +- .../Test/Fixture/CatalogProductAttribute.xml | 50 ++-- .../Test/Fixture/CatalogProductSimple.xml | 37 ++- .../Test/Fixture/CatalogProductVirtual.xml | 28 +- .../Magento/Catalog/Test/Fixture/Category.xml | 18 +- .../Test/Repository/CatalogProductSimple.xml | 16 +- .../Test/Repository/ConfigData.xml | 4 +- .../CatalogRule/Test/Fixture/CatalogRule.xml | 19 +- .../CatalogRule/Test/etc/constraint.xml | 36 +-- .../Test/Fixture/CatalogSearchQuery.xml | 14 +- .../Magento/Checkout/Test/Fixture/Cart.xml | 44 +-- .../Test/Block/Adminhtml/AgreementGrid.php | 41 +++ .../Block/Agreement/Edit/AgreementsForm.php | 18 ++ .../Block/Agreement/Edit/AgreementsForm.xml | 25 ++ .../Test/Block/Onepage/AgreementReview.php | 72 +++++ .../Constraint/AssertTermAbsentInGrid.php | 48 ++++ .../Constraint/AssertTermAbsentOnCheckout.php | 92 +++++++ .../Test/Constraint/AssertTermInGrid.php | 48 ++++ .../Test/Constraint/AssertTermOnCheckout.php | 109 ++++++++ .../AssertTermSuccessDeleteMessage.php | 51 ++++ .../AssertTermSuccessSaveMessage.php | 51 ++++ .../Test/Fixture/CheckoutAgreement.xml | 78 ++++++ .../Test/Fixture/CheckoutAgreement/Stores.php | 105 ++++++++ .../CheckoutAgreementInterface.php | 17 ++ .../Test/Handler/CheckoutAgreement/Curl.php | 88 ++++++ .../Page/Adminhtml/CheckoutAgreementIndex.xml | 26 ++ .../Page/Adminhtml/CheckoutAgreementNew.xml | 21 ++ .../Test/Page/CheckoutOnepage.xml | 16 ++ .../Test/Repository/CheckoutAgreement.xml | 52 ++++ .../Test/Repository/ConfigData.xml | 18 ++ .../Test/TestCase/CreateTermEntityTest.php | 89 +++++++ .../TestCase/CreateTermEntityTest/test.csv | 5 + .../Test/TestCase/DeleteTermEntityTest.php | 104 ++++++++ .../TestCase/DeleteTermEntityTest/test.csv | 2 + .../Test/TestCase/UpdateTermEntityTest.php | 95 +++++++ .../TestCase/UpdateTermEntityTest/test.csv | 4 + .../TestStep/DeleteAllTermsEntityStep.php | 60 +++++ .../Test/etc/constraint.xml | 27 ++ .../CheckoutAgreements/Test/etc/curl/di.xml | 10 + .../CheckoutAgreements/Test/etc/fixture.xml | 14 + .../CheckoutAgreements/Test/etc/page.xml | 19 ++ .../Fixture/ConfigurableProductInjectable.xml | 36 +-- .../ConfigurableProductInjectable.xml | 14 +- .../Magento/Core/Test/Fixture/ConfigData.xml | 14 +- .../Core/Test/Fixture/SystemVariable.xml | 18 +- .../Core/Test/Repository/SystemVariable.xml | 2 +- .../System/Currency/GridPageActions.php | 67 +++++ .../System/Currency/MainPageActions.php | 33 +++ .../Adminhtml/System/CurrencySymbolForm.php | 39 +++ .../Adminhtml/System/CurrencySymbolForm.xml | 21 ++ .../Adminhtml/System/FormPageActions.php | 23 ++ .../AssertCurrencySymbolOnCatalogPage.php | 64 +++++ .../AssertCurrencySymbolOnProductPage.php | 65 +++++ ...AssertCurrencySymbolSuccessSaveMessage.php | 49 ++++ .../Test/Fixture/CurrencySymbolEntity.xml | 69 +++++ .../Handler/CurrencySymbolEntity/Curl.php | 38 +++ .../CurrencySymbolEntityInterface.php | 17 ++ .../Page/Adminhtml/SystemCurrencyIndex.xml | 21 ++ .../Adminhtml/SystemCurrencySymbolIndex.xml | 26 ++ .../Test/Repository/CurrencySymbolEntity.xml | 23 ++ .../TestCase/EditCurrencySymbolEntityTest.php | 127 +++++++++ .../EditCurrencySymbolEntityTest/test.csv | 4 + .../ResetCurrencySymbolEntityTest.php | 171 ++++++++++++ .../ResetCurrencySymbolEntityTest/test.csv | 2 + .../CurrencySymbol/Test/etc/constraint.xml | 34 +++ .../CurrencySymbol/Test/etc/curl/di.xml | 10 + .../CurrencySymbol/Test/etc/fixture.xml | 23 ++ .../Magento/CurrencySymbol/Test/etc/page.xml | 19 ++ .../Test/Fixture/AddressInjectable.xml | 20 +- .../Test/Fixture/CustomerGroupInjectable.xml | 6 +- .../Test/Fixture/CustomerInjectable.xml | 10 +- .../app/Magento/Customer/Test/etc/curl/di.xml | 2 +- .../Dhl/Test/Repository/ConfigData.xml | 4 +- .../Test/Block/Currency/Switcher.php | 60 +++++ .../Directory/Test/Repository/ConfigData.xml | 36 +++ .../Fixture/DownloadableProductInjectable.xml | 52 ++-- .../Fedex/Test/Repository/ConfigData.xml | 4 +- .../GiftMessage/Test/Fixture/GiftMessage.xml | 12 +- .../Test/Repository/ConfigData.xml | 6 +- .../Magento/GiftMessage/Test/etc/scenario.xml | 4 +- .../Test/Fixture/GoogleShoppingAttribute.xml | 24 +- .../Repository/GoogleShoppingAttribute.xml | 4 +- .../Test/Fixture/GroupedProductInjectable.xml | 26 +- .../Test/Fixture/ImportExport.xml | 4 +- .../Integration/Test/Fixture/Integration.xml | 20 +- .../Newsletter/Test/Fixture/Template.xml | 12 +- .../Test/Repository/ConfigData.xml | 4 +- .../Test/Repository/ConfigData.xml | 4 +- .../Reports/Test/Repository/ConfigData.xml | 4 +- .../Magento/Review/Test/Fixture/Rating.xml | 10 +- .../Magento/Review/Test/Fixture/Review.php | 250 ------------------ .../Magento/Review/Test/Fixture/Review.xml | 34 +-- .../Magento/Review/Test/etc/constraint.xml | 2 +- .../app/Magento/Review/Test/etc/curl/di.xml | 2 +- .../Shipping/Test/Repository/ConfigData.xml | 8 +- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 6 +- .../app/Magento/Store/Test/Fixture/Store.xml | 16 +- .../Magento/Store/Test/Fixture/StoreGroup.xml | 12 +- .../Magento/Store/Test/Fixture/Website.xml | 12 +- .../Magento/Store/Test/Repository/Store.xml | 6 +- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 4 +- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 10 +- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 4 +- .../Tax/Test/Repository/ConfigData.xml | 4 +- .../testCreateTaxRule.csv | 4 +- .../Ups/Test/Repository/ConfigData.xml | 4 +- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 6 +- .../UrlRewrite/Test/etc/constraint.xml | 32 +-- .../User/Test/Fixture/AdminUserRole.xml | 14 +- .../app/Magento/User/Test/Fixture/User.xml | 22 +- .../Test/Fixture/User/CurrentPassword.php | 15 +- .../User/Test/Repository/AdminUserRole.php | 63 ----- .../User/Test/Repository/AdminUserRole.xml | 48 ++++ .../app/Magento/User/Test/etc/curl/di.xml | 2 +- .../Usps/Test/Repository/ConfigData.xml | 4 +- .../Weee/Test/Repository/ConfigData.xml | 198 ++++++++++++++ lib/internal/Magento/Framework/Config/Dom.php | 1 + .../Framework/Config/Reader/Filesystem.php | 1 + .../Data/Argument/Interpreter/Composite.php | 1 + 123 files changed, 3128 insertions(+), 733 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/curl/di.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/fixture.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/page.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/GridPageActions.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/MainPageActions.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/FormPageActions.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/curl/di.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml create mode 100644 dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/page.xml create mode 100644 dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php create mode 100644 dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml delete mode 100755 dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php delete mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index e2e3d4ad289ce..3c2b4edfbfd0a 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,6 +1,12 @@ { + "repositories": [ + { + "type": "git", + "url": "https://daponasenko:Magento%^78@github.corp.ebay.com/mtf/mtf.git" + } + ], "require": { - "magento/mtf": "1.0.0-rc11", + "magento/mtf": "dev-MTA-1136", "php": ">=5.4.0", "phpunit/phpunit": "4.1.0", "phpunit/phpunit-selenium": ">=1.2", diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index ee925127bbe01..ce09aa095f173 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -14,7 +14,7 @@ query virtual Magento\Backend\Test\Fixture\GlobalSearch\Query - catalogProductSimple::default::name + catalogProductSimple::default::name diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml index 086ec63fff02f..d95a3fae93252 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + Store 1 1234-123-123 diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index cddc50c05fb1d..665bfcf487a56 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -88,7 +88,7 @@ enable_googlecheckout int 0 - 1 + 1 select @@ -190,14 +190,14 @@ msrp_display_actual_price_type varchar 0 - 4 + 4 select name varchar 1 - BundleProduct %isolation% + BundleProduct %isolation% text product-details @@ -226,7 +226,7 @@ options_container varchar 0 - container2 + container2 select @@ -265,7 +265,7 @@ price_type int 1 - Dynamic + Dynamic select product-details @@ -273,7 +273,7 @@ status int 0 - 1 + 1 checkbox product-details @@ -289,7 +289,7 @@ quantity_and_stock_status int 0 - 1 + 1 select product-details @@ -338,7 +338,7 @@ sku_type int 1 - Dynamic + Dynamic select product-details @@ -346,7 +346,7 @@ weight_type int 1 - Dynamic + Dynamic select product-details @@ -402,7 +402,7 @@ tax_class_id int 0 - Taxable Goods + Taxable Goods select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass @@ -456,7 +456,7 @@ visibility int 0 - 4 + 4 select autosettings @@ -507,7 +507,7 @@ website_ids virtual - Main Website + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 0470a2ebc45f8..9f553177f47cd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -26,29 +26,29 @@ entity_type_id smallint - 0 + 0 attribute_set_name varchar - Default_attribute_set_%isolation% + Default_attribute_set_%isolation% sort_order smallint - 0 + 0 skeleton_set varchar - - default + + default Magento\Catalog\Test\Fixture\CatalogAttributeSet\SkeletonSet diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index 9e7b1079687d3..a3f0a1fa7d9b0 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -11,8 +11,8 @@ Magento_Catalog composite - eav_attribute - catalog_eav_attribute + + Magento\Catalog\Model\Resource\Attribute Magento\Catalog\Test\Repository\CatalogProductAttribute @@ -29,7 +29,7 @@ entity_type_id smallint - 0 + 0 @@ -58,7 +58,7 @@ backend_type varchar - static + static @@ -79,7 +79,7 @@ frontend_input varchar - Text Field + Text Field select properties @@ -87,7 +87,7 @@ frontend_label varchar - attribute_label%isolation% + attribute_label%isolation% properties @@ -117,7 +117,7 @@ is_required smallint - No + No select properties @@ -125,14 +125,14 @@ is_user_defined smallint - 0 + 0 is_unique smallint - 0 + 0 advanced-properties @@ -154,7 +154,7 @@ is_global smallint - 1 + 1 advanced-properties @@ -162,14 +162,14 @@ is_visible smallint - 1 + 1 is_searchable smallint - 0 + 0 frontend-properties @@ -177,7 +177,7 @@ is_filterable smallint - 0 + 0 frontend-properties @@ -185,7 +185,7 @@ is_comparable smallint - 0 + 0 frontend-properties @@ -193,7 +193,7 @@ is_visible_on_front smallint - 0 + 0 frontend-properties @@ -201,7 +201,7 @@ is_html_allowed_on_front smallint - 0 + 0 frontend-properties @@ -209,7 +209,7 @@ is_used_for_price_rules smallint - 0 + 0 frontend-properties @@ -217,7 +217,7 @@ is_filterable_in_search smallint - 0 + 0 frontend-properties @@ -225,7 +225,7 @@ used_in_product_listing smallint - 0 + 0 frontend-properties @@ -233,7 +233,7 @@ used_for_sort_by smallint - 0 + 0 frontend-properties @@ -248,7 +248,7 @@ is_visible_in_advanced_search smallint - 0 + 0 frontend-properties @@ -256,21 +256,21 @@ position int - 0 + 0 is_wysiwyg_enabled smallint - 0 + 0 is_used_for_promo_rules smallint - 0 + 0 @@ -285,7 +285,7 @@ search_weight smallint - 1 + 1 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 59f4411343db6..2986568c0ebc4 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -15,8 +15,7 @@ Magento\Catalog\Model\Resource\Product\Collection sku Magento\Catalog\Test\Repository\CatalogProductSimple - Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface - + Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface simple @@ -192,14 +191,14 @@ msrp_display_actual_price_type varchar 0 - Use config + Use config select name varchar 1 - Test simple product %isolation% + Test simple product %isolation% text product-details @@ -214,7 +213,7 @@ options_container varchar 0 - Block after Info Column + Block after Info Column select @@ -228,8 +227,8 @@ price decimal 1 - - 100 + + 100 price product-details @@ -239,9 +238,9 @@ quantity_and_stock_status array 0 - - 10 - In Stock + + 10 + In Stock product-details @@ -257,7 +256,7 @@ sku static 1 - test_simple_sku_%isolation% + test_simple_sku_%isolation% text product-details @@ -309,7 +308,7 @@ status int 0 - Product online + Product online checkbox product-details @@ -317,7 +316,7 @@ tax_class_id int 0 - Taxable Goods + Taxable Goods select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass @@ -371,7 +370,7 @@ visibility int 0 - Catalog, Search + Catalog, Search select autosettings @@ -379,7 +378,7 @@ weight decimal 0 - 12 + 12 weight product-details @@ -397,8 +396,8 @@ virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - - default + + default @@ -418,7 +417,7 @@ website_ids virtual - Main Website + Main Website websites @@ -426,7 +425,7 @@ is_returnable varchar 0 - 2 + 2 select autosettings diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index d05a1e61c6507..9f8ef48e020c6 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -29,7 +29,7 @@ is_virtual virtual product-details - Yes + Yes category_ids @@ -197,14 +197,14 @@ msrp_display_actual_price_type varchar 0 - Use config + Use config select name varchar 1 - Test virtual product %isolation% + Test virtual product %isolation% text product-details @@ -233,7 +233,7 @@ options_container varchar 0 - Block after Info Column + Block after Info Column select @@ -247,8 +247,8 @@ price decimal 1 - - 100 + + 100 price product-details @@ -258,9 +258,9 @@ quantity_and_stock_status int 0 - - 10 - In Stock + + 10 + In Stock select product-details @@ -276,7 +276,7 @@ sku static 1 - sku_test_virtual_product_%isolation% + sku_test_virtual_product_%isolation% text product-details @@ -328,7 +328,7 @@ status int 0 - Product online + Product online checkbox product-details @@ -336,7 +336,7 @@ tax_class_id int 0 - Taxable Goods + Taxable Goods select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass @@ -390,7 +390,7 @@ visibility int 0 - Catalog, Search + Catalog, Search select autosettings @@ -427,7 +427,7 @@ website_ids virtual - Main Website + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index a26b1c1139678..af5ea46c65651 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -26,14 +26,14 @@ entity_type_id smallint - 0 + 0 attribute_set_id smallint - 0 + 0 @@ -47,7 +47,7 @@ parent_id int - 2 + 2 null Magento\Catalog\Test\Fixture\Category\ParentId @@ -70,7 +70,7 @@ path varchar - Default Category + Default Category null @@ -85,7 +85,7 @@ level int - 0 + 0 @@ -144,13 +144,13 @@ name virtual general_information - Category%isolation% + Category%isolation% is_active virtual general_information - Yes + Yes is_anchor @@ -161,13 +161,13 @@ url_key virtual general_information - category%isolation% + category%isolation% include_in_menu virtual general_information - Yes + Yes landing_page diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 439f2cdd4be91..f751bac73432f 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -51,7 +51,7 @@ - - Main Website + Main Website Catalog, Search @@ -78,7 +78,7 @@ taxable_goods - Main Website + Main Website Catalog, Search simple-product-%isolation% @@ -106,7 +106,7 @@ taxable_goods - Main Website + Main Website Catalog, Search simple-product-%isolation% @@ -132,7 +132,7 @@ - - Main Website + Main Website simple-product-%isolation% @@ -159,7 +159,7 @@ product_40_dollar simple-product-%isolation% - Main Website + Main Website @@ -184,7 +184,7 @@ simple_with_category - + Main Website simple-product-%isolation% @@ -259,7 +259,7 @@ 1 1 - Main Websi"tem> + Main Website Yes @@ -282,7 +282,7 @@ 50 - Main WebsiteMain Website simple-product-%isolation% diff --git a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml index f5296a0c70fc3..f583e313c73c9 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 1 diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index d1acf7284f8fd..aba65e76c46f8 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -19,12 +19,13 @@ name varchar 1 - CatalogPriceRule %isolation% + CatalogPriceRule %isolation% text rule_information - description - Catalog Price Rule Description + + description + Catalog Price Rule Description text rule_information @@ -32,7 +33,7 @@ is_active smallint 1 - Active + Active select rule_information @@ -41,7 +42,7 @@ smallint 1 - Main Website + Main Website multiselect rule_information @@ -51,7 +52,7 @@ smallint 1 - NOT LOGGED IN + NOT LOGGED IN multiselect rule_information @@ -76,7 +77,7 @@ simple_action smallint 0 - By Percentage of the Original Price + By Percentage of the Original Price select actions @@ -84,7 +85,7 @@ discount_amount decimal 1 - 50 + 50 text actions @@ -117,7 +118,7 @@ virtual - attribute_code>sort_order + sort_order text rule_information 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 d319be94ed9c1..f107dfc9a427c 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 @@ -15,62 +15,62 @@ low - > - /> - "/> + + + low - e"/> - ex"/> + + low - dex"/> + high - ndex"/> + - tView"/> - ryView"/> + + low - leIndex"/> + low - alogRule"/> - RuleIndex"/> + + high - e\CmsIndex"/> + - ategoryView"/> + high - age\CmsIndex"/> + - ogProductView"/> - ogCategoryView"/> - ge\CheckoutCart"/> + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index ba866ea19677a..deeb42ebe7492 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -34,14 +34,14 @@ num_results int - 0 + 0 popularity int - 0 + 0 @@ -62,35 +62,35 @@ store_id smallint - 0 + 0 display_in_terms smallint - null + is_active smallint - null + is_processed smallint - 0 + 0 updated_at timestamp - null + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index 182a30c44d925..2cbde345ae8cb 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -26,21 +26,21 @@ store_id smallint - 0 + 0 created_at timestamp - CURRENT_TIMESTAMP + CURRENT_TIMESTAMP updated_at timestamp - 0000-00-00 00:00:00 + 0000-00-00 00:00:00 @@ -54,21 +54,21 @@ is_active smallint - 1 + 1 is_virtual smallint - 0 + 0 is_multi_shipping smallint - 0 + 0 @@ -80,35 +80,35 @@ items_count int - 0 + 0 items_qty decimal - 0.0000 + 0.0000 orig_order_id int - 0 + 0 store_to_base_rate decimal - 0.0000 + 0.0000 store_to_quote_rate decimal - 0.0000 + 0.0000 @@ -136,14 +136,14 @@ grand_total decimal - 0.0000 + 0.0000 base_grand_total decimal - 0.0000 + 0.0000 @@ -157,21 +157,21 @@ customer_id int - 0 + 0 customer_tax_class_id int - 0 + 0 customer_group_id int - 0 + 0 @@ -234,14 +234,14 @@ customer_note_notify smallint - 1 + 1 customer_is_guest smallint - 0 + 0 @@ -350,14 +350,14 @@ - trigger_recollec">attribute_code> + trigger_recollec smallint - 0 + 0 - ext_shipping_info">ttribute_code> + ext_shipping_info text @@ -367,7 +367,7 @@ is_persistent smallint - 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php new file mode 100644 index 0000000000000..5fc30624db9f1 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php @@ -0,0 +1,41 @@ + [ + 'selector' => 'input[name="name"]', + ], + ]; +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php new file mode 100644 index 0000000000000..2a366434270c1 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php @@ -0,0 +1,18 @@ + + + + + + + select + + + select + + + [name="stores[]"] + multiselectgrouplist + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php new file mode 100644 index 0000000000000..3a8ea6908562b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php @@ -0,0 +1,72 @@ +_rootElement->find($this->notification)->getText(); + } + + /** + * Set agreement + * + * @param string $value + * @return void + */ + public function setAgreement($value) + { + $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_XPATH, 'checkbox')->setValue($value); + } + + /** + * Check agreement + * + * @param CheckoutAgreement $agreement + * @return bool + */ + public function checkAgreement(CheckoutAgreement $agreement) + { + return $this->_rootElement + ->find(sprintf($this->agreement, $agreement->getCheckboxText()), Locator::SELECTOR_XPATH)->isVisible(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php new file mode 100644 index 0000000000000..a67d13cfeb8ad --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php @@ -0,0 +1,48 @@ +open(); + \PHPUnit_Framework_Assert::assertFalse( + $agreementIndex->getAgreementGridBlock()->isRowVisible(['name' => $agreement->getName()]), + 'Checkout Agreement \'' . $agreement->getName() . '\' is present in agreement grid.' + ); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Checkout Agreement is absent in agreement grid.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php new file mode 100644 index 0000000000000..daa97e9b92bed --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php @@ -0,0 +1,92 @@ +create( + 'Magento\Catalog\Test\TestStep\CreateProductsStep', + ['products' => $product] + ); + $product = $createProductsStep->run(); + + $billingAddress = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'default']); + + $browser->open($_ENV['app_frontend_url'] . $product['products'][0]->getUrlKey() . '.html'); + $catalogProductView->getViewBlock()->clickAddToCartButton(); + $checkoutCart->getCartBlock()->getOnepageLinkBlock()->proceedToCheckout(); + $checkoutOnepage->getLoginBlock()->guestCheckout(); + $checkoutOnepage->getLoginBlock()->clickContinue(); + $checkoutOnepage->getBillingBlock()->fill($billingAddress); + $checkoutOnepage->getBillingBlock()->clickContinue(); + $checkoutOnepage->getShippingMethodBlock()->selectShippingMethod($shipping); + $checkoutOnepage->getShippingMethodBlock()->clickContinue(); + $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod($payment); + $checkoutOnepage->getPaymentMethodsBlock()->clickContinue(); + + \PHPUnit_Framework_Assert::assertFalse( + $checkoutOnepage->getAgreementReview()->checkAgreement($agreement), + 'Checkout Agreement \'' . $agreement->getName() . '\' is present in the Place order step.' + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Checkout Agreement is absent in the Place order step.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php new file mode 100644 index 0000000000000..9d1ac1e2eeef4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php @@ -0,0 +1,48 @@ +open(); + \PHPUnit_Framework_Assert::assertTrue( + $agreementIndex->getAgreementGridBlock()->isRowVisible(['name' => $agreement->getName()]), + 'Checkout Agreement \'' . $agreement->getName() . '\' is absent in agreement grid.' + ); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Checkout Agreement is present in agreement grid.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php new file mode 100644 index 0000000000000..bf9e00f9ab13a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php @@ -0,0 +1,109 @@ +create( + 'Magento\Catalog\Test\TestStep\CreateProductsStep', + ['products' => $product] + ); + $product = $createProductsStep->run(); + + $billingAddress = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'default']); + + $browser->open($_ENV['app_frontend_url'] . $product['products'][0]->getUrlKey() . '.html'); + $catalogProductView->getViewBlock()->clickAddToCartButton(); + $checkoutCart->getCartBlock()->getOnepageLinkBlock()->proceedToCheckout(); + $checkoutOnepage->getLoginBlock()->guestCheckout(); + $checkoutOnepage->getLoginBlock()->clickContinue(); + $checkoutOnepage->getBillingBlock()->fill($billingAddress); + $checkoutOnepage->getBillingBlock()->clickContinue(); + $checkoutOnepage->getShippingMethodBlock()->selectShippingMethod($shipping); + $checkoutOnepage->getShippingMethodBlock()->clickContinue(); + $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod($payment); + $checkoutOnepage->getPaymentMethodsBlock()->clickContinue(); + $checkoutOnepage->getAgreementReview()->placeOrder(); + + \PHPUnit_Framework_Assert::assertEquals( + self::NOTIFICATION_MESSAGE, + $checkoutOnepage->getAgreementReview()->getNotificationMassage(), + 'Notification required message of Terms and Conditions is absent.' + ); + + $checkoutOnepage->getAgreementReview()->setAgreement('Yes'); + $checkoutOnepage->getAgreementReview()->placeOrder(); + $assertOrderSuccessPlacedMessage->processAssert($checkoutOnepageSuccess); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Order was placed with checkout agreement successfully.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php new file mode 100644 index 0000000000000..e3976b6f8f10e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php @@ -0,0 +1,51 @@ +getMessagesBlock()->getSuccessMessages(), + 'Wrong success delete message is displayed.' + ); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Terms and Conditions success delete message is present.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php new file mode 100644 index 0000000000000..cb735f5b65377 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php @@ -0,0 +1,51 @@ +getMessagesBlock()->getSuccessMessages(), + 'Wrong success message is displayed.' + ); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Terms and Conditions success create message is present.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml new file mode 100644 index 0000000000000..64e37e6e84e82 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml @@ -0,0 +1,78 @@ + + + + Magento_CheckoutAgreements + flat + checkout_agreement + Magento\CheckoutAgreements\Model\Resource\Agreement\Collection + Magento\CheckoutAgreements\Test\Repository\CheckoutAgreement + Magento\CheckoutAgreements\Test\Handler\CheckoutAgreement\CheckoutAgreementInterface + + + agreement_id + int + 1 + + + + + name + varchar + + DefaultName%isolation% + + + + content + text + + TestMessage%isolation% + + + + content_height + varchar + + + + + + checkbox_text + text + + test_checkbox%isolation% + + + + is_active + smallint + + Enabled + + + + is_html + smallint + + Text + + + + store_ids + virtual + Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement\Stores + + + default + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php new file mode 100644 index 0000000000000..39c713585cc2f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php @@ -0,0 +1,105 @@ +params = $params; + if (isset($data['dataSet'])) { + foreach ($data['dataSet'] as $store) { + $store = $fixtureFactory->createByCode('store', ['dataSet' => $store]); + /** @var Store $store */ + if (!$store->getStoreId()) { + $store->persist(); + } + $this->stores[] = $store; + $this->data[] = $store->getGroupId() . '/' . $store->getName(); + } + } + } + + /** + * Persist stores + * + * @return void + */ + public function persist() + { + // + } + + /** + * Return prepared data set + * + * @param string|null $key [optional] + * @return mixed + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getData($key = null) + { + return $this->data; + } + + /** + * Return data set configuration settings + * + * @return array + */ + public function getDataConfig() + { + return $this->params; + } + + /** + * Return array + * + * @return Store[] + */ + public function getStores() + { + return $this->stores; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php new file mode 100644 index 0000000000000..8bd1c6197383c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php @@ -0,0 +1,17 @@ + [ + 'Enabled' => 1, + 'Disabled' => 0, + ], + 'is_html' => [ + 'HTML' => 1, + 'Text' => 0, + ], + ]; + + /** + * Url for save checkout agreement + * + * @var string + */ + protected $url = 'checkout/agreement/save/'; + + /** + * Post request for creating new checkout agreement + * + * @param FixtureInterface|null $fixture + * @return array + * @throws \Exception + */ + public function persist(FixtureInterface $fixture = null) + { + $url = $_ENV['app_backend_url'] . $this->url; + $data = $this->prepareData($fixture); + $curl = new BackendDecorator(new CurlTransport(), new Config()); + $curl->write(CurlInterface::POST, $url, '1.1', [], $data); + $response = $curl->read(); + $curl->close(); + if (!strpos($response, 'data-ui-id="messages-message-success"')) { + throw new \Exception("Checkout agreement creating by curl handler was not successful! Response: $response"); + } + preg_match('~id\/(\d*?)\/~', $response, $matches); + $id = isset($matches[1]) ? $matches[1] : null; + + return ['agreement_id' => $id]; + } + + /** + * Prepare data + * + * @param FixtureInterface $fixture + * @return array + */ + protected function prepareData($fixture) + { + $data = []; + /** @var \Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement $fixture */ + $stores = $fixture->getDataFieldConfig('stores')['source']->getStores(); + foreach ($stores as $store) { + /** @var \Magento\Store\Test\Fixture\Store $store */ + $data['stores'][] = $store->getStoreId(); + } + $data = $this->replaceMappingData(array_merge($fixture->getData(), $data)); + + return $data; + } +} 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 new file mode 100644 index 0000000000000..2e9ec905c5043 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementIndex.xml @@ -0,0 +1,26 @@ + + + + + + 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 + + + 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 new file mode 100644 index 0000000000000..040987a91d66f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/Adminhtml/CheckoutAgreementNew.xml @@ -0,0 +1,21 @@ + + + + + + Magento\Backend\Test\Block\FormPageActions + .page-main-actions + css selector + + + Magento\CheckoutAgreements\Test\Block\Adminhtml\Block\Agreement\Edit\AgreementsForm + #edit_form + css selector + + + 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 new file mode 100644 index 0000000000000..289402b43233b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml @@ -0,0 +1,16 @@ + + + + + + Magento\CheckoutAgreements\Test\Block\Onepage\AgreementReview + #checkout-step-review + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml new file mode 100644 index 0000000000000..9e5d653eddaef --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml @@ -0,0 +1,52 @@ + + + + + + TermDisabledTextName%isolation% + Disabled + Text + + + default + + + test_checkbox%isolation% + TestMessage%isolation% + + + + + TermDisabledHtml%isolation% + Disabled + HTML + + + default + + + test_checkbox%isolation% + TestMessage%isolation% + + + + + TermEnabledTextName%isolation% + Enabled + Text + + + default + + + test_checkbox%isolation% + TestMessage%isolation% + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..27de2b18a63da --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml @@ -0,0 +1,18 @@ + + + + + + 1 + + + + 0 + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php new file mode 100644 index 0000000000000..76b2d3a215ea4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php @@ -0,0 +1,89 @@ + Configuration > Sales > Checkout > Checkout Options + * + * Steps: + * 1. Open Backend Stores > Terms and Conditions + * 2. Create new "Terms and Conditions" + * 3. Fill data from dataSet + * 4. Save + * 5. Perform all assertions + * + * @group Terms_and_Conditions_(CS) + * @ZephyrId MAGETWO-29586 + */ +class CreateTermEntityTest extends Injectable +{ + /* tags */ + const MVP = 'yes'; + const DOMAIN = 'CS'; + /* end tags */ + + // TODO: Move set up configuration to "__prepare" method after fix bug MAGETWO-29331 + /** + * Set up configuration. + * + * @return void + */ + public function __inject() + { + $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition'] + )->run(); + } + + /** + * Create Term Entity test. + * + * @param CheckoutAgreementNew $agreementNew + * @param CheckoutAgreementIndex $agreementIndex + * @param CheckoutAgreement $agreement + * @return void + */ + public function test( + CheckoutAgreementNew $agreementNew, + CheckoutAgreementIndex $agreementIndex, + CheckoutAgreement $agreement + ) { + // Steps + $agreementIndex->open(); + $agreementIndex->getPageActionsBlock()->addNew(); + $agreementNew->getAgreementsForm()->fill($agreement); + $agreementNew->getPageActionsBlock()->save(); + } + + /** + * Clear data after test. + * + * @return void + */ + public function tearDown() + { + $this->objectManager->create('Magento\CheckoutAgreements\Test\TestStep\DeleteAllTermsEntityStep')->run(); + + // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331 + ObjectManager::getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition', 'rollback' => true] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..2d45351830d47 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv @@ -0,0 +1,5 @@ +"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";"issue" +"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" +"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" +"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" +"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout";"" diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php new file mode 100644 index 0000000000000..66657cf1dcf33 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php @@ -0,0 +1,104 @@ + Configuration > Sales > Checkout > Checkout Options + * 2. Create term according to dataSet + * + * Steps: + * 1. Open Backend Stores > Terms and Conditions + * 2. Open created Term from preconditions + * 3. Click on 'Delete' button + * 4. Perform all assertions + * + * @group Terms_and_Conditions_(CS) + * @ZephyrId MAGETWO-29687 + */ +class DeleteTermEntityTest extends Injectable +{ + /* tags */ + const MVP = 'yes'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Checkout agreement index page. + * + * @var CheckoutAgreementIndex + */ + protected $agreementIndex; + + /** + * Checkout agreement new page. + * + * @var CheckoutAgreementNew + */ + protected $agreementNew; + + /** + * Inject data. + * + * @param CheckoutAgreementNew $agreementNew + * @param CheckoutAgreementIndex $agreementIndex + * @return void + */ + public function __inject( + CheckoutAgreementNew $agreementNew, + CheckoutAgreementIndex $agreementIndex + ) { + $this->agreementNew = $agreementNew; + $this->agreementIndex = $agreementIndex; + + // TODO: Move set up configuration to "__prepare" method after fix bug MAGETWO-29331 + $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition'] + )->run(); + } + + /** + * Delete Term Entity test. + * + * @param CheckoutAgreement $agreement + * @return void + */ + public function test(CheckoutAgreement $agreement) + { + // Precondition + $agreement->persist(); + + // Steps + $this->agreementIndex->open()->getAgreementGridBlock()->searchAndOpen(['name' => $agreement->getName()]); + $this->agreementNew->getPageActionsBlock()->delete(); + } + + // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331 + /** + * Set default configuration. + * + * @return void + */ + public function tearDown() + { + ObjectManager::getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition', 'rollback' => true] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..6824357498e27 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest/test.csv @@ -0,0 +1,2 @@ +"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.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php new file mode 100644 index 0000000000000..4c851358989ab --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php @@ -0,0 +1,95 @@ + Configuration > Sales > Checkout > Checkout Options + * 2. Create term according to dataSet + * + * Steps: + * 1. Open Backend Stores > Terms and Conditions + * 2. Open created Term from preconditions + * 3. Fill data from dataSet + * 4. Save + * 5. Perform all assertions + * + * @group Terms_and_Conditions_(CS) + * @ZephyrId MAGETWO-29635 + */ +class UpdateTermEntityTest extends Injectable +{ + /* tags */ + const MVP = 'yes'; + const DOMAIN = 'CS'; + /* end tags */ + + // TODO: Move set up configuration to "__prepare" method after fix bug MAGETWO-29331 + /** + * Set up configuration. + * + * @return void + */ + public function __inject() + { + $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition'] + )->run(); + } + + /** + * Update Term Entity test. + * + * @param CheckoutAgreementNew $agreementNew + * @param CheckoutAgreementIndex $agreementIndex + * @param CheckoutAgreement $agreement + * @param CheckoutAgreement $agreementOrigin + * @return void + */ + public function test( + CheckoutAgreementNew $agreementNew, + CheckoutAgreementIndex $agreementIndex, + CheckoutAgreement $agreement, + CheckoutAgreement $agreementOrigin + ) { + // Precondition + $agreementOrigin->persist(); + + // Steps + $agreementIndex->open(); + $agreementIndex->getAgreementGridBlock()->searchAndOpen(['name' => $agreementOrigin->getName()]); + $agreementNew->getAgreementsForm()->fill($agreement); + $agreementNew->getPageActionsBlock()->save(); + } + + /** + * Clear data after test. + * + * @return void + */ + public function tearDown() + { + $this->objectManager->create('Magento\CheckoutAgreements\Test\TestStep\DeleteAllTermsEntityStep')->run(); + + // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331 + ObjectManager::getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'checkout_term_condition', 'rollback' => true] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..8b971e8284429 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv @@ -0,0 +1,4 @@ +"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";"issue" +"catalogProductSimple::default";"term_disabled_text";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" +"catalogProductSimple::default";"term_disabled_html";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" +"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/TestStep/DeleteAllTermsEntityStep.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php new file mode 100644 index 0000000000000..90e5506c1a1ab --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php @@ -0,0 +1,60 @@ +agreementNew = $agreementNew; + $this->agreementIndex = $agreementIndex; + } + + /** + * Delete terms on backend + * + * @return void + */ + public function run() + { + $this->agreementIndex->open(); + while ($this->agreementIndex->getAgreementGridBlock()->isFirstRowVisible()) { + $this->agreementIndex->getAgreementGridBlock()->openFirstRow(); + $this->agreementNew->getPageActionsBlock()->delete(); + } + } +} 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 new file mode 100644 index 0000000000000..0b97d3e052a01 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml @@ -0,0 +1,27 @@ + + + + + low + + + low + + + low + + + low + + + low + + + low + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/curl/di.xml new file mode 100644 index 0000000000000..aeedca9be3ee1 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/curl/di.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/fixture.xml new file mode 100644 index 0000000000000..c6bcb72a68549 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/fixture.xml @@ -0,0 +1,14 @@ + + + + + flat + checkout_agreement + Magento\CheckoutAgreements\Model\Resource\Agreement\Collection + + 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 new file mode 100644 index 0000000000000..06e0758277d2f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/page.xml @@ -0,0 +1,19 @@ + + + + + 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/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index a2895842a6460..b31a52dee995c 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -95,7 +95,7 @@ enable_googlecheckout int 0 - No + No select @@ -202,7 +202,7 @@ name varchar 1 - Configurable Product %isolation% + Configurable Product %isolation% text product-details @@ -245,8 +245,8 @@ price decimal 1 - - 100 + + 100 price product-details @@ -256,8 +256,8 @@ quantity_and_stock_status int 0 - - In Stock + + In Stock select product-details @@ -281,7 +281,7 @@ sku static 1 - sku_configurable_product_%isolation% + sku_configurable_product_%isolation% text product-details @@ -325,7 +325,7 @@ status int 0 - Product online + Product online checkbox product-details @@ -333,7 +333,7 @@ tax_class_id int 0 - Taxable Goods + Taxable Goods select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass @@ -372,7 +372,7 @@ url_key varchar 0 - configurable-product-%isolation% + configurable-product-%isolation% text search-engine-optimization @@ -387,7 +387,7 @@ visibility int 0 - Catalog, Search + Catalog, Search select autosettings @@ -395,7 +395,7 @@ weight decimal 0 - 1 + 1 weight product-details @@ -412,15 +412,15 @@ type_id virtual null - configurable + configurable attribute_set_id virtual product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\AttributeSetId - - default + + default @@ -447,15 +447,15 @@ variations variations Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData - - default + + default website_ids virtual - Main Website + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml index fcfbfcc535dcb..2f4aae61f27e0 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -6,7 +6,7 @@ --> - + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -36,7 +36,7 @@ - + Test configurable product with size %isolation% sku_test_configurable_product_%isolation% @@ -66,7 +66,7 @@ - + Test configurable product with color and size %isolation% sku_test_configurable_product_%isolation% @@ -96,7 +96,7 @@ - + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -123,7 +123,7 @@ - + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -154,7 +154,7 @@ - + Test configurable product %isolation% sku_test_configurable_product_%isolation% @@ -184,7 +184,7 @@ - + Test configurable product %isolation% sku_test_configurable_product_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index 887a3b99ca41a..d411f7faaa47c 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -29,28 +29,28 @@ scope varchar - - default + + default scope_id int - - 0 + + 0 path varchar - - general + + general value text - + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index d287ff9d68184..5cc60c6817ef1 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -11,8 +11,8 @@ Magento_Core composite - core_variable - core_variable_value + + Magento\Core\Model\Resource\Variable\Collection Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface @@ -21,21 +21,21 @@ variable_id int - 0 + 0 code varchar - variableCode%isolation% + variableCode%isolation% name varchar - variableName%isolation% + variableName%isolation% @@ -49,23 +49,21 @@ store_id smallint - 0 + 0 plain_value text - plain_value + plain_value html_value text - -

html_value

- + <p>html_value</p> diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index 366b39c35f3e2..bca647c259de2 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -11,7 +11,7 @@ variableCode%isolation% variableName%isolation% -

variableName%isolation%

 + <p class='custom-variable-test-class-%isolation%'>variableName%isolation%</p> variableName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/GridPageActions.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/GridPageActions.php new file mode 100644 index 0000000000000..0885f0a1e9006 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/GridPageActions.php @@ -0,0 +1,67 @@ +_rootElement->find($this->importButton)->click(); + + //Wait message + $browser = $this->browser; + $selector = $this->message; + $browser->waitUntil( + function () use ($browser, $selector) { + $message = $browser->find($selector); + return $message->isVisible() ? true : null; + } + ); + if ($this->getMessageBlock()->isVisibleMessage('warning')) { + throw new \Exception($this->getMessageBlock()->getWarningMessages()); + } + } + + /** + * Get message block. + * + * @return Messages + */ + protected function getMessageBlock() + { + return $this->blockFactory->create( + 'Magento\Core\Test\Block\Messages', + ['element' => $this->_rootElement->find($this->message)] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/MainPageActions.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/MainPageActions.php new file mode 100644 index 0000000000000..14f7bf7af1bbe --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/MainPageActions.php @@ -0,0 +1,33 @@ +_rootElement->find($this->saveCurrentRate)->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php new file mode 100644 index 0000000000000..c527e90bac513 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php @@ -0,0 +1,39 @@ +_rootElement->find(sprintf($this->currencyRow, $fixture->getCode()), Locator::SELECTOR_XPATH); + return parent::fill($fixture, $element); + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.xml new file mode 100644 index 0000000000000..33b9d477cd558 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.xml @@ -0,0 +1,21 @@ + + + + variable + + + [id^=custom_currency_symbol_inherit] + css selector + checkbox + + + [id^=custom_currency_symbol] + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/FormPageActions.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/FormPageActions.php new file mode 100644 index 0000000000000..e543ba4e44085 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/FormPageActions.php @@ -0,0 +1,23 @@ +getCategoryIds()[0]; + $cmsIndex->open(); + $cmsIndex->getCurrencyBlock()->switchCurrency($currencySymbol); + $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); + $price = $catalogCategoryView->getListProductBlock()->getPrice($product->getId()); + preg_match('`(.*?)\d`', $price, $matches); + + $symbolOnPage = isset($matches[1]) ? $matches[1] : null; + \PHPUnit_Framework_Assert::assertEquals( + $currencySymbol->getCustomCurrencySymbol(), + $symbolOnPage, + 'Wrong Currency Symbol is displayed on Category page.' + ); + } + + /** + * Returns a string representation of successful assertion + * + * @return string + */ + public function toString() + { + return "Currency Symbol has been changed on Catalog page."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php new file mode 100644 index 0000000000000..9c4bc288a31df --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php @@ -0,0 +1,65 @@ +open(); + $cmsIndex->getCurrencyBlock()->switchCurrency($currencySymbol); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + $price = $catalogProductView->getViewBlock()->getPriceBlock()->getPrice(); + preg_match('`(.*?)\d`', $price, $matches); + + $symbolOnPage = isset($matches[1]) ? $matches[1] : null; + \PHPUnit_Framework_Assert::assertEquals( + $currencySymbol->getCustomCurrencySymbol(), + $symbolOnPage, + 'Wrong Currency Symbol is displayed on Product page.' + ); + } + + /** + * Returns a string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return "Currency Symbol has been changed on Product Details page."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php new file mode 100644 index 0000000000000..d7193616fb52c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php @@ -0,0 +1,49 @@ +getMessagesBlock()->getSuccessMessages(); + \PHPUnit_Framework_Assert::assertEquals( + self::SUCCESS_SAVE_MESSAGE, + $actualMessage, + 'Wrong success message is displayed.' + ); + } + + /** + * Returns a string representation of successful assertion + * + * @return string + */ + public function toString() + { + return 'Currency Symbol success save message is correct.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml new file mode 100644 index 0000000000000..e496ea713b844 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml @@ -0,0 +1,69 @@ + + + + Magento_CurrencySymbol + flat + core_config_data + Magento\CurrencySymbol\Test\Repository\CurrencySymbolEntity + Magento\CurrencySymbol\Test\Handler\CurrencySymbolEntity\CurrencySymbolEntityInterface + + + config_id + int + 1 + + + + + scope + varchar + + default + + + + scope_id + int + + 0 + + + + path + varchar + + general + + + + value + text + + + + + + inherit_custom_currency_symbol + virtual + checkbox + Yes + + + custom_currency_symbol + virtual + + + + code + virtual + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php new file mode 100644 index 0000000000000..453377a7b6bc7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php @@ -0,0 +1,38 @@ +getData(); + $url = $_ENV['app_backend_url'] . 'admin/system_currencysymbol/save'; + $curl = new BackendDecorator(new CurlTransport(), new Config()); + $curl->write(CurlInterface::POST, $url, '1.0', [], $data); + $curl->read(); + $curl->close(); + // Response verification is absent, because sending a post request returns an index page + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php new file mode 100644 index 0000000000000..5514059c69cb4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php @@ -0,0 +1,17 @@ + + + + + + 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 + + + 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 new file mode 100644 index 0000000000000..cec7ec7d9b1b0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencySymbolIndex.xml @@ -0,0 +1,26 @@ + + + + + + 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 + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml new file mode 100644 index 0000000000000..f1a5c14398c3a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml @@ -0,0 +1,23 @@ + + + + + + + custom + + + + + + € + + EUR + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php new file mode 100644 index 0000000000000..2d21b61c47b9c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php @@ -0,0 +1,127 @@ +Currency Symbols + * 3. Make changes according to dataset. + * 4. Click 'Save Currency Symbols' button + * 5. Perform all asserts. + * + * @group Currency_(PS) + * @ZephyrId MAGETWO-26600 + */ +class EditCurrencySymbolEntityTest extends Injectable +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'PS'; + /* end tags */ + + /** + * System Currency Symbol grid page + * + * @var SystemCurrencySymbolIndex + */ + protected $currencySymbolIndex; + + /** + * System currency index page. + * + * @var SystemCurrencyIndex + */ + protected $currencyIndex; + + /** + * Create simple product and inject pages. + * + * @param SystemCurrencySymbolIndex $currencySymbolIndex + * @param SystemCurrencyIndex $currencyIndex, + * @param FixtureFactory $fixtureFactory + * @return array + */ + public function __inject( + SystemCurrencySymbolIndex $currencySymbolIndex, + SystemCurrencyIndex $currencyIndex, + FixtureFactory $fixtureFactory + ) { + $this->currencySymbolIndex = $currencySymbolIndex; + $this->currencyIndex = $currencyIndex; + + /**@var CatalogProductSimple $catalogProductSimple */ + $product = $fixtureFactory->createByCode( + 'catalogProductSimple', + ['dataSet' => 'product_with_category'] + ); + $product->persist(); + + return ['product' => $product]; + } + + /** + * Edit Currency Symbol Entity test + * + * @param CurrencySymbolEntity $currencySymbol + * @param string $configData + * @return void + */ + public function test(CurrencySymbolEntity $currencySymbol, $configData) + { + // Preconditions + $this->importCurrencyRate($configData); + + // Steps + $this->currencySymbolIndex->open(); + $this->currencySymbolIndex->getCurrencySymbolForm()->fill($currencySymbol); + $this->currencySymbolIndex->getPageActions()->save(); + } + + /** + * Import currency rates. + * + * @param string $configData + * @return void + */ + protected function importCurrencyRate($configData) + { + $this->objectManager->getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => $configData] + )->run(); + + // Import Exchange Rates for currencies + $this->currencyIndex->open(); + $this->currencyIndex->getGridPageActions()->clickImportButton(); + $this->currencyIndex->getMainPageActions()->saveCurrentRate(); + } + + /** + * Disabling currency which has been added. + * + * @return void + */ + public function tearDown() + { + $this->objectManager->getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'config_currency_symbols_usd'] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..76667d5cce30f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest/test.csv @@ -0,0 +1,4 @@ +"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.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php new file mode 100644 index 0000000000000..67fcfe2ac96be --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php @@ -0,0 +1,171 @@ +Currency Symbols + * 3. Make changes according to dataset. + * 4. Click 'Save Currency Symbols' button + * 5. Perform all asserts. + * + * @group Currency_(PS) + * @ZephyrId MAGETWO-26638 + */ +class ResetCurrencySymbolEntityTest extends Injectable +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'PS'; + /* end tags */ + + /** + * System currency symbol grid page. + * + * @var SystemCurrencySymbolIndex + */ + protected $currencySymbolIndex; + + /** + * System currency index page. + * + * @var SystemCurrencyIndex + */ + protected $currencyIndex; + + /** + * Currency symbol entity fixture. + * + * @var CurrencySymbolEntity + */ + protected $currencySymbolDefault; + + /** + * Fixture Factory. + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Prepare data. Create simple product. + * + * @param FixtureFactory $fixtureFactory + * @return array + */ + public function __prepare(FixtureFactory $fixtureFactory) + { + $this->fixtureFactory = $fixtureFactory; + $product = $this->fixtureFactory->createByCode( + 'catalogProductSimple', + ['dataSet' => 'product_with_category'] + ); + $product->persist(); + + return ['product' => $product]; + } + + /** + * Injection data. + * + * @param SystemCurrencySymbolIndex $currencySymbolIndex + * @param SystemCurrencyIndex $currencyIndex + * @param CurrencySymbolEntity $currencySymbolDefault + * @return array + */ + public function __inject( + SystemCurrencySymbolIndex $currencySymbolIndex, + SystemCurrencyIndex $currencyIndex, + CurrencySymbolEntity $currencySymbolDefault + ) { + $this->currencySymbolIndex = $currencySymbolIndex; + $this->currencyIndex = $currencyIndex; + $this->currencySymbolDefault = $currencySymbolDefault; + } + + /** + * Reset Currency Symbol Entity test. + * + * @param CurrencySymbolEntity $currencySymbolOriginal + * @param CurrencySymbolEntity $currencySymbol + * @param string $currencySymbolDefault + * @param string $configData + * @return array + */ + public function test( + CurrencySymbolEntity $currencySymbolOriginal, + CurrencySymbolEntity $currencySymbol, + $currencySymbolDefault, + $configData + ) { + // Preconditions + $currencySymbolOriginal->persist(); + $this->importCurrencyRate($configData); + + // Steps + $this->currencySymbolIndex->getCurrencySymbolForm()->fill($currencySymbol); + $this->currencySymbolIndex->getPageActions()->save(); + + return [ + 'currencySymbol' => $this->fixtureFactory->createByCode( + 'currencySymbolEntity', + [ + 'data' => array_merge( + $currencySymbol->getData(), + ['custom_currency_symbol' => $currencySymbolDefault] + ) + ] + ) + ]; + } + + /** + * Import currency rates. + * + * @param string $configData + * @return void + */ + protected function importCurrencyRate($configData) + { + $this->objectManager->getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => $configData] + )->run(); + + // Import Exchange Rates for currencies + $this->currencyIndex->open(); + $this->currencyIndex->getGridPageActions()->clickImportButton(); + $this->currencyIndex->getMainPageActions()->saveCurrentRate(); + } + + /** + * Disabling currency which has been added. + * + * @return void + */ + public function tearDown() + { + $this->objectManager->getInstance()->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'config_currency_symbols_usd'] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..87c2b788cf8aa --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest/test.csv @@ -0,0 +1,2 @@ +"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 new file mode 100644 index 0000000000000..78f3c53be7348 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml @@ -0,0 +1,34 @@ + + + + + low + + + + + + low + + + + + + + + + + low + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/curl/di.xml new file mode 100644 index 0000000000000..76bdc279015ae --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/curl/di.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml new file mode 100644 index 0000000000000..5e2fb5df14b0a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml @@ -0,0 +1,23 @@ + + + + + table + directory_currency_rate + + Mtf\Util\Generate\Repository\TableCollection + + + + + + + flat + core_config_data + + 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 new file mode 100644 index 0000000000000..cb3ed49949e36 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/page.xml @@ -0,0 +1,19 @@ + + + + + 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/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index d4ac97caf539b..f417ed4e85571 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -19,7 +19,7 @@ city varchar 1 - Culver City + Culver City text @@ -40,14 +40,14 @@ company varchar 0 - Magento %isolation% + Magento %isolation% text country_id varchar 1 - United States + United States select @@ -61,21 +61,21 @@ firstname varchar 1 - John + John text lastname varchar 1 - Doe + Doe text email varchar 1 - John.Doe%isolation%@example.com + John.Doe%isolation%@example.com text @@ -89,7 +89,7 @@ postcode varchar 0 - 90230 + 90230 text @@ -110,14 +110,14 @@ region_id int 0 - California + California hidden street text 1 - 6161 West Centinela Avenue + 6161 West Centinela Avenue multiline @@ -131,7 +131,7 @@ telephone varchar 1 - 555-55-555-55 + 555-55-555-55 text diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 6c4bc9e619e48..962ee8786b971 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -19,15 +19,15 @@ code varchar 1 - customer_code_%isolation% + customer_code_%isolation% text tax_class varchar 1 - - customer_tax_class + + customer_tax_class select Magento\Customer\Test\Fixture\CustomerGroup\TaxClassIds diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index d82c05e488a2b..3d301cce17069 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -82,7 +82,7 @@ email static 1 - John.Doe%isolation%@example.com + John.Doe%isolation%@example.com text account_information @@ -90,7 +90,7 @@ firstname varchar 1 - John + John text account_information @@ -115,7 +115,7 @@ lastname varchar 1 - Doe + Doe text account_information @@ -204,13 +204,13 @@ password virtual null - 123123q + 123123q password_confirmation virtual null - 123123q + 123123q current_password diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml index 068699cc9ef5f..1a27c3c2250a0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/curl/di.xml @@ -7,5 +7,5 @@ --> - > + diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml index 2eb9977cfe03d..185791d7077bc 100644 --- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 0 diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php new file mode 100644 index 0000000000000..a8a86b9352433 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php @@ -0,0 +1,60 @@ +waitForElementVisible($this->currencySwitch); + $currencyLink = $this->_rootElement->find($this->currencySwitch); + $customCurrencySwitch = explode(" ", $this->_rootElement->find($this->currencySwitch)->getText()); + $currencyCode = $currencySymbol->getCode(); + if ($customCurrencySwitch[0] !== $currencyCode) { + $currencyLink->click(); + $currencyLink = $this->_rootElement + ->find(sprintf($this->currencyLinkLocator, $currencyCode), Locator::SELECTOR_XPATH); + $currencyLink->click(); + $this->reinitRootElement(); + $this->waitForElementVisible($this->language . $currencyCode); + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..35b637616337d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml @@ -0,0 +1,36 @@ + + + + + + + USD + UAH + + + + + + USD + + + + + + USD + CHF + + + + + + USD + + + + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 26ed8ed9bb52f..502f0b8e5d4e2 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -80,7 +80,7 @@ description text 0 - This is description for downloadable product + This is description for downloadable product textarea product-details @@ -132,14 +132,14 @@ is_returnable varchar 0 - 2 + 2 select links_exist int 0 - 0 + 0 @@ -202,14 +202,14 @@ msrp_display_actual_price_type varchar 0 - 4 + 4 select name varchar 1 - DownloadableProduct_%isolation% + DownloadableProduct_%isolation% text product-details @@ -238,7 +238,7 @@ options_container varchar 0 - container2 + container2 select @@ -252,8 +252,8 @@ price decimal 1 - - 100 + + 100 price product-details @@ -268,9 +268,9 @@ quantity_and_stock_status int 0 - - 1 - In Stock + + 1 + In Stock select product-details @@ -307,7 +307,7 @@ short_description text 0 - This is short description for downloadable product + This is short description for downloadable product textarea autosettings @@ -321,8 +321,8 @@ downloadable_items text 0 - - default + + default text downloadable_information @@ -332,7 +332,7 @@ downloadable_sample text 0 - dafault + dafault text downloadable_information Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\Samples @@ -341,7 +341,7 @@ sku static 1 - DownloadableProduct_%isolation% + DownloadableProduct_%isolation% text product-details @@ -370,7 +370,7 @@ special_price decimal 0 - 10 + 10 advanced-pricing @@ -384,7 +384,7 @@ status int 0 - 1 + 1 select product-details @@ -392,8 +392,8 @@ tax_class_id int 0 - - taxable_goods + + taxable_goods select product-details @@ -417,7 +417,7 @@ tier_price decimal 0 - default + default text advanced-pricing Magento\Catalog\Test\Fixture\CatalogProductSimple\TierPriceOptions @@ -447,7 +447,7 @@ url_key varchar 0 - downloadableproduct_%isolation% + downloadableproduct_%isolation% text search-engine-optimization @@ -462,7 +462,7 @@ visibility int 0 - 4 + 4 select autosettings @@ -478,7 +478,7 @@ custom_options virtual 0 - default + default customer-options Magento\Catalog\Test\Fixture\CatalogProductSimple\CustomOptions @@ -490,13 +490,13 @@ is_virtual virtual product-details - Yes + Yes website_ids virtual - Main Website + Main Website websites diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml index 013e3db6cdfc5..d7507e89fdcc3 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 0 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index e1bb96fce62cc..0456a9a2a56ce 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -26,39 +26,39 @@ customer_id int - 0 + 0 sender varchar - John Doe + John Doe recipient varchar - Jane Doe + Jane Doe message text - text_%isolation% + text_%isolation% allow_gift_options virtual - Yes + Yes allow_gift_messages_for_order virtual - Yes + Yes allow_gift_options_for_items diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml index b5266da9eb335..7f5ad89236729 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml @@ -5,9 +5,9 @@ * See COPYING.txt for license details. */ --> - - - + + + 1 1 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml index 27b48d7e39f72..0b92781bb2cf5 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml @@ -13,7 +13,7 @@ setupConfiguration - cashondelivery, enableGiftMessages + cashondelivery, enable_gift_messages createProducts @@ -56,7 +56,7 @@ setupConfiguration - cashondelivery, enableGiftMessages + cashondelivery, enable_gift_messages createProducts diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index 7f025b2d592e1..e5bee0b1a0b47 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -20,31 +20,31 @@ int 1 - + attribute_set_id smallint - - - default + + + default - + Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute\AttributeSetId target_country varchar - - United States - - + + United States + + category varchar - - Apparel & Accessories - + + Apparel & Accessories + diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml index cf8c48b043f15..a41e85f58cfad 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -10,9 +10,9 @@ United States - default + default - Apparel & Accessories + Apparel & Accessories diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index e45c1b312f91f..b4ad3a8c30927 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -87,7 +87,7 @@ description text 0 - This is description for grouped product + This is description for grouped product product-details @@ -130,7 +130,7 @@ is_returnable varchar 0 - 2 + 2 select @@ -165,7 +165,7 @@ name varchar 1 - GroupedProduct_%isolation% + GroupedProduct_%isolation% text product-details @@ -194,7 +194,7 @@ options_container varchar 0 - container2 + container2 select @@ -208,9 +208,9 @@ quantity_and_stock_status int 0 - - 1 - In Stock + + 1 + In Stock select product-details @@ -244,7 +244,7 @@ short_description text 0 - This is short description for grouped product + This is short description for grouped product autosettings @@ -252,7 +252,7 @@ sku static 1 - GroupedProduct_%isolation% + GroupedProduct_%isolation% text product-details @@ -274,7 +274,7 @@ status int 0 - 1 + 1 select @@ -331,7 +331,7 @@ visibility int 0 - 4 + 4 select @@ -352,7 +352,7 @@ website_ids virtual - Main Website + Main Website websites @@ -368,7 +368,7 @@ Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable\CheckoutData - taxable_goods + taxable_goods diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index b0e95a66f72a4..36e717d2a2649 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -23,14 +23,14 @@ entity varchar - Products + Products behavior varchar - CSV + CSV diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 95ba80ea35722..2e3ff04c48bd2 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -11,9 +11,9 @@ Magento_Integration composite - integration - oauth_token - oauth_consumer + + + integration Magento\Integration\Model\Resource\Integration\Collection @@ -31,7 +31,7 @@ name varchar - default_integration_%isolation% + default_integration_%isolation% integration_info @@ -39,7 +39,7 @@ email varchar - test_%isolation%@example.com + test_%isolation%@example.com integration_info @@ -69,7 +69,7 @@ created_at timestamp - CURRENT_TIMESTAMP + CURRENT_TIMESTAMP @@ -83,7 +83,7 @@ setup_type smallint - 0 + 0 @@ -154,14 +154,14 @@ revoked smallint - 0 + 0 authorized smallint - 0 + 0 @@ -189,7 +189,7 @@ resource_access virtual api - All + All resources diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 7da2397470ef0..301beae9a37cd 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -27,14 +27,14 @@ template_code varchar - TemplateName%isolation% + TemplateName%isolation% template_text text - Some text %isolation% + Some text %isolation% @@ -62,28 +62,28 @@ template_subject varchar - TemplateSubject%isolation% + TemplateSubject%isolation% template_sender_name varchar - SenderName%isolation% + SenderName%isolation% template_sender_email varchar - SenderName%isolation%@example.com + SenderName%isolation%@example.com template_actual smallint - 1 + 1 diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml index a5ff783b9253c..721bec405886b 100644 --- a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 1 diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml index dad7740f4b51a..63db12aa1d662 100644 --- a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 1 diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml index c2948245ec049..5c54491e18fd4 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + website 5 diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index 4d77973255691..f841c72e4d845 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -27,14 +27,14 @@ entity_id smallint - 0 + 0 rating_code varchar - Rating %isolation% + Rating %isolation% rating_information @@ -42,7 +42,7 @@ position smallint - 0 + 0 rating_information @@ -50,7 +50,7 @@ is_active smallint - Yes + Yes rating_information @@ -58,7 +58,7 @@ stores virtual rating_information - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View options diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php deleted file mode 100755 index 84226b39f9d62..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php +++ /dev/null @@ -1,250 +0,0 @@ - 'Approved', - 'select_stores' => ['Main Website/Main Website Store/Default Store View'], - 'nickname' => 'Guest customer %isolation%', - 'title' => 'Summary review %isolation%', - 'detail' => 'Text review %isolation%', - 'ratings' => [ - [ - 'dataSet' => 'visibleOnDefaultWebsite', - 'rating' => 4 - ] - ], - 'entity_id' => ['dataSet' => 'catalogProductSimple::default'], - 'type' => 'Administrator' - ]; - - protected $review_id = [ - 'attribute_code' => 'review_id', - 'backend_type' => 'bigint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => 'CURRENT_TIMESTAMP', - 'input' => '', - ]; - - protected $entity_id = [ - 'attribute_code' => 'entity_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'source' => 'Magento\Review\Test\Fixture\Review\EntityId' - ]; - - protected $entity_pk_value = [ - 'attribute_code' => 'entity_pk_value', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $status_id = [ - 'attribute_code' => 'status_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $detail_id = [ - 'attribute_code' => 'detail_id', - 'backend_type' => 'bigint', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $store_id = [ - 'attribute_code' => 'store_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $title = [ - 'attribute_code' => 'title', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $detail = [ - 'attribute_code' => 'detail', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $nickname = [ - 'attribute_code' => 'nickname', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer_id = [ - 'attribute_code' => 'customer_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $select_stores = [ - 'attribute_code' => 'select_stores', - 'backend_type' => 'virtual', - 'is_required' => '1', - 'default_value' => '0', - 'input' => 'multiselectgrouplist', - ]; - - protected $ratings = [ - 'attribute_code' => 'ratings', - 'backend_type' => 'virtual', - 'source' => 'Magento\Review\Test\Fixture\Review\Ratings', - ]; - - protected $type = [ - 'attribute_code' => 'type', - 'backend_type' => 'string', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $customer = [ - 'attribute_code' => 'customer', - 'backend_type' => 'virtual', - ]; - - public function getType() - { - return $this->getData('type'); - } - - public function getSelectStores() - { - return $this->getData('select_stores'); - } - - public function getReviewId() - { - return $this->getData('review_id'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getEntityId() - { - return $this->getData('entity_id'); - } - - public function getEntityPkValue() - { - return $this->getData('entity_pk_value'); - } - - public function getStatusId() - { - return $this->getData('status_id'); - } - - public function getDetailId() - { - return $this->getData('detail_id'); - } - - public function getStoreId() - { - return $this->getData('store_id'); - } - - public function getTitle() - { - return $this->getData('title'); - } - - public function getDetail() - { - return $this->getData('detail'); - } - - public function getNickname() - { - return $this->getData('nickname'); - } - - public function getCustomerId() - { - return $this->getData('customer_id'); - } - - public function getRatings() - { - return $this->getData('ratings'); - $this->_data = [ - 'fields' => [ - 'nickname' => [ - 'value' => 'Guest customer %isolation%', - ], - 'title' => [ - 'value' => 'Summary review %isolation%', - ], - 'detail' => [ - 'value' => 'Text review %isolation%', - ], - ], - ]; - - $this->_repository = Factory::getRepositoryFactory() - ->getMagentoReviewReview($this->_dataConfig, $this->_data); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index 56b153d0a6f52..46ecc64ca169c 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -11,8 +11,8 @@ Magento_Review composite - review - review_detail + + Magento\Review\Model\Resource\Review\Collection Magento\Review\Test\Repository\ReviewInjectable @@ -22,22 +22,22 @@ review_id bigint - 0 + 0 created_at timestamp - CURRENT_TIMESTAMP + CURRENT_TIMESTAMP entity_id smallint - - catalogProductSimple::default + + catalogProductSimple::default Magento\Review\Test\Fixture\Review\EntityId @@ -46,14 +46,14 @@ entity_pk_value int - 0 + 0 status_id smallint - Approved + Approved @@ -67,28 +67,28 @@ store_id smallint - 0 + 0 title varchar - Summary review %isolation% + Summary review %isolation% detail text - Text review %isolation% + Text review %isolation% nickname varchar - Guest customer %isolation% + Guest customer %isolation% @@ -102,8 +102,8 @@ select_stores virtual 1 - - Main Website/Main Website Store/Default Store View + + Main Website/Main Website Store/Default Store View multiselectgrouplist @@ -113,8 +113,8 @@ Magento\Review\Test\Fixture\Review\Ratings - visibleOnDefaultWebsite - 4 + visibleOnDefaultWebsite + 4 @@ -122,7 +122,7 @@ type string - Administrator + Administrator 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 3a477cce94b1f..5e4a8030eff21 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 @@ -48,7 +48,7 @@ high - > + diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml index 7972aa636057d..e82d710374cda 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/etc/curl/di.xml @@ -7,5 +7,5 @@ --> - > + diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml index e0789bc5ef0bd..6b66a6a682812 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml @@ -5,9 +5,9 @@ * See COPYING.txt for license details. */ --> - - - + + + US 12 90232 @@ -16,7 +16,7 @@ Suite 200 - + US 12 90024 diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index 29528286cf247..9975e74790ed4 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -33,14 +33,14 @@ sitemap_filename varchar - sitemap.xml + sitemap.xml sitemap_path varchar - / + / @@ -54,7 +54,7 @@ store_id smallint - 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index cba22ff97b072..0073def5ac849 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -19,29 +19,29 @@ store_id smallint 1 - 1 + 1 code varchar - default + default text website_id smallint - 0 + 0 group_id smallint - - default + + default select Magento\Store\Test\Fixture\Store\GroupId @@ -50,21 +50,21 @@ name varchar - Default Store View + Default Store View text sort_order smallint - 0 + 0 text is_active smallint - Enabled + Enabled select diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index de5cbaf8ccdfc..62c4960ac0848 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -27,30 +27,30 @@ website_id virtual Magento\Store\Test\Fixture\StoreGroup\WebsiteId - - main_website + + main_website name varchar - StoreGroup%isolation% + StoreGroup%isolation% root_category_id virtual Magento\Store\Test\Fixture\StoreGroup\CategoryId - - default_category + + default_category default_store_id smallint - 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 5499ced5c489d..81b7d9891c5ab 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -20,42 +20,42 @@ website_id smallint 1 - 1 + 1 code varchar - base + base name varchar - Main Website + Main Website sort_order smallint - 0 + 0 default_group_id smallint - 0 + 0 is_default smallint - 0 + 0 diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml index 9993e1128975e..ec1bbbea3ea26 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -9,7 +9,7 @@ - default + default Default Store View base @@ -19,7 +19,7 @@ - default + default Custom_Store_%isolation% code_%isolation% @@ -38,7 +38,7 @@ - default + default DE%isolation% de%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index 0c8e1562ca1b2..860526844f17c 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -27,14 +27,14 @@ class_name varchar - Tax Class %isolation% + Tax Class %isolation% class_type varchar - CUSTOMER + CUSTOMER diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index 7419210e61321..06837ecbbb6b4 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -27,35 +27,35 @@ tax_country_id varchar - United States + United States tax_region_id int - California + California tax_postcode varchar - * + * code varchar - Tax Rate %isolation% + Tax Rate %isolation% rate decimal - 10 + 10 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index a00ce61a52902..e23b875b4f607 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -27,7 +27,7 @@ code varchar - TaxIdentifier%isolation% + TaxIdentifier%isolation% @@ -50,7 +50,7 @@ Magento\Tax\Test\Fixture\TaxRule\TaxRate - US-CA-Rate_1 + US-CA-Rate_1 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml index 49c119ceb1c8b..37b160b47c7d0 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 2 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 index 88b7dd432d6b1..802baedf2b334 100644 --- 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 @@ -1,5 +1,5 @@ "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" +"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/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml index 63fec194d2f96..98f103ad9e01a 100644 --- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 0 diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index f7789db76308e..2dba647b57483 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -24,7 +24,7 @@ store_id varchar 1 - Main Website/Main Website Store/Default Store View + Main Website/Main Website Store/Default Store View Magento\UrlRewrite\Test\Fixture\UrlRewrite\StoreId select @@ -38,7 +38,7 @@ request_path varchar 1 - test_request%isolation% + test_request%isolation% text @@ -52,7 +52,7 @@ target_path varchar 1 - target_path%isolation% + target_path%isolation% text Magento\UrlRewrite\Test\Fixture\UrlRewrite\TargetPath 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 4257e4531e636..07ffbcac42e7b 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 @@ -10,7 +10,7 @@ low - > + @@ -22,31 +22,31 @@ low - /> - "/> - e"/> - er"/> + + + + low - dex"/> + low - ndex"/> - write"/> + + low - ctView"/> - Rewrite"/> - \Browser"/> + + + @@ -55,16 +55,16 @@ low - rlRewrite"/> - nt\Browser"/> + + low - \UrlRewrite"/> - ient\Browser"/> - gCategoryView"/> + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index 20e0125b5f954..8bb9a5a862b56 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -26,42 +26,42 @@ parent_id int - 0 + 0 tree_level smallint - 0 + 0 sort_order smallint - 0 + 0 role_type varchar - 0 + 0 user_id int - 0 + 0 rolename varchar - AdminRole%isolation% + AdminRole%isolation% role-info @@ -76,7 +76,7 @@ resource_access virtual role-resources - All + All roles_resources diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index 29a7547c19e03..c38fd249f2011 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -26,7 +26,7 @@ firstname varchar - FirstName%isolation% + FirstName%isolation% user-info @@ -34,7 +34,7 @@ lastname varchar - LastName%isolation% + LastName%isolation% user-info @@ -42,7 +42,7 @@ email varchar - email%isolation%@example.com + email%isolation%@example.com user-info @@ -50,7 +50,7 @@ username varchar - AdminUser%isolation% + AdminUser%isolation% user-info @@ -58,7 +58,7 @@ password varchar - 123123q + 123123q user-info @@ -66,7 +66,7 @@ created timestamp - CURRENT_TIMESTAMP + CURRENT_TIMESTAMP @@ -87,21 +87,21 @@ lognum smallint - 0 + 0 reload_acl_flag smallint - 0 + 0 is_active smallint - Active + Active @@ -129,7 +129,7 @@ interface_locale varchar - en_US + en_US @@ -142,7 +142,7 @@ password_confirmation virtual user-info - 123123q + 123123q current_password diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php index 85c560b46bd50..d69196de4e9d2 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php @@ -16,6 +16,13 @@ */ class CurrentPassword implements FixtureInterface { + /** + * Data set configuration settings + * + * @var array + */ + protected $params; + /** * User role name. * @@ -33,9 +40,11 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data { $this->params = $params; /** @var \Mtf\System\Config $systemConfig */ - $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config'); - $superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password'); - $this->data = $data == '%current_password%' ? $superAdminPassword : $data; + if ($data == '%current_password%') { + $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config'); + $data = $systemConfig->getConfigParam('application/backend_user_credentials/password'); + } + $this->data = $data; } /** diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php deleted file mode 100644 index 334fda5055bdc..0000000000000 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php +++ /dev/null @@ -1,63 +0,0 @@ -_data['default'] = [ - 'rolename' => 'RoleName%isolation%', - 'resource_access' => 'All', - ]; - - $this->_data['Administrators'] = [ - 'rolename' => 'Administrators', - 'resource_access' => 'All', - 'role_id' => 1, - ]; - - $this->_data['role_sales'] = [ - 'rolename' => 'RoleName%isolation%', - 'resource_access' => 'Custom', - 'roles_resources' => [ - 'Sales' => 'Magento_Sales::sales', - 'Operation' => 'Magento_Sales::sales_operation', - 'Actions' => 'Magento_Sales::actions', - 'Orders' => 'Magento_Sales::sales_order', - 'Create' => 'Magento_Sales::create', - 'View' => 'Magento_Sales::actions_view', - 'Send Order Email' => 'Magento_Sales::email', - 'Reorder' => 'Magento_Sales::reorder', - 'Edit' => 'Magento_Sales::actions_edit', - 'Cancel' => 'Magento_Sales::cancel', - 'Accept or Deny Payment' => 'Magento_Sales::review_payment', - 'Capture' => 'Magento_Sales::capture', - 'Invoice' => 'Magento_Sales::invoice', - 'Credit Memos' => 'Magento_Sales::creditmemo', - 'Hold' => 'Magento_Sales::hold', - 'Unhold' => 'Magento_Sales::unhold', - 'Ship' => 'Magento_Sales::ship', - 'Comment' => 'Magento_Sales::comment', - 'Send Sales Emails' => 'Magento_Sales::emails', - ], - ]; - } -} diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml new file mode 100644 index 0000000000000..3843d8230bdb8 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml @@ -0,0 +1,48 @@ + + + + + + RoleName%isolation% + All + + + + Administrators + All + 1 + + + + RoleName%isolation% + Custom + + Magento_Sales::sales + Magento_Sales::sales_operation + Magento_Sales::actions + Magento_Sales::sales_order + Magento_Sales::create + Magento_Sales::actions_view + Magento_Sales::email + Magento_Sales::reorder + Magento_Sales::actions_edit + Magento_Sales::cancel + Magento_Sales::review_payment + Magento_Sales::capture + Magento_Sales::invoice + Magento_Sales::creditmemo + Magento_Sales::hold + Magento_Sales::unhold + Magento_Sales::ship + Magento_Sales::comment + Magento_Sales::emails + + + + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml index 2223b5b244c63..e5d8c6b54b072 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/curl/di.xml @@ -7,5 +7,5 @@ --> - > + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml index 97a81ffcffd01..369408dfd5358 100644 --- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -5,8 +5,8 @@ * See COPYING.txt for license details. */ --> - - + + 0 diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml new file mode 100644 index 0000000000000..6d0e6205848bb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml @@ -0,0 +1,198 @@ + + + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 0 + 1 + 1 + 1 + 0 + 0 + + + + 1 + 2 + 2 + 2 + 1 + 1 + + + + 1 + 2 + 2 + 2 + 1 + 1 + + + + 1 + 1 + 1 + 1 + 1 + 1 + + + + 1 + 1 + 1 + 1 + 1 + 1 + + + + 1 + 2 + 2 + 2 + 0 + 1 + + + + 1 + 2 + 2 + 2 + 0 + 1 + + + + 1 + 2 + 2 + 2 + 0 + 1 + + + + 1 + 1 + 1 + 1 + 0 + 1 + + + diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php index fa789f9346b58..bd4314af01eaa 100644 --- a/lib/internal/Magento/Framework/Config/Dom.php +++ b/lib/internal/Magento/Framework/Config/Dom.php @@ -317,6 +317,7 @@ public function getDom() protected function _initDom($xml) { $dom = new \DOMDocument(); + $dom->loadXML($xml); if ($this->_schemaFile) { $errors = self::validateDomDocument($dom, $this->_schemaFile, $this->_errorFormat); diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php index fad1d245cfd9b..24531ae379223 100644 --- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php +++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php @@ -143,6 +143,7 @@ protected function _readFiles($fileList) throw new \Magento\Framework\Exception("Invalid XML in file " . $key . ":\n" . $e->getMessage()); } } + $configMerger->getDom()->save("C:\\Users\\daponasenko\\PhpstormProjects\\magento2ce\\test.xml"); if ($this->_isValidated) { $errors = []; if ($configMerger && !$configMerger->validate($this->_schemaFile, $errors)) { diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php index 711531014c162..f5bbb6d02176e 100644 --- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php +++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php @@ -51,6 +51,7 @@ public function __construct(array $interpreters, $discriminator) public function evaluate(array $data) { if (!isset($data[$this->discriminator])) { + var_dump($data); throw new \InvalidArgumentException( sprintf('Value for key "%s" is missing in the argument data.', $this->discriminator) ); From 5f7e1d3c5207a5573c76a8a05fedfac2fa3e7727 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Mon, 19 Jan 2015 19:32:27 +0200 Subject: [PATCH 13/29] MTA-1355: Update tests with configuration fixture --- dev/tests/functional/composer.json | 8 +- .../Util/Generate/Fixture/FieldsProvider.php | 48 ++++- .../Repository/CollectionProvider.php | 41 ++++ dev/tests/functional/phpunit.xml.dist | 1 + .../Bundle/Test/Fixture/BundleProduct.xml | 25 +-- .../app/Magento/Bundle/Test/etc/fixture.xml | 4 +- .../Test/Fixture/CatalogProductSimple.xml | 18 +- .../Test/Repository/CatalogProductSimple.xml | 2 +- .../app/Magento/Catalog/Test/etc/fixture.xml | 8 +- .../Checkout/Test/Block/Onepage/Billing.php | 82 ++++++++ .../Checkout/Test/Block/Onepage/Billing.xml | 34 +++ .../Checkout/Test/Block/Onepage/Login.php | 123 +++++++++++ .../Checkout/Test/Block/Onepage/Login.xml | 16 ++ .../Test/Block/Onepage/Payment/Methods.php | 110 ++++++++++ .../Checkout/Test/Block/Onepage/Review.php | 140 +++++++++++++ .../Checkout/Test/Block/Onepage/Shipping.php | 64 ++++++ .../Checkout/Test/Block/Onepage/Shipping.xml | 28 +++ .../Test/Block/Onepage/Shipping/Method.php | 70 +++++++ .../Checkout/Test/Block/Onepage/Success.php | 72 +++++++ .../TestCase/CreateTermEntityTest/test.csv | 10 +- .../TestCase/UpdateTermEntityTest/test.csv | 8 +- .../tests/app/Magento/Cms/Test/Block/Page.php | 110 ++++++++++ .../ConfigurableProduct/Test/etc/fixture.xml | 4 +- .../Core/Test/Repository/SystemVariable.xml | 2 +- .../Test/TestStep/SetupConfigurationStep.php | 79 +++++++ .../CurrencySymbol/Test/etc/fixture.xml | 10 - .../Magento/Downloadable/Test/etc/fixture.xml | 4 +- .../TestCase/CheckoutWithGiftMessagesTest.php | 44 ++++ .../CheckoutWithGiftMessagesTest/test.csv | 3 + .../CreateGiftMessageOnBackendTest.php | 58 ++++++ .../CreateGiftMessageOnBackendTest/test.csv | 4 + .../GroupedProduct/Test/etc/fixture.xml | 4 +- .../app/Magento/Sales/Test/etc/fixture.xml | 6 - .../app/Magento/Shipping/Test/etc/fixture.xml | 26 --- .../app/Magento/Weee/Test/Block/Cart.php | 45 ++++ .../Magento/Weee/Test/Block/Cart/CartItem.php | 56 +++++ .../Weee/Test/Block/Cart/CartItem/Fpt.php | 75 +++++++ .../Magento/Weee/Test/Block/Cart/Totals.php | 35 ++++ .../Weee/Test/Block/Cart/Totals/Fpt.php | 46 ++++ .../Magento/Weee/Test/Block/Product/Fpt.php | 50 +++++ .../Weee/Test/Block/Product/ListProduct.php | 39 ++++ .../Magento/Weee/Test/Block/Product/View.php | 36 ++++ .../Weee/Test/Constraint/AssertFptApplied.php | 197 ++++++++++++++++++ .../Page/Category/CatalogCategoryView.xml | 16 ++ .../Magento/Weee/Test/Page/CheckoutCart.xml | 21 ++ .../Test/Page/Product/CatalogProductView.xml | 16 ++ .../Test/TestCase/CreateTaxWithFptTest.php | 143 +++++++++++++ .../TestCase/CreateTaxWithFptTest/test.csv | 12 ++ .../app/Magento/Weee/Test/etc/constraint.xml | 12 ++ .../AddProductToWishlistEntityTest.php | 65 ++++++ .../AddProductToWishlistEntityTest/test.csv | 8 + ...CartFromCustomerWishlistOnFrontendTest.php | 93 +++++++++ .../test.csv | 9 + ...ProductInCustomerWishlistOnBackendTest.php | 86 ++++++++ .../test.csv | 6 + ...roductInCustomerWishlistOnFrontendTest.php | 72 +++++++ .../test.csv | 6 + ...oductFromCustomerWishlistOnBackendTest.php | 83 ++++++++ .../test.csv | 3 + ...leteProductsFromWishlistOnFrontendTest.php | 81 +++++++ .../test.csv | 9 + ...eProductFromShoppingCartToWishlistTest.php | 90 ++++++++ .../test.csv | 7 + ...ProductInCustomerWishlistOnBackendTest.php | 78 +++++++ .../test.csv | 6 + lib/internal/Magento/Framework/Config/Dom.php | 1 - .../Framework/Config/Reader/Filesystem.php | 1 - .../Data/Argument/Interpreter/Composite.php | 1 - 68 files changed, 2664 insertions(+), 106 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.xml create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.xml create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php create mode 100644 dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php create mode 100644 dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest/test.csv delete mode 100644 dev/tests/functional/tests/app/Magento/Shipping/Test/etc/fixture.xml create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Fpt.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest/test.csv diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 3c2b4edfbfd0a..8d1cee6c7cd6d 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,12 +1,6 @@ { - "repositories": [ - { - "type": "git", - "url": "https://daponasenko:Magento%^78@github.corp.ebay.com/mtf/mtf.git" - } - ], "require": { - "magento/mtf": "dev-MTA-1136", + "magento/mtf": "1.0.0-rc12", "php": ">=5.4.0", "phpunit/phpunit": "4.1.0", "phpunit/phpunit-selenium": ">=1.2", diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php index b0ae3b9eade06..d139d1ef72095 100644 --- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php +++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php @@ -11,7 +11,6 @@ /** * Class FieldsProvider - * */ class FieldsProvider implements FieldsProviderInterface { @@ -25,6 +24,13 @@ class FieldsProvider implements FieldsProviderInterface */ protected $resource; + /** + * Magento connection. + * + * @var \Magento\Framework\DB\Adapter\AdapterInterface + */ + protected $connection; + /** * @constructor * @param \Magento\Framework\ObjectManagerInterface $objectManager @@ -35,6 +41,22 @@ public function __construct(ObjectManagerInterface $objectManager) $this->resource = $objectManager->create('Magento\Framework\App\Resource'); } + /** + * Check connection to DB. + * + * @return bool + */ + public function checkConnection() + { + $this->connection = $this->getConnection('core_write'); + if (!$this->connection || $this->connection instanceof \Zend_Db_Adapter_Exception) { + echo ('Connection to Magento 2 database is absent.' . PHP_EOL); + return false; + } + + return true; + } + /** * Collect fields for the entity based on its type * @@ -105,8 +127,7 @@ protected function flatCollectFields(array $fixture) $entityType = $fixture['entity_type']; /** @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */ - $connection = $this->resource->getConnection('core_write'); - $fields = $connection->describeTable($entityType); + $fields = $this->connection->describeTable($entityType); $attributes = []; foreach ($fields as $code => $field) { @@ -132,11 +153,9 @@ protected function compositeCollectFields(array $fixture) { $entityTypes = $fixture['entities']; - /** @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */ - $connection = $this->resource->getConnection('core_write'); $fields = []; foreach ($entityTypes as $entityType) { - $fields = array_merge($fields, $connection->describeTable($entityType)); + $fields = array_merge($fields, $this->connection->describeTable($entityType)); } $attributes = []; @@ -152,4 +171,21 @@ protected function compositeCollectFields(array $fixture) return $attributes; } + + /** + * Retrieve connection to resource specified by $resourceName. + * + * @param string $resourceName + * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface|\Zend_Exception + */ + protected function getConnection($resourceName) + { + try { + $connection = $this->resource->getConnection($resourceName); + return $connection; + } catch (\Zend_Exception $e) { + echo $e->getMessage() . PHP_EOL; + return $e; + } + } } diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php index 5088d06530b63..b27977903beb6 100644 --- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php +++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php @@ -19,6 +19,13 @@ class CollectionProvider implements CollectionProviderInterface */ protected $objectManager; + /** + * Magetno resource instance. + * + * @var \Magento\Framework\App\Resource + */ + protected $resource; + /** * @constructor * @param \Magento\Framework\ObjectManagerInterface $objectManager @@ -26,6 +33,23 @@ class CollectionProvider implements CollectionProviderInterface public function __construct(ObjectManagerInterface $objectManager) { $this->objectManager = $objectManager; + $this->resource = $objectManager->create('Magento\Framework\App\Resource'); + } + + /** + * Check connection to DB. + * + * @return bool + */ + public function checkConnection() + { + $connection = $this->getConnection('read'); + if (!$connection || $connection instanceof \Zend_Db_Adapter_Exception) { + echo ('Connection to Magento 2 database is absent.' . PHP_EOL); + return false; + } + + return true; } /** @@ -107,4 +131,21 @@ protected function eavCollection(array $fixture) return $collection->getItems(); } + + /** + * Retrieve connection to resource specified by $resourceName. + * + * @param string $resourceName + * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface|\Zend_Exception + */ + protected function getConnection($resourceName) + { + try { + $connection = $this->resource->getConnection($resourceName); + return $connection; + } catch (\Zend_Exception $e) { + echo $e->getMessage() . PHP_EOL; + return $e; + } + } } diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist index 88428963045e8..568876190a9a2 100755 --- a/dev/tests/functional/phpunit.xml.dist +++ b/dev/tests/functional/phpunit.xml.dist @@ -42,6 +42,7 @@ + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 665bfcf487a56..dcb5a761eeb8a 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -16,14 +16,14 @@ sku Magento\Bundle\Test\Repository\BundleProduct Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface - - bundle - + + bundle + bundle 4 - - product - + + product + category_ids @@ -88,7 +88,7 @@ enable_googlecheckout int 0 - 1 + select @@ -190,7 +190,7 @@ msrp_display_actual_price_type varchar 0 - 4 + select @@ -226,7 +226,7 @@ options_container varchar 0 - container2 + select @@ -273,7 +273,6 @@ status int 0 - 1 checkbox product-details @@ -289,7 +288,6 @@ quantity_and_stock_status int 0 - 1 select product-details @@ -402,7 +400,6 @@ tax_class_id int 0 - Taxable Goods select product-details Magento\Catalog\Test\Fixture\CatalogProductSimple\TaxClass @@ -456,7 +453,6 @@ visibility int 0 - 4 select autosettings @@ -506,9 +502,6 @@ website_ids virtual - - Main Website - websites diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/fixture.xml index 17f1f7b25ce02..cb464a3435f02 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/fixture.xml @@ -25,7 +25,7 @@ Magento\Bundle\Test\Fixture\Bundle\BundleSelections - + @@ -36,7 +36,7 @@ - + bundle diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 2986568c0ebc4..d98a69fb3f99a 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -16,14 +16,14 @@ sku Magento\Catalog\Test\Repository\CatalogProductSimple Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface - - simple - + + simple + simple 4 - - product - + + product + category_ids @@ -191,7 +191,7 @@ msrp_display_actual_price_type varchar 0 - Use config + select @@ -213,7 +213,7 @@ options_container varchar 0 - Block after Info Column + select @@ -425,7 +425,7 @@ is_returnable varchar 0 - 2 + select autosettings diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index f751bac73432f..2dc8767a13969 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -120,7 +120,7 @@ product_100_dollar%isolation% simple - 666 + 666.0000 In Stock 1 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml index 42e974ccae6f3..955a931722af6 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml @@ -61,13 +61,13 @@ virtual - + - + virtual @@ -101,13 +101,13 @@ virtual - + - + virtual diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php new file mode 100644 index 0000000000000..110f959421c5c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php @@ -0,0 +1,82 @@ +fill($billingAddress); + } + if ($customer) { + $this->fill($customer); + } + if ($isShippingAddress) { + $this->_rootElement->find($this->useForShipping)->click(); + } + } + + /** + * Click continue on billing information block + * + * @return void + */ + public function clickContinue() + { + $this->_rootElement->find($this->continue)->click(); + $browser = $this->browser; + $selector = $this->waitElement; + $browser->waitUntil( + function () use ($browser, $selector) { + $element = $browser->find($selector); + return $element->isVisible() == false ? true : null; + } + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.xml new file mode 100644 index 0000000000000..e62c88853e3b2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.xml @@ -0,0 +1,34 @@ + + + + billing + + + + + + + [id='billing:street1'] + + + + select + + + + select + + + + [name='billing[customer_password]'] + + + [name='billing[confirm_password]'] + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php new file mode 100644 index 0000000000000..a6b9d36be4d7b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php @@ -0,0 +1,123 @@ +isRegisteredCustomer()) { + $this->loginCustomer($fixture->getCustomer()); + } elseif ($fixture->getCustomer()) { + $this->registerCustomer(); + $this->clickContinue(); + } else { + $this->guestCheckout(); + $this->clickContinue(); + } + } + + /** + * Perform guest checkout + * + * @return void + */ + public function guestCheckout() + { + $this->_rootElement->find($this->guestCheckout)->click(); + } + + /** + * Register customer during checkout + * + * @return void + */ + public function registerCustomer() + { + $this->_rootElement->find($this->registerCustomer)->click(); + } + + /** + * Login customer during checkout + * + * @param FixtureInterface $customer + * @return void + */ + public function loginCustomer(FixtureInterface $customer) + { + $this->fill($customer); + $this->_rootElement->find($this->login)->click(); + $this->waitForElementNotVisible($this->loadingMask); + } + + /** + * Click continue on checkout method block + * + * @return void + */ + public function clickContinue() + { + $this->_rootElement->find($this->continue)->click(); + $browser = $this->browser; + $selector = $this->loadingMask; + $browser->waitUntil( + function () use ($browser, $selector) { + $element = $browser->find($selector); + return $element->isVisible() == false ? true : null; + } + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.xml new file mode 100644 index 0000000000000..6b1eed8e9a3ac --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.xml @@ -0,0 +1,16 @@ + + + + login + + + [name='login[username]'] + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php new file mode 100644 index 0000000000000..83e9fb1459f7f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php @@ -0,0 +1,110 @@ +_rootElement->find(sprintf($this->paymentMethodInput, $payment['method'])); + if ($paymentSelector->isVisible()) { + $paymentSelector->click(); + } else { + $paymentCount = count($this->_rootElement->find($this->paymentMethodLabels)->getElements()); + $paymentSelector = $this->_rootElement->find(sprintf($this->paymentMethodLabel, $payment['method'])); + if ($paymentCount !== 1 && !$paymentSelector->isVisible()) { + throw new \Exception('Such payment method is absent.'); + } + } + if ($payment['method'] == "purchaseorder") { + $this->_rootElement->find($this->purchaseOrderNumber)->setValue($payment['po_number']); + } + if (isset($payment['dataConfig']['payment_form_class'])) { + $paymentFormClass = $payment['dataConfig']['payment_form_class']; + /** @var \Magento\Payment\Test\Block\Form\Cc $formBlock */ + $formBlock = $this->blockFactory->create( + $paymentFormClass, + ['element' => $this->_rootElement->find('#payment_form_' . $payment['method'])] + ); + $formBlock->fill($payment['credit_card']); + } + } + + /** + * Press "Continue" button + * + * @return void + */ + public function clickContinue() + { + $this->_rootElement->find($this->continue)->click(); + $browser = $this->browser; + $selector = $this->waitElement; + $browser->waitUntil( + function () use ($browser, $selector) { + $element = $browser->find($selector); + return $element->isVisible() == false ? true : null; + } + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php new file mode 100644 index 0000000000000..b60eb15393677 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php @@ -0,0 +1,140 @@ +browser->switchToFrame(); + } + /** + * Fill billing address + * + * @return void + */ + public function placeOrder() + { + $this->_rootElement->find($this->continue, Locator::SELECTOR_CSS)->click(); + $this->waitForElementNotVisible($this->waitElement); + } + + /** + * Wait for 3D Secure card validation + * + * @return void + */ + public function waitForCardValidation() + { + $this->waitForElementNotVisible($this->centinelBlock); + } + + /** + * Get Grand Total Text + * + * @return array|string + */ + public function getGrandTotal() + { + $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText(); + return $this->escapeCurrency($grandTotal); + } + + /** + * Get Tax text from Order Totals + * + * @return array|string + */ + public function getTax() + { + $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText(); + return $this->escapeCurrency($tax); + } + + /** + * Get Subtotal text + * + * @return array|string + */ + public function getSubtotal() + { + $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText(); + return $this->escapeCurrency($subTotal); + } + + /** + * Method that escapes currency symbols + * + * @param string $price + * @return string|null + */ + protected function escapeCurrency($price) + { + preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches); + return (isset($matches[1])) ? $matches[1] : null; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php new file mode 100644 index 0000000000000..bb130c59edd53 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php @@ -0,0 +1,64 @@ +getShippingAddress(); + if (!$shippingAddress) { + return; + } + $this->fill($shippingAddress); + $this->_rootElement->find($this->continue, Locator::SELECTOR_CSS)->click(); + $this->waitForElementNotVisible($this->waitElement); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml new file mode 100644 index 0000000000000..d816ce5af0323 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml @@ -0,0 +1,28 @@ + + + + shipping + + + + + + + [id='billing:street1'] + + + + select + + + + select + + + + diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php new file mode 100644 index 0000000000000..bd4775ced89fa --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php @@ -0,0 +1,70 @@ +shippingMethod, $method['shipping_service'], $method['shipping_method']); + $this->waitForElementVisible($selector, Locator::SELECTOR_XPATH); + $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click(); + } + + /** + * Click continue button + * + * @return void + */ + public function clickContinue() + { + $this->_rootElement->find($this->continue)->click(); + $browser = $this->browser; + $selector = $this->waitElement; + $browser->waitUntil( + function () use ($browser, $selector) { + $element = $browser->find($selector); + return $element->isVisible() == false ? true : null; + } + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php new file mode 100644 index 0000000000000..d947881db4eb7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php @@ -0,0 +1,72 @@ +_rootElement->find($this->continueShopping); + $this->_rootElement->waitUntil( + function () use ($continueShopping) { + return $continueShopping->isVisible() ? true : null; + } + ); + if ($fixture->getCustomer()) { + return $this->_rootElement->find($this->orderId, Locator::SELECTOR_CSS)->getText(); + } else { + return $this->getGuestOrderId(); + } + } + + /** + * Get Id of placed order for guest checkout + * + * @return string + */ + public function getGuestOrderId() + { + $orderString = $this->_rootElement->find($this->orderIdGuest, Locator::SELECTOR_XPATH)->getText(); + preg_match('/[\d]+/', $orderString, $orderId); + return end($orderId); + } +} 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 index 2d45351830d47..45ac149ca4243 100644 --- 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 @@ -1,5 +1,5 @@ -"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";"issue" -"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" -"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" -"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" -"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout";"" +"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" +"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" +"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" +"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" +"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout" 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 index 8b971e8284429..5c9fa47f3d824 100644 --- 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 @@ -1,4 +1,4 @@ -"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";"issue" -"catalogProductSimple::default";"term_disabled_text";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" -"catalogProductSimple::default";"term_disabled_html";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306" -"catalogProductSimple::default";"term_enabled_text";"name%isolation%";"Disabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout";"" +"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/Cms/Test/Block/Page.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php new file mode 100644 index 0000000000000..e4f4542dfffe8 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php @@ -0,0 +1,110 @@ + './/*/a[contains(.,"%s")]', + 'Catalog Category Link' => './/*/a[contains(.,"%s")]', + 'Catalog Product Link' => './/*/a[contains(.,"%s")]', + 'Recently Compared Products' => './/*/div[contains(@class,"block widget compared grid") and contains(.,"%s")]', + 'Recently Viewed Products' => './/*/div[contains(@class,"block widget viewed grid") and contains(.,"%s")]', + 'Catalog New Products List' => './/*/div[contains(@class,"widget new") and contains(.,"%s")]', + 'CMS Static Block' => './/*/div[contains(@class,"widget static block") and contains(.,"%s")]', + ]; + + /** + * Get page content text. + * + * @return string + */ + public function getPageContent() + { + return $this->_rootElement->find($this->cmsPageContentClass)->getText(); + } + + /** + * Get page title. + * + * @return string + */ + public function getPageTitle() + { + return $this->_rootElement->find($this->cmsPageTitle)->getText(); + } + + /** + * Wait for text is visible in the block. + * + * @param string $text + * @return void + */ + public function waitUntilTextIsVisible($text) + { + $text = sprintf($this->textSelector, $text); + $browser = $this->browser; + $this->_rootElement->waitUntil( + function () use ($browser, $text) { + $blockText = $browser->find($text, Locator::SELECTOR_XPATH); + return $blockText->isVisible() == true ? false : null; + } + ); + } + + /** + * Check is visible widget selector. + * + * @param string $widgetType + * @param string $widgetText + * @return bool + * @throws \Exception + */ + public function isWidgetVisible($widgetType, $widgetText) + { + if (isset($this->widgetSelectors[$widgetType])) { + return $this->_rootElement->find( + sprintf($this->widgetSelectors[$widgetType], $widgetText), + Locator::SELECTOR_XPATH + )->isVisible(); + } else { + throw new \Exception('Determine how to find the widget on the page.'); + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/fixture.xml index 3ee2334cb31d2..0e17df6aa1ac2 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/fixture.xml @@ -34,13 +34,13 @@ Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableOptions - + - + configurable diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index bca647c259de2..15e1b3bb91461 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -11,7 +11,7 @@ variableCode%isolation% variableName%isolation% - <p class='custom-variable-test-class-%isolation%'>variableName%isolation%</p> + <p class="custom-variable-test-class-%isolation%">variableName%isolation%</p> variableName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php new file mode 100644 index 0000000000000..6718506b82b9e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php @@ -0,0 +1,79 @@ +fixtureFactory = $fixtureFactory; + $this->configData = $configData; + $this->rollback = $rollback; + } + + /** + * Set config + * + * @return array + */ + public function run() + { + if ($this->configData === '-') { + return []; + } + $prefix = ($this->rollback == false) ? '' : '_rollback'; + + $configData = array_map('trim', explode(',', $this->configData)); + $result = []; + + foreach ($configData as $configDataSet) { + $config = $this->fixtureFactory->createByCode('configData', ['dataSet' => $configDataSet . $prefix]); + if ($config->hasData('section')) { + $config->persist(); + $result[] = $config; + } + } + + return ['config' => $result]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml index 5e2fb5df14b0a..5962b3aa9eff5 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/fixture.xml @@ -6,16 +6,6 @@ */ --> - - table - directory_currency_rate - - Mtf\Util\Generate\Repository\TableCollection - - - - - flat core_config_data diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/fixture.xml index e6c31c061c081..c387993df2b0a 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/fixture.xml @@ -18,7 +18,7 @@ virtual - + @@ -28,7 +28,7 @@ - + downloadable diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php new file mode 100644 index 0000000000000..59bdcb1102357 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php @@ -0,0 +1,44 @@ +executeScenario(); + } +} 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 new file mode 100644 index 0000000000000..a11cab46509db --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv @@ -0,0 +1,3 @@ +"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.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php new file mode 100644 index 0000000000000..5537dfb61f5b3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php @@ -0,0 +1,58 @@ +Orders + * 3. Create new order + * 4. Fill data form dataSet + * 5. Perform all asserts + * + * @group Gift_Messages_(CS) + * @ZephyrId MAGETWO-29642 + */ +class CreateGiftMessageOnBackendTest extends Scenario +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Run CreateGiftMessageOnBackend test. + * + * @return void + */ + public function test() + { + $this->executeScenario(); + } + + /** + * Disable enabled config after test. + * + * @return void + */ + public function tearDown() + { + $setConfigStep = $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'cashondelivery', 'rollback' => true] + ); + $setConfigStep->run(); + } +} 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 new file mode 100644 index 0000000000000..eceb66e4d4caf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest/test.csv @@ -0,0 +1,4 @@ +"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/GroupedProduct/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/fixture.xml index cf842e4e045d8..5c5bf092d8ec0 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/fixture.xml @@ -18,14 +18,14 @@ virtual - + - + grouped diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml index 088d1513872d8..f3b5cdf40fafd 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml @@ -10,29 +10,23 @@ flat sales_order Magento\Sales\Model\Resource\Order\Collection - id virtual - - flat sales_order Magento\Sales\Model\Resource\Order\Collection - id virtual - - composite diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/fixture.xml deleted file mode 100644 index 982ca6fa45f1a..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/fixture.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - virtual - shipping - - - - shipping_service - virtual - - - shipping_method - virtual - - - - - - diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php new file mode 100644 index 0000000000000..e47ee138df0f6 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php @@ -0,0 +1,45 @@ +getDataConfig(); + $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + $cartItem = null; + + if ($this->hasRender($typeId)) { + $cartItem = $this->callRender($typeId, 'getCartItem', ['product' => $product]); + } else { + $cartItemBlock = $this->_rootElement->find( + sprintf($this->cartItemByProductName, $product->getName()), + Locator::SELECTOR_XPATH + ); + $cartItem = $this->blockFactory->create( + 'Magento\Weee\Test\Block\Cart\CartItem', + ['element' => $cartItemBlock] + ); + } + + return $cartItem; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php new file mode 100644 index 0000000000000..8cc1a8eb49bee --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php @@ -0,0 +1,56 @@ +blockFactory->create( + 'Magento\Weee\Test\Block\Cart\CartItem\Fpt', + ['element' => $this->_rootElement->find($this->priceFptBlock, Locator::SELECTOR_XPATH)] + ); + } + + /** + * Get block subtotal fpt + * + * @return \Magento\Weee\Test\Block\Cart\CartItem\Fpt + */ + public function getSubtotalFptBlock() + { + return $this->blockFactory->create( + 'Magento\Weee\Test\Block\Cart\CartItem\Fpt', + ['element' => $this->_rootElement->find($this->subtotalFptBlock, Locator::SELECTOR_XPATH)] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php new file mode 100644 index 0000000000000..7be616dc6452d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php @@ -0,0 +1,75 @@ +_rootElement->find($this->fpt, Locator::SELECTOR_XPATH); + if (!$cartProductFpt->isVisible()) { + $this->_rootElement->find($this->price, Locator::SELECTOR_XPATH)->click(); + } + return str_replace(',', '', $this->escapeCurrency($cartProductFpt->getText())); + } + + /** + * Get product fpt total + * + * @return string + */ + public function getFptTotal() + { + $cartProductFptTotal = $this->_rootElement->find($this->fptTotal, Locator::SELECTOR_XPATH); + $cartProductFptTotalText = $cartProductFptTotal->isVisible() ? $cartProductFptTotal->getText() : ''; + return str_replace(',', '', $this->escapeCurrency($cartProductFptTotalText)); + } + + /** + * Escape currency in price + * + * @param string $price + * @return string|null + */ + protected function escapeCurrency($price) + { + preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches); + return (isset($matches[1])) ? $matches[1] : null; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php new file mode 100644 index 0000000000000..c856ff8f2bba4 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php @@ -0,0 +1,35 @@ +blockFactory->create( + 'Magento\Weee\Test\Block\Cart\Totals\Fpt', + ['element' => $this->_rootElement->find($this->fptBlock, Locator::SELECTOR_XPATH)] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php new file mode 100644 index 0000000000000..e35524be5c57b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php @@ -0,0 +1,46 @@ +_rootElement->find($this->totalFpt, Locator::SELECTOR_CSS)->getText(); + return $this->escapeCurrency($grandTotal); + } + + /** + * Escape currency in price + * + * @param string $price + * @return string|null + */ + protected function escapeCurrency($price) + { + preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches); + return (isset($matches[1])) ? $matches[1] : null; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Fpt.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Fpt.php new file mode 100644 index 0000000000000..4bc5d318fab1e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Fpt.php @@ -0,0 +1,50 @@ + [ + 'selector' => '[class="weee"] .price', + ], + 'weee_total' => [ + 'selector' => '[class="weee"] [data-label="Total"] .price', + ], + ]; + + /** + * Get fpt + * + * @param string $currency + * @return string + */ + public function getFpt($currency = '$') + { + return $this->getTypePrice('weee', $currency); + } + + /** + * Get fpt total + * + * @param string $currency + * @return string + */ + public function getFptTotal($currency = '$') + { + return $this->getTypePrice('weee_total', $currency); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php new file mode 100644 index 0000000000000..4a32c14868d53 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php @@ -0,0 +1,39 @@ +getProductDetailsElement($productName) + ->find(sprintf($this->fptBlockClass, $fptLabel), Locator::SELECTOR_CSS); + return $this->blockFactory->create( + 'Magento\Weee\Test\Block\Product\Fpt', + ['element' => $element] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php new file mode 100644 index 0000000000000..121653a4285cb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php @@ -0,0 +1,36 @@ +blockFactory->create( + 'Magento\Weee\Test\Block\Product\Fpt', + ['element' => $this->_rootElement->find(sprintf($this->fptBlock, $fptLabel), Locator::SELECTOR_CSS)] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php new file mode 100644 index 0000000000000..8e1c7a622602d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php @@ -0,0 +1,197 @@ +cmsIndex = $cmsIndex; + $this->catalogCategoryView = $catalogCategoryView; + $this->catalogProductView = $catalogProductView; + $this->checkoutCart = $checkoutCart; + $this->fptLabel = $product->getDataFieldConfig('attribute_set_id')['source'] + ->getAttributeSet()->getDataFieldConfig('assigned_attributes')['source'] + ->getAttributes()[0]->getFrontendLabel(); + $this->clearShoppingCart(); + $actualPrices = $this->getPrices($product); + //Prices verification + \PHPUnit_Framework_Assert::assertEquals( + $prices, + $actualPrices, + 'Prices on front should be equal to defined in dataset' + ); + } + + /** + * Clear shopping cart + * + * @return void + */ + protected function clearShoppingCart() + { + $this->checkoutCart->open(); + $this->checkoutCart->getCartBlock()->clearShoppingCart(); + } + + /** + * Get prices with fpt on category, product and cart pages + * + * @param CatalogProductSimple $product + * @return array + */ + protected function getPrices(CatalogProductSimple $product) + { + $actualPrices = []; + $productName = $product->getName(); + // Get prices with fpt on category page + $this->cmsIndex->open(); + $this->cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]); + $actualPrices = $this->getCategoryPrice($productName, $actualPrices); + // Get prices with fpt on product page + $this->catalogCategoryView->getListProductBlock()->openProductViewPage($productName); + $actualPrices = $this->addToCart($product, $actualPrices); + // Get prices with fpt on cart page + $actualPrices = $this->getCartPrice($product, $actualPrices); + + return $actualPrices; + } + + /** + * Get prices on category page + * + * @param string $productName + * @param array $actualPrices + * @return array + */ + protected function getCategoryPrice($productName, $actualPrices) + { + $productBlock = $this->catalogCategoryView->getListProductBlock(); + $actualPrices['category_price'] = $productBlock->getProductPriceBlock($productName)->getEffectivePrice(); + $productWeeeBlock = $this->catalogCategoryView->getWeeeListProductBlock(); + $actualPrices['fpt_category'] = $productWeeeBlock->getProductFptBlock($productName, $this->fptLabel)->getFpt(); + $actualPrices['fpt_total_category'] = $productWeeeBlock->getProductFptBlock($productName, $this->fptLabel) + ->getFptTotal(); + + return $actualPrices; + } + + /** + * Fill options get price and add to cart + * + * @param CatalogProductSimple $product + * @param array $actualPrices + * @return array + */ + protected function addToCart(CatalogProductSimple $product, array $actualPrices) + { + $viewBlock = $this->catalogProductView->getViewBlock(); + $viewBlock->fillOptions($product); + $actualPrices['product_page_price'] = $viewBlock->getPriceBlock()->getEffectivePrice(); + $viewWeeeBlock = $this->catalogProductView->getWeeeViewBlock(); + $actualPrices['product_page_fpt'] = $viewWeeeBlock->getFptBlock($this->fptLabel)->getFpt(); + $actualPrices['product_page_fpt_total'] = $viewWeeeBlock->getFptBlock($this->fptLabel)->getFptTotal(); + $viewBlock->clickAddToCart(); + + return $actualPrices; + } + + /** + * Get cart prices + * + * @param CatalogProductSimple $product + * @param array $actualPrices + * @return array + */ + protected function getCartPrice(CatalogProductSimple $product, array $actualPrices) + { + $productItem = $this->checkoutCart->getCartBlock()->getCartItem($product); + $productWeeeItem = $this->checkoutCart->getWeeeCartBlock()->getCartItem($product); + $actualPrices['cart_item_price'] = $productItem->getPrice(); + $actualPrices['cart_item_fpt'] = $productWeeeItem->getPriceFptBlock()->getFpt(); + $actualPrices['cart_item_fpt_total'] = $productWeeeItem->getPriceFptBlock()->getFptTotal(); + $actualPrices['cart_item_subtotal'] = $productItem->getSubtotalPrice(); + $actualPrices['cart_item_subtotal_fpt'] = $productWeeeItem->getSubtotalFptBlock()->getFpt(); + $actualPrices['cart_item_subtotal_fpt_total'] = $productWeeeItem->getSubtotalFptBlock()->getFptTotal(); + $actualPrices['grand_total'] = $this->checkoutCart->getTotalsBlock()->getGrandTotal(); + $actualPrices['total_fpt'] = $this->checkoutCart->getWeeeTotalsBlock()->getFptBlock()->getTotalFpt(); + + return $actualPrices; + } + + /** + * Text of FPT is applied + * + * @return string + */ + public function toString() + { + return 'FPT is applied to product.'; + } +} 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 new file mode 100644 index 0000000000000..760db37436371 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Category/CatalogCategoryView.xml @@ -0,0 +1,16 @@ + + + + + + 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 new file mode 100644 index 0000000000000..a68ece8253c24 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/CheckoutCart.xml @@ -0,0 +1,21 @@ + + + + + + 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 new file mode 100644 index 0000000000000..690f5ba4ac2ab --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Page/Product/CatalogProductView.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Weee\Test\Block\Product\View + #maincontent + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php new file mode 100644 index 0000000000000..098a43b691d8c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php @@ -0,0 +1,143 @@ + Taxes > Tax Rules. + * 4. Click 'Add New Tax Rule' button. + * 5. Assign default rates to rule. + * 6. Save Tax Rule. + * 7. Go to Stores > Attributes > Product and add new attribute. + * 8. Select Fixed Product Tax type and fill attribute label. + * 9. Save attribute. + * 10. Go to Stores > Attributes > Product Template. + * 11. Add new product template based on default. + * 12. Add created FPT attribute to Product Details group and fill set name. + * 13. Save attribute set. + * + * Steps: + * 1. Go to Products > Catalog. + * 2. Add new product. + * 3. Select created product template. + * 4. Fill data according to dataset. + * 5. Save product. + * 6. Go to Stores > Configuration. + * 7. Fill FPT and Tax configuration according to data set. + * 8. Save tax configuration. + * 9. Go to frontend and login with customer + * 10. Perform all assertions. + * + * @group Tax_(CS) + * @ZephyrId MAGETWO-29551 + */ +class CreateTaxWithFptTest extends Injectable +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Fixture factory. + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Prepare data. + * + * @param FixtureFactory $fixtureFactory + * @return array + */ + public function __prepare( + FixtureFactory $fixtureFactory + ) { + $this->fixtureFactory = $fixtureFactory; + $customer = $fixtureFactory->createByCode('customerInjectable', ['dataSet' => 'johndoe_with_addresses']); + $customer->persist(); + $taxRule = $fixtureFactory->createByCode('taxRule', ['dataSet' => 'tax_rule_default']); + $taxRule->persist(); + $productTemplate = $this->fixtureFactory + ->createByCode('catalogAttributeSet', ['dataSet' => 'custom_attribute_set_with_fpt']); + $productTemplate->persist(); + return [ + 'customer' => $customer, + 'productTemplate' => $productTemplate + ]; + } + + /** + * Login customer. + * + * @param CustomerInjectable $customer + * @return void + */ + protected function loginCustomer(CustomerInjectable $customer) + { + $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $customer] + )->run(); + } + + /** + * Test product prices with tax. + * + * @param string $configData + * @param CustomerInjectable $customer + * @param CatalogAttributeSet $productTemplate + * @param array $productData + * @return array + */ + public function test( + $productData, + $configData, + CustomerInjectable $customer, + CatalogAttributeSet $productTemplate + ) { + $product = $this->fixtureFactory->createByCode( + 'catalogProductSimple', + ['dataSet' => $productData, 'data' => ['attribute_set_id' => ['attribute_set' => $productTemplate]]] + ); + $product->persist(); + $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => $configData] + )->run(); + $this->loginCustomer($customer); + return ['product' => $product]; + } + + /** + * Tear down after tests. + * + * @return void + */ + public function tearDown() + { + $this->objectManager->create('\Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run(); + $this->objectManager->create( + 'Magento\Core\Test\TestStep\SetupConfigurationStep', + ['configData' => 'default_tax_configuration,shipping_tax_class_taxable_goods_rollback'] + )->run(); + } +} 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 new file mode 100644 index 0000000000000..10b94c40e8061 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv @@ -0,0 +1,12 @@ +"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_disp_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_disp_incl";"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_disp_incl";"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_disp_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_disp_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_disp_incl";"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_disp_incl";"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_disp_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_disp_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_disp_incl";"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_disp_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 new file mode 100644 index 0000000000000..78372ae91b49b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml @@ -0,0 +1,12 @@ + + + + + high + + diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php new file mode 100644 index 0000000000000..b5a860011a096 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php @@ -0,0 +1,65 @@ +persist(); + + return ['customer' => $customer]; + } + + /** + * Run Add Product To Wishlist test + * + * @param CustomerInjectable $customer + * @param string $product + * @return array + */ + public function test(CustomerInjectable $customer, $product) + { + $this->markTestIncomplete('Bug: MAGETWO-32813'); + $product = $this->createProducts($product)[0]; + + // Steps: + $this->loginCustomer($customer); + $this->addToWishlist([$product], true); + + return ['product' => $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 new file mode 100644 index 0000000000000..92def772d1f25 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv @@ -0,0 +1,8 @@ +"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.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php new file mode 100644 index 0000000000000..dc3dbf9f69ad2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php @@ -0,0 +1,93 @@ + My Wishlist + * 2. Fill qty and update wish list + * 3. Click "Add to Cart" + * 4. Perform asserts + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-25268 + */ +class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishlistTest +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Run suggest searching result test + * + * @param CustomerInjectable $customer + * @param string $products + * @param int $qty + * @return array + */ + public function test(CustomerInjectable $customer, $products, $qty) + { + // Preconditions + $customer->persist(); + $this->loginCustomer($customer); + $products = $this->createProducts($products); + $this->addToWishlist($products); + + // Steps + $this->addToCart($products, $qty); + + // Prepare data for asserts + $cart = $this->createCart($products); + + return ['products' => $products, 'customer' => $customer, 'cart' => $cart]; + } + + /** + * Add products from wish list to cart + * + * @param array $products + * @param int $qty + * @return void + */ + protected function addToCart(array $products, $qty) + { + foreach ($products as $product) { + $this->cmsIndex->getLinksBlock()->openLink("My Wish List"); + if ($qty != '-') { + $this->wishlistIndex->getItemsBlock()->getItemProduct($product)->fillProduct(['qty' => $qty]); + $this->wishlistIndex->getWishlistBlock()->clickUpdateWishlist(); + } + $this->wishlistIndex->getItemsBlock()->getItemProduct($product)->clickAddToCart(); + if ($this->wishlistIndex->getItemsBlock()->isVisible()) { + $this->catalogProductView->getViewBlock()->addToCart($product); + } + } + } + + /** + * Create cart fixture + * + * @param array $products + * @return Cart + */ + protected function createCart(array $products) + { + return $this->fixtureFactory->createByCode('cart', ['data' => ['items' => ['products' => $products]]]); + } +} 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 new file mode 100644 index 0000000000000..4ced4df743d7e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest/test.csv @@ -0,0 +1,9 @@ +"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.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php new file mode 100644 index 0000000000000..27407c6718fd7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php @@ -0,0 +1,86 @@ + All Customers + * 3. Open the customer + * 4. Open wishlist tab + * 5. Click 'Configure' for the product + * 6. Fill in data + * 7. Click Ok + * 8. Perform assertions + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-29257 + */ +class ConfigureProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Prepare data + * + * @param CustomerInjectable $customer + * @return array + */ + public function __prepare(CustomerInjectable $customer) + { + $customer->persist(); + + return ['customer' => $customer]; + } + + /** + * Configure customer wish list on backend + * + * @param CustomerInjectable $customer + * @param string $product + * @param CustomerIndex $customerIndex + * @param CustomerIndexEdit $customerIndexEdit + * @return array + */ + public function test( + CustomerInjectable $customer, + $product, + CustomerIndex $customerIndex, + CustomerIndexEdit $customerIndexEdit + ) { + // Preconditions + $product = $this->createProducts($product)[0]; + $this->loginCustomer($customer); + $this->addToWishlist([$product]); + // Steps + $customerIndex->open(); + $customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]); + $customerForm = $customerIndexEdit->getCustomerForm(); + $customerForm->openTab('wishlist'); + $customerForm->getTabElement('wishlist')->getSearchGridBlock()->searchAndAction( + ['product_name' => $product->getName()], + 'Configure' + ); + $customerIndexEdit->getConfigureProductBlock()->configProduct($product); + + return['product' => $product]; + } +} 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 new file mode 100644 index 0000000000000..740881766b87f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest/test.csv @@ -0,0 +1,6 @@ +"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.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php new file mode 100644 index 0000000000000..61cd85e971fe5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php @@ -0,0 +1,72 @@ +persist(); + + return ['customer' => $customer]; + } + + /** + * Configure customer wish list on frontend + * + * @param CustomerInjectable $customer + * @param string $product + * @return array + */ + public function test(CustomerInjectable $customer, $product) + { + $this->markTestIncomplete('Bug: MAGETWO-32815'); + // Preconditions + $product = $this->createProducts($product)[0]; + $this->loginCustomer($customer); + $this->addToWishlist([$product]); + + // Steps + $this->cmsIndex->getLinksBlock()->openLink('My Wish List'); + $this->wishlistIndex->getItemsBlock()->getItemProduct($product)->clickEdit(); + $this->catalogProductView->getViewBlock()->addToWishlist($product); + + return ['product' => $product]; + } +} 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 new file mode 100644 index 0000000000000..7b192fe4280b0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest/test.csv @@ -0,0 +1,6 @@ +"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.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php new file mode 100644 index 0000000000000..c2791aa183991 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php @@ -0,0 +1,83 @@ + All Customers + * 3. Open the customer + * 4. Open wishlist tab + * 5. Click 'Delete' + * 6. Perform assertions + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-27813 + */ +class DeleteProductFromCustomerWishlistOnBackendTest extends AbstractWishlistTest +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Prepare data + * + * @param CustomerInjectable $customer + * @return array + */ + public function __prepare(CustomerInjectable $customer) + { + $customer->persist(); + + return ['customer' => $customer]; + } + + /** + * Delete product from customer wishlist on backend + * + * @param CustomerInjectable $customer + * @param string $product + * @param CustomerIndex $customerIndex + * @param CustomerIndexEdit $customerIndexEdit + * @return array + */ + public function test( + CustomerInjectable $customer, + $product, + CustomerIndex $customerIndex, + CustomerIndexEdit $customerIndexEdit + ) { + //Preconditions + $product = $this->createProducts($product)[0]; + $this->loginCustomer($customer); + $this->addToWishlist([$product]); + + //Steps + $customerIndex->open(); + $customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]); + $customerForm = $customerIndexEdit->getCustomerForm(); + $customerForm->openTab('wishlist'); + $filter = ['product_name' => $product->getName()]; + $customerForm->getTabElement('wishlist')->getSearchGridBlock()->searchAndAction($filter, 'Delete'); + + return ['products' => [$product]]; + } +} 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 new file mode 100644 index 0000000000000..de3b53115610c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest/test.csv @@ -0,0 +1,3 @@ +"product";"constraint" +"configurableProductInjectable::default";"assertProductsIsAbsentInWishlist" +"catalogProductSimple::simple_for_composite_products";"assertProductsIsAbsentInWishlist" diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php new file mode 100644 index 0000000000000..86d61f27b5c51 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.php @@ -0,0 +1,81 @@ + My Wishlist + * 4. Click "Remove item" + * 5. Perform all assertions + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-28874 + */ +class DeleteProductsFromWishlistOnFrontendTest extends AbstractWishlistTest +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Delete products form default wish list + * + * @param CustomerInjectable $customer + * @param string $products + * @param string $removedProductsIndex [optional] + * @return array + */ + public function test(CustomerInjectable $customer, $products, $removedProductsIndex = null) + { + // Preconditions + $customer->persist(); + $this->loginCustomer($customer); + $products = $this->createProducts($products); + $this->addToWishlist($products); + + // Steps + $this->cmsIndex->getLinksBlock()->openLink("My Wish List"); + $removeProducts = $this->removeProducts($products, $removedProductsIndex); + + return ['products' => $removeProducts, 'customer' => $customer]; + } + + /** + * Remove products from wish list + * + * @param array $products + * @param string $removedProductsIndex + * @return array + */ + protected function removeProducts(array $products, $removedProductsIndex) + { + $removeProducts = []; + if ($removedProductsIndex) { + $removedProductsIndex = explode(',', $removedProductsIndex); + foreach ($removedProductsIndex as $index) { + $this->wishlistIndex->getItemsBlock()->getItemProduct($products[--$index])->remove(); + $removeProducts[] = $products[$index]; + } + } else { + $this->wishlistIndex->getItemsBlock()->removeAllProducts(); + $removeProducts = $products; + } + + return $removeProducts; + } +} 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 new file mode 100644 index 0000000000000..b516c80b40710 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest/test.csv @@ -0,0 +1,9 @@ +"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.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php new file mode 100644 index 0000000000000..5c528bfccaf3a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php @@ -0,0 +1,90 @@ +persist(); + + return ['customer' => $customer]; + } + + /** + * Run Move from ShoppingCard to Wishlist test + * + * @param CustomerInjectable $customer + * @param string $product + * @param AssertAddedProductToCartSuccessMessage $assertAddedProductToCartSuccessMessage + * @param CheckoutCart $checkoutCart + * @return array + */ + public function test( + CustomerInjectable $customer, + $product, + AssertAddedProductToCartSuccessMessage $assertAddedProductToCartSuccessMessage, + CheckoutCart $checkoutCart + ) { + // Preconditions: + $product = $this->createProducts($product)[0]; + $this->loginCustomer($customer); + + // Steps: + $this->addToCart($product); + $assertAddedProductToCartSuccessMessage->processAssert($checkoutCart, $product); + $checkoutCart->getCartBlock()->getCartItem($product)->moveToWishlist(); + + return ['product' => $product]; + } + + /** + * Add product to cart + * + * @param FixtureInterface $product + * @return void + */ + protected function addToCart(FixtureInterface $product) + { + $addProductsToTheCartStep = $this->objectManager->create( + 'Magento\Checkout\Test\TestStep\AddProductsToTheCartStep', + ['products' => [$product]] + ); + $addProductsToTheCartStep->run(); + } +} 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 new file mode 100644 index 0000000000000..d330b2779a670 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest/test.csv @@ -0,0 +1,7 @@ +"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/ViewProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php new file mode 100644 index 0000000000000..4e81a9f6e53d2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php @@ -0,0 +1,78 @@ + All Customers. + * 3. Search and open customer. + * 4. Open wish list tab. + * 5. Perform assertions. + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-29616 + */ +class ViewProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest +{ + /* tags */ + const MVP = 'no'; + const DOMAIN = 'CS'; + /* end tags */ + + /** + * Prepare customer for test. + * + * @param CustomerInjectable $customer + * @return array + */ + public function __prepare(CustomerInjectable $customer) + { + $customer->persist(); + + return ['customer' => $customer]; + } + + /** + * Configure customer wish list on backend. + * + * @param CustomerInjectable $customer + * @param string $product + * @param CustomerIndex $customerIndex + * @param CustomerIndexEdit $customerIndexEdit + * @return array + */ + public function test( + CustomerInjectable $customer, + $product, + CustomerIndex $customerIndex, + CustomerIndexEdit $customerIndexEdit + ) { + // Preconditions + $product = $this->createProducts($product)[0]; + $this->loginCustomer($customer); + $this->addToWishlist([$product], true); + + // Steps + $customerIndex->open(); + $customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]); + $customerIndexEdit->getCustomerForm()->openTab('wishlist'); + + return['product' => $product]; + } +} 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 new file mode 100644 index 0000000000000..740881766b87f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest/test.csv @@ -0,0 +1,6 @@ +"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/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php index bd4314af01eaa..fa789f9346b58 100644 --- a/lib/internal/Magento/Framework/Config/Dom.php +++ b/lib/internal/Magento/Framework/Config/Dom.php @@ -317,7 +317,6 @@ public function getDom() protected function _initDom($xml) { $dom = new \DOMDocument(); - $dom->loadXML($xml); if ($this->_schemaFile) { $errors = self::validateDomDocument($dom, $this->_schemaFile, $this->_errorFormat); diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php index 24531ae379223..fad1d245cfd9b 100644 --- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php +++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php @@ -143,7 +143,6 @@ protected function _readFiles($fileList) throw new \Magento\Framework\Exception("Invalid XML in file " . $key . ":\n" . $e->getMessage()); } } - $configMerger->getDom()->save("C:\\Users\\daponasenko\\PhpstormProjects\\magento2ce\\test.xml"); if ($this->_isValidated) { $errors = []; if ($configMerger && !$configMerger->validate($this->_schemaFile, $errors)) { diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php index f5bbb6d02176e..711531014c162 100644 --- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php +++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Composite.php @@ -51,7 +51,6 @@ public function __construct(array $interpreters, $discriminator) public function evaluate(array $data) { if (!isset($data[$this->discriminator])) { - var_dump($data); throw new \InvalidArgumentException( sprintf('Value for key "%s" is missing in the argument data.', $this->discriminator) ); From 4fbc5ebf97665b39683be96a2ce8cb7cf3c4672b Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 20 Jan 2015 10:23:16 +0200 Subject: [PATCH 14/29] MTA-1355: Update tests with configuration fixture --- .../functional/lib/Mtf/ObjectManagerFactory.php | 3 ++- .../Mtf/Util/Generate/Fixture/FieldsProvider.php | 2 +- .../Generate/Repository/CollectionProvider.php | 2 +- .../tests/app/Magento/Sales/Test/etc/fixture.xml | 11 ----------- dev/tests/functional/utils/generate.php | 5 +---- dev/tests/functional/utils/generate/factory.php | 16 ++-------------- 6 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php index 62524b92770f5..eb6d77fee2bf9 100644 --- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php +++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php @@ -52,11 +52,12 @@ public function create(array $sharedInstances = []) $diConfig = new $this->configClassName(); $systemConfig = new SystemConfig(); $configuration = $systemConfig->getConfigParam(); - $diConfig->extend($configuration); + $diConfig->extend((array)$configuration); $factory = new Factory($diConfig); $argInterpreter = $this->createArgumentInterpreter(new BooleanUtils()); $argumentMapper = new \Magento\Framework\ObjectManager\Config\Mapper\Dom($argInterpreter); + $sharedInstances['Magento\Framework\Data\Argument\InterpreterInterface'] = $argInterpreter; $sharedInstances['Magento\Framework\ObjectManager\Config\Mapper\Dom'] = $argumentMapper; $objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances); diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php index d139d1ef72095..2962ce2ad2910 100644 --- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php +++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php @@ -50,7 +50,7 @@ public function checkConnection() { $this->connection = $this->getConnection('core_write'); if (!$this->connection || $this->connection instanceof \Zend_Db_Adapter_Exception) { - echo ('Connection to Magento 2 database is absent.' . PHP_EOL); + echo ('Connection to Magento 2 database is absent. Fixture data has not been fetched.' . PHP_EOL); return false; } diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php index b27977903beb6..90ca6ca471f67 100644 --- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php +++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php @@ -45,7 +45,7 @@ public function checkConnection() { $connection = $this->getConnection('read'); if (!$connection || $connection instanceof \Zend_Db_Adapter_Exception) { - echo ('Connection to Magento 2 database is absent.' . PHP_EOL); + echo ('Connection to Magento 2 database is absent. Repository data has not been fetched.' . PHP_EOL); return false; } diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml index f3b5cdf40fafd..5619d2bf87213 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/fixture.xml @@ -6,17 +6,6 @@ */ --> - - flat - sales_order - Magento\Sales\Model\Resource\Order\Collection - - - id - virtual - - - flat sales_order diff --git a/dev/tests/functional/utils/generate.php b/dev/tests/functional/utils/generate.php index 2e63dcb82aad8..1b632d2c5c676 100644 --- a/dev/tests/functional/utils/generate.php +++ b/dev/tests/functional/utils/generate.php @@ -5,13 +5,10 @@ */ require_once dirname(__FILE__) . '/' . 'bootstrap.php'; -$objectManager->create('Mtf\Util\Generate\TestCase')->launch(); $objectManager->create('Mtf\Util\Generate\Page')->launch(); $objectManager->create('Mtf\Util\Generate\Fixture')->launch(); -$objectManager->create('Mtf\Util\Generate\Constraint')->launch(); -$objectManager->create('Mtf\Util\Generate\Handler')->launch(); - $objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); $objectManager->create('Mtf\Util\Generate\Repository')->launch(); +$objectManager->create('Mtf\Util\Generate\Factory')->launch(); \Mtf\Util\Generate\GenerateResult::displayResults(); diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php index e2bfb6ce2df5c..69f6f5deedee3 100644 --- a/dev/tests/functional/utils/generate/factory.php +++ b/dev/tests/functional/utils/generate/factory.php @@ -4,18 +4,6 @@ * See COPYING.txt for license details. */ -$mtfRoot = dirname(dirname(dirname(__FILE__))); -$mtfRoot = str_replace('\\', '/', $mtfRoot); -define('MTF_BP', $mtfRoot); -define('MTF_TESTS_PATH', MTF_BP . '/tests/app/'); - -require __DIR__ . '/../../../../../app/bootstrap.php'; -require MTF_BP . '/vendor/autoload.php'; - -$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER); - -$om = $bootstrap->getObjectManager(); -/** @var \Mtf\Util\Generate\Factory $generator */ -$generator = $om->create('Mtf\Util\Generate\Factory'); -$generator->launch(); +require_once dirname(__DIR__) . '/' . 'bootstrap.php'; +$objectManager->create('Mtf\Util\Generate\Factory')->launch(); \Mtf\Util\Generate\GenerateResult::displayResults(); From ca853fd06a04c5f11f1ca3b3c52f28500abd7407 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 20 Jan 2015 13:02:46 +0200 Subject: [PATCH 15/29] MTA-1355: Update tests with configuration fixture --- .../Backend/Test/Block/Widget/FormTabs.php | 2 +- .../UpdateBundleProductEntityTest/test.csv | 6 +- .../Magento/Catalog/Test/Fixture/Category.php | 362 ------------------ .../testCreate.csv | 14 +- .../UpdateSimpleProductEntityTest/test.csv | 16 +- .../UpdateVirtualProductEntityTest/test.csv | 24 +- .../app/Magento/Catalog/Test/etc/fixture.xml | 4 +- .../Magento/CatalogRule/Test/etc/fixture.xml | 2 +- .../test.csv | 10 +- .../UpdateGroupedProductEntityTest/test.csv | 10 +- .../app/Magento/Store/Test/etc/fixture.xml | 6 +- .../app/Magento/Tax/Test/etc/fixture.xml | 6 +- .../Magento/UrlRewrite/Test/etc/fixture.xml | 2 +- 13 files changed, 51 insertions(+), 413 deletions(-) delete mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php index edf9d9de7e3b4..1e78df10e1e8e 100755 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php @@ -253,7 +253,7 @@ private function getFixtureFieldsByTabs(InjectableFixture $fixture) foreach ($data as $field => $value) { $attributes = $fixture->getDataFieldConfig($field); $attributes['value'] = $value; - if (array_key_exists('group', $attributes) && $attributes['group'] !== null) { + if (array_key_exists('group', $attributes) && $attributes['group'] != 'null') { $tabs[$attributes['group']][$field] = $attributes; } elseif (!array_key_exists('group', $attributes)) { $this->unassignedFields[$field] = $attributes; 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 index 440518b0e5a28..235936c0f1038 100644 --- 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 @@ -1,3 +1,3 @@ -"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";"constraint" -"bundle_dynamic_product";"bundle_dynamic_%isolation%";"Fixed";"bundle_dynamic_%isolation%";"dynamic-100";"Fixed";"1";"-";"Bundle Product Fixed Required";"Together";"default_dynamic";"default";"-";"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";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType" +"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/Catalog/Test/Fixture/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php deleted file mode 100644 index d27ae4c345b81..0000000000000 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php +++ /dev/null @@ -1,362 +0,0 @@ - 'Category%isolation%', - 'path' => 'Default Category', - 'url_key' => 'category%isolation%', - 'is_active' => 'Yes', - 'include_in_menu' => 'Yes', - 'parent_id' => 2, - ]; - - protected $entity_id = [ - 'attribute_code' => 'entity_id', - 'backend_type' => 'int', - 'is_required' => '1', - 'default_value' => '', - 'input' => '', - ]; - - protected $entity_type_id = [ - 'attribute_code' => 'entity_type_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $attribute_set_id = [ - 'attribute_code' => 'attribute_set_id', - 'backend_type' => 'smallint', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $description = [ - 'attribute_code' => 'description', - 'backend_type' => 'text', - 'is_required' => '0', - 'default_value' => '', - 'input' => 'textarea', - 'group' => 'general_information', - ]; - - protected $parent_id = [ - 'attribute_code' => 'parent_id', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - 'group' => null, - 'source' => 'Magento\Catalog\Test\Fixture\Category\ParentId', - ]; - - protected $created_at = [ - 'attribute_code' => 'created_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $updated_at = [ - 'attribute_code' => 'updated_at', - 'backend_type' => 'timestamp', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $path = [ - 'attribute_code' => 'path', - 'backend_type' => 'varchar', - 'is_required' => '', - 'default_value' => '', - 'group' => null, - 'input' => '', - ]; - - protected $position = [ - 'attribute_code' => 'position', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $level = [ - 'attribute_code' => 'level', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '0', - 'input' => '', - ]; - - protected $children_count = [ - 'attribute_code' => 'children_count', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - ]; - - protected $available_product_listing_config = [ - 'attribute_code' => 'available_product_listing_config', - 'backend_type' => 'int', - 'is_required' => '', - 'default_value' => '', - 'group' => 'display_setting', - 'input' => 'checkbox', - ]; - - protected $available_sort_by = [ - 'attribute_code' => 'available_sort_by', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'display_setting', - 'input' => 'multiselect', - ]; - - protected $default_product_listing_config = [ - 'attribute_code' => 'default_product_listing_config', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'display_setting', - 'input' => 'checkbox', - ]; - - protected $default_sort_by = [ - 'attribute_code' => 'default_sort_by', - 'backend_type' => 'varchar', - 'is_required' => '0', - 'default_value' => '', - 'group' => 'display_setting', - 'input' => 'select', - ]; - - protected $meta_title = [ - 'attribute_code' => 'meta_title', - 'backend_type' => 'text', - 'is_required' => '', - 'default_value' => '', - 'input' => '', - 'group' => 'general_information', - ]; - - protected $id = [ - 'attribute_code' => 'id', - 'backend_type' => 'virtual', - 'group' => null, - ]; - - protected $name = [ - 'attribute_code' => 'name', - 'backend_type' => 'virtual', - 'group' => 'general_information', - ]; - - protected $is_active = [ - 'attribute_code' => 'is_active', - 'backend_type' => 'virtual', - 'group' => 'general_information', - ]; - - protected $is_anchor = [ - 'attribute_code' => 'is_anchor', - 'backend_type' => 'virtual', - 'group' => 'display_setting', - ]; - - protected $url_key = [ - 'attribute_code' => 'url_key', - 'backend_type' => 'virtual', - 'group' => 'general_information', - ]; - - protected $include_in_menu = [ - 'attribute_code' => 'include_in_menu', - 'backend_type' => 'virtual', - 'group' => 'general_information', - ]; - - protected $landing_page = [ - 'attribute_code' => 'landing_page', - 'backend_type' => 'virtual', - 'input' => 'select', - 'group' => 'display_setting', - 'source' => '\Magento\Catalog\Test\Fixture\Category\LandingPage' - ]; - - protected $display_mode = [ - 'attribute_code' => 'display_mode', - 'backend_type' => 'virtual', - 'input' => 'select', - 'group' => 'display_setting', - ]; - - protected $category_products = [ - 'attribute_code' => 'category_products', - 'backend_type' => 'virtual', - 'group' => 'category_products', - 'source' => 'Magento\Catalog\Test\Fixture\Category\CategoryProducts', - ]; - - public function getEntityId() - { - return $this->getData('entity_id'); - } - - public function getEntityTypeId() - { - return $this->getData('entity_type_id'); - } - - public function getAttributeSetId() - { - return $this->getData('attribute_set_id'); - } - - public function getDescription() - { - return $this->getData('description'); - } - - public function getParentId() - { - return $this->getData('parent_id'); - } - - public function getCreatedAt() - { - return $this->getData('created_at'); - } - - public function getUpdatedAt() - { - return $this->getData('updated_at'); - } - - public function getPath() - { - return $this->getData('path'); - } - - public function getPosition() - { - return $this->getData('position'); - } - - public function getLevel() - { - return $this->getData('level'); - } - - public function getChildrenCount() - { - return $this->getData('children_count'); - } - - public function getAvailableProductListingConfig() - { - return $this->getData('available_product_listing_config'); - } - - public function getAvailableSortBy() - { - return $this->getData('available_sort_by'); - } - - public function getDefaultProductListingConfig() - { - return $this->getData('default_product_listing_config'); - } - - public function getDefaultSortBy() - { - return $this->getData('default_sort_by'); - } - - public function getMetaTitle() - { - return $this->getData('meta_title'); - } - - public function getId() - { - return $this->getData('id'); - } - - public function getName() - { - return $this->getData('name'); - } - - public function getIsActive() - { - return $this->getData('is_active'); - } - - public function getIsAnchor() - { - return $this->getData('is_anchor'); - } - - public function getUrlKey() - { - return $this->getData('url_key'); - } - - public function getIncludeInMenu() - { - return $this->getData('include_in_menu'); - } - - public function getLandingPage() - { - return $this->getData('landing_page'); - } - - public function getDisplayMode() - { - return $this->getData('display_mode'); - } - - public function getCategoryProducts() - { - return $this->getData('category_products'); - } - - public function getBlockId() - { - return $this->getData('block_id'); - } -} 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 index ba028895faf44..721e089ac971b 100644 --- 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 @@ -1,8 +1,8 @@ "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" +"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/UpdateSimpleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest/test.csv index 95db56c64bb9d..78e544b303da2 100644 --- 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 @@ -1,8 +1,8 @@ -"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";"constraint" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"245.00";"200.0000";"-";"test-simple-product-%isolation%";"120.0000";"Catalog, Search";"-";"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";"-";"assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend" -"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"325.01";"125.0000";"-";"test-simple-product-%isolation%";"25.0000";"Catalog";"-";"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";"-";"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";"-";"-";"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";"assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend" -"default";"Test simple product %isolation%";"test_simple_product_%isolation%";"74.00";"87.0000";"-";"test-simple-product-%isolation%";"333.0000";"-";"-";"assertProductSaveMessage, assertProductForm, assertUrlRewriteUpdatedProductInGrid, assertProductVisibleInCategory" +"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/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv index 0999bff07cc58..03f0ac9470b05 100644 --- 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 @@ -1,12 +1,12 @@ -"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";"constraint" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"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";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"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";"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";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"taxable_goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku" +"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/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml index 955a931722af6..da083faf4a546 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/fixture.xml @@ -26,13 +26,13 @@ virtual - + - + simple diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/fixture.xml index 987770aca2d8a..545a4e7157ce6 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/fixture.xml @@ -21,7 +21,7 @@ Magento\CatalogRule\Test\Fixture\Product\Category - + 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 index 5effa53ae4f8b..2d4653b21fefe 100644 --- 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 @@ -1,5 +1,5 @@ -"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";"updatedProduct/data/affected_attribute_set";"constraint";"issue" -"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";"-";"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";"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";"-";"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";"-";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertConfigurableAttributesBlockIsAbsentOnProductPage, assertProductOutOfStock";"" +"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/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest/test.csv index d70a99531218b..1b28e2cfc5e19 100644 --- 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 @@ -1,6 +1,6 @@ -"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";"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";"assertProductSaveMessage, assertProductInStock, assertProductPage" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductVirtual::default,catalogProductVirtual::product_50_dollar";"defaultVirtualProduct";"-";"-";"assertProductSaveMessage, assertGroupedProductForm" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::simple_for_composite_products,catalogProductSimple::default";"defaultSimpleProduct_without_qty";"-";"-";"assertProductSaveMessage, assertGroupedProductsDefaultQty, assertGroupedProductForm" -"default";"GroupedProduct_edited %isolation%";"GroupedProduct_sku_edited %isolation%";"-";"-";"catalogProductSimple::withSpecialPrice,catalogProductSimple::withSpecialPrice";"defaultSimpleProduct_with_specialPrice";"-";"-";"assertProductSaveMessage, assertSpecialPriceOnGroupedProductPage" +"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/Store/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Store/Test/etc/fixture.xml index 50bb606e97cee..608200f08a7a1 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/etc/fixture.xml @@ -12,7 +12,7 @@ Magento\Store\Model\Resource\Website\Collection code - + @@ -21,7 +21,7 @@ Magento\Store\Model\Resource\Group\Collection - + @@ -30,7 +30,7 @@ Magento\Store\Model\Resource\Store\Collection code - + diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/fixture.xml index d46252b8be403..e9dcc289b3cb2 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/fixture.xml @@ -17,7 +17,7 @@ virtual - + @@ -31,7 +31,7 @@ virtual - + @@ -53,7 +53,7 @@ virtual - + diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/fixture.xml index 041ba79dfd848..6ab4aa23ec69e 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/fixture.xml @@ -17,7 +17,7 @@ virtual - + From 0bbedae9a973a1be158b8f904e9b4ed46923bf4a Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 20 Jan 2015 15:36:51 +0200 Subject: [PATCH 16/29] MTA-1355: Update tests with configuration fixture - fixed acceptance build plan --- .../Test/Fixture/CatalogProductVirtual.xml | 12 +++++------ .../Test/Repository/CatalogProductSimple.xml | 20 +++++-------------- .../Fixture/ConfigurableProductInjectable.xml | 12 +++++------ .../ConfigurableProductInjectable.xml | 3 ++- .../Fixture/DownloadableProductInjectable.xml | 12 +++++------ .../Test/Fixture/GroupedProductInjectable.xml | 12 +++++------ .../CreateProductUrlRewriteEntityTest.php | 3 +-- .../Weee/Test/Repository/ConfigData.xml | 3 ++- 8 files changed, 34 insertions(+), 43 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 9f8ef48e020c6..f61fe896db563 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -16,14 +16,14 @@ sku Magento\Catalog\Test\Repository\CatalogProductVirtual Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface - - virtual - + + virtual + virtual 4 - - product - + + product + is_virtual diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 2dc8767a13969..7cc0fe3a5d216 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -342,9 +342,7 @@ In Stock 1 - - dfj_full - + <p>dfj_full</p> Product online Main Website @@ -368,9 +366,7 @@ In Stock 0.1 - - Simple with Weight 0.1 - + <p>Simple with Weight 0.1</p> Product online Main Website @@ -394,9 +390,7 @@ In Stock 150.1 - - Simple with Weight 150.1 - + <p>Simple with Weight 150.1</p> Product online Main Website @@ -420,13 +414,9 @@ In Stock 1 - - adc_Full - + <p>adc_Full</p> Product online - - abc_short - + <p>abc_short</p> Main Website diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index b31a52dee995c..3fd221c2bbe64 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -16,14 +16,14 @@ sku Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface - - configurable - + + configurable + configurable 4 - - product - + + product + category_ids diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml index 2f4aae61f27e0..0160a9c28013e 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -1,7 +1,8 @@ diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 502f0b8e5d4e2..18fca7fddcaf8 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -16,14 +16,14 @@ sku Magento\Downloadable\Test\Repository\DownloadableProductInjectable Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface - - downloadable - + + downloadable + downloadable 4 - - product - + + product + category_ids diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index b4ad3a8c30927..c6e8b47e4573f 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -16,14 +16,14 @@ sku Magento\GroupedProduct\Test\Repository\GroupedProductInjectable Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface - - grouped - + + grouped + grouped 4 - - product - + + product + category_ids diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php index 093391036ecee..61be993d55d21 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php @@ -13,9 +13,8 @@ use Mtf\TestCase\Injectable; /** - * Test Creation for Product URL Rewrites Entity - * * Test Flow: + * * Preconditions: * 1. Create custom storeView * 2. Create simple product diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml index 6d0e6205848bb..0edb9a2ae1422 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml @@ -1,7 +1,8 @@ From a9197baee5cd49380e55673af7a54b27bca05de5 Mon Sep 17 00:00:00 2001 From: Oleksandr Rykh Date: Tue, 20 Jan 2015 15:55:47 +0200 Subject: [PATCH 17/29] MTA-1316: Apply fixture changes to Magento - Fixed default data set --- .../Backend/Test/Fixture/GlobalSearch.xml | 4 +++- .../Bundle/Test/Fixture/BundleProduct.xml | 6 +++++ .../Test/Fixture/CatalogAttributeSet.xml | 6 +++++ .../Test/Fixture/CatalogProductAttribute.xml | 5 +++++ .../Test/Fixture/CatalogProductSimple.xml | 18 +++++++++++++++ .../Test/Fixture/CatalogProductVirtual.xml | 12 ++++++++++ .../Magento/Catalog/Test/Fixture/Category.xml | 8 +++++++ .../CatalogRule/Test/Fixture/CatalogRule.xml | 13 +++++++++++ .../Test/Fixture/CheckoutAgreement.xml | 10 +++++++++ .../Fixture/ConfigurableProductInjectable.xml | 22 +++++++++++++++++++ .../Core/Test/Fixture/SystemVariable.xml | 6 +++++ .../Test/Fixture/CurrencySymbolEntity.xml | 3 +++ .../Test/Fixture/AddressInjectable.xml | 12 ++++++++++ .../Test/Fixture/CustomerGroupInjectable.xml | 6 +++++ .../Test/Fixture/CustomerInjectable.xml | 7 ++++++ .../Fixture/DownloadableProductInjectable.xml | 21 ++++++++++++++++++ .../GiftMessage/Test/Fixture/GiftMessage.xml | 7 ++++++ .../Test/Fixture/GoogleShoppingAttribute.xml | 7 ++++++ .../Test/Fixture/GroupedProductInjectable.xml | 11 ++++++++++ .../Test/Fixture/ImportExport.xml | 4 ++++ .../Integration/Test/Fixture/Integration.xml | 5 +++++ .../Newsletter/Test/Fixture/Template.xml | 7 ++++++ .../Magento/Review/Test/Fixture/Rating.xml | 5 +++++ .../Magento/Review/Test/Fixture/Review.xml | 17 ++++++++++++++ .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 4 ++++ .../app/Magento/Store/Test/Fixture/Store.xml | 9 ++++++++ .../Magento/Store/Test/Fixture/StoreGroup.xml | 9 ++++++++ .../Magento/Store/Test/Fixture/Website.xml | 5 +++++ .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 3 +++ .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 7 ++++++ .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 6 +++++ .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 4 ++++ .../User/Test/Fixture/AdminUserRole.xml | 4 ++++ .../app/Magento/User/Test/Fixture/User.xml | 9 ++++++++ 34 files changed, 281 insertions(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index ce09aa095f173..0d47141a591ab 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -9,12 +9,14 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd" class="Magento\Backend\Test\Fixture\GlobalSearch"> Magento_Backend + + catalogProductSimple::default::name + query virtual Magento\Backend\Test\Fixture\GlobalSearch\Query - catalogProductSimple::default::name diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index dcb5a761eeb8a..2a1f76fb5baba 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -16,6 +16,12 @@ sku Magento\Bundle\Test\Repository\BundleProduct Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface + + BundleProduct %isolation% + Dynamic + Dynamic + Dynamic + bundle diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 9f553177f47cd..079e03598f3ad 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -14,6 +14,12 @@ Magento\Catalog\Model\Resource\Product\Link\Product\Collection Magento\Catalog\Test\Repository\CatalogAttributeSet Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface + + Default_attribute_set_%isolation% + + default + + attribute_set_id diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index a3f0a1fa7d9b0..ce545948fe110 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -17,6 +17,11 @@ Magento\Catalog\Model\Resource\Attribute Magento\Catalog\Test\Repository\CatalogProductAttribute Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface + + attribute_label%isolation% + Text Field + No + attribute_id diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index d98a69fb3f99a..fb53c5dfcbc38 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -16,6 +16,24 @@ sku Magento\Catalog\Test\Repository\CatalogProductSimple Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface + + Test simple product %isolation% + test_simple_sku_%isolation% + + default + + + 100.00 + + 12.00 + + 10.00 + In Stock + + + Main Website + + simple diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index f61fe896db563..91cbc6dda9190 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -16,6 +16,18 @@ sku Magento\Catalog\Test\Repository\CatalogProductVirtual Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface + + Test virtual product %isolation% + test_virtual_sku_%isolation% + + 100.00 + + + 10.00 + In Stock + + Yes + virtual diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index af5ea46c65651..c78448fe2447a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -14,6 +14,14 @@ Magento\Catalog\Model\Resource\Category\Collection Magento\Catalog\Test\Repository\Category Magento\Catalog\Test\Handler\Category\CategoryInterface + + Category%isolation% + Default Category + category%isolation% + Yes + Yes + 2 + entity_id diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index aba65e76c46f8..1e3c0877ec131 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -14,6 +14,19 @@ Magento\CatalogRule\Model\Resource\Rule\Product\Price\Collection Magento\CatalogRule\Test\Repository\CatalogRule Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface + + CatalogPriceRule %isolation% + Catalog Price Rule Description + Active + + Main Website + + + NOT LOGGED IN + + By Percentage of the Original Price + 50 + name diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml index 64e37e6e84e82..b15e360a10894 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml @@ -14,6 +14,16 @@ Magento\CheckoutAgreements\Model\Resource\Agreement\Collection Magento\CheckoutAgreements\Test\Repository\CheckoutAgreement Magento\CheckoutAgreements\Test\Handler\CheckoutAgreement\CheckoutAgreementInterface + + DefaultName%isolation% + Enabled + Text + + default + + test_checkbox%isolation% + TestMessage%isolation% + agreement_id diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 3fd221c2bbe64..1dae8384f2209 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -16,6 +16,28 @@ sku Magento\ConfigurableProduct\Test\Repository\ConfigurableProductInjectable Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable\ConfigurableProductInjectableInterface + + Configurable Product %isolation% + sku_configurable_product_%isolation% + configurable + configurable-product-%isolation% + + default + + + Main Website + + + 100.00 + + 1 + + In Stock + + + default + + configurable diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 5cc60c6817ef1..392235da6ace9 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -16,6 +16,12 @@ Magento\Core\Model\Resource\Variable\Collection Magento\Core\Test\Handler\SystemVariable\SystemVariableInterface + + variableCode%isolation% + variableName%isolation% + <p>html_value</p> + plain_value + variable_id diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml index e496ea713b844..ad10a878c5294 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml @@ -13,6 +13,9 @@ core_config_data Magento\CurrencySymbol\Test\Repository\CurrencySymbolEntity Magento\CurrencySymbol\Test\Handler\CurrencySymbolEntity\CurrencySymbolEntityInterface + + Yes + config_id diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index f417ed4e85571..3acc23d395c5d 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -14,6 +14,18 @@ Magento\Customer\Model\Resource\Address\Collection Magento\Customer\Test\Repository\AddressInjectable Magento\Customer\Test\Handler\AddressInjectable\AddressInjectableInterface + + John + Doe + John.Doe%isolation%@example.com + Magento %isolation% + 6161 West Centinela Avenue + Culver City + California + 90230 + United States + 555-55-555-55 + city diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index 962ee8786b971..fd82088851305 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -14,6 +14,12 @@ Magento\Customer\Model\Resource\Group\Collection Magento\Customer\Test\Repository\CustomerGroupInjectable Magento\Customer\Test\Handler\CustomerGroupInjectable\CustomerGroupInjectableInterface + + customer_code_%isolation% + + customer_tax_class + + code diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index 3d301cce17069..1c89583e6418c 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -15,6 +15,13 @@ email Magento\Customer\Test\Repository\CustomerInjectable Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface + + John + Doe + John.Doe%isolation%@example.com + 123123q + 123123q + address diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index 18fca7fddcaf8..9e25fa45c5343 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -16,6 +16,27 @@ sku Magento\Downloadable\Test\Repository\DownloadableProductInjectable Magento\Downloadable\Test\Handler\DownloadableProductInjectable\DownloadableProductInjectableInterface + + DownloadableProduct_%isolation% + DownloadableProduct_%isolation% + downloadableproduct_%isolation% + + 100.00 + + + Taxable Goods + + This is description for downloadable product + This is short description for downloadable product + + 1.000 + In Stock + + Yes + + default + + downloadable diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index 0456a9a2a56ce..824f410ef7466 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -14,6 +14,13 @@ Magento\GiftMessage\Model\Resource\Message\Collection gift_message_id Magento\GiftMessage\Test\Repository\GiftMessage + + Yes + Yes + John Doe + Jane Doe + text_%isolation% + gift_message_id diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index e5bee0b1a0b47..b194f297989d1 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -14,6 +14,13 @@ Magento\GoogleShopping\Model\Resource\Attribute\Collection Magento\GoogleShopping\Test\Repository\GoogleShoppingAttribute Magento\GoogleShopping\Test\Handler\GoogleShoppingAttribute\GoogleShoppingAttributeInterface + + United States + + default + + Apparel & Accessories + type_id diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index c6e8b47e4573f..194212e9011ce 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -16,6 +16,17 @@ sku Magento\GroupedProduct\Test\Repository\GroupedProductInjectable Magento\GroupedProduct\Test\Handler\GroupedProductInjectable\GroupedProductInjectableInterface + + GroupedProduct_%isolation% + GroupedProduct_%isolation% + Taxable Goods + This is description for grouped product + This is short description for grouped product + + 1 + In Stock + + grouped diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index 36e717d2a2649..bed8edd01cf56 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -11,6 +11,10 @@ Magento_ImportExport flat importexport_importdata + + Products + CSV + id diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 2e3ff04c48bd2..7fff97468bfd5 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -19,6 +19,11 @@ Magento\Integration\Model\Resource\Integration\Collection Magento\Integration\Test\Repository\Integration Magento\Integration\Test\Handler\Integration\IntegrationInterface + + default_integration_%isolation% + test_%isolation%@example.com + All + integration_id diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index 301beae9a37cd..c270caed525ee 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -15,6 +15,13 @@ template_id Magento\Newsletter\Test\Repository\Template Magento\Newsletter\Test\Handler\Template\TemplateInterface + + TemplateName%isolation% + TemplateSubject%isolation% + SenderName%isolation% + SenderName%isolation%@example.com + Some text %isolation% + template_id diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index f841c72e4d845..a7e6223491960 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -15,6 +15,11 @@ rating_code Magento\Review\Test\Repository\Rating Magento\Review\Test\Handler\Rating\RatingInterface + + Rating %isolation% + Main Website/Main Website Store/Default Store View + Yes + rating_id diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index 46ecc64ca169c..18fca86e0bdb1 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -17,6 +17,23 @@ Magento\Review\Model\Resource\Review\Collection Magento\Review\Test\Repository\ReviewInjectable Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface + + Approved + + Main Website/Main Website Store/Default Store View + + Guest customer %isolation% + Summary review %isolation% + Text review %isolation% + + visibleOnDefaultWebsite + 4 + + + catalogProductSimple::default + + Administrator + review_id diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index 9975e74790ed4..199162c801413 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -14,6 +14,10 @@ Magento\Sitemap\Model\Resource\Sitemap\Collection Magento\Sitemap\Test\Repository\Sitemap Magento\Sitemap\Test\Handler\Sitemap\SitemapInterface + + sitemap.xml + / + sitemap_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index 0073def5ac849..67f23516a8302 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -14,6 +14,15 @@ Magento\Store\Model\Resource\Store\Collection Magento\Store\Test\Repository\Store Magento\Store\Test\Handler\Store\StoreInterface + + + default + + Default Store View + default + Enabled + 1 + store_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 62c4960ac0848..58c290458f7cb 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -15,6 +15,15 @@ Magento\Store\Test\Repository\StoreGroup Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface + + + main_website + + StoreGroup%isolation% + + default_category + + group_id diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 81b7d9891c5ab..420e0fd7a3d48 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -15,6 +15,11 @@ code Magento\Store\Test\Repository\Website Magento\Store\Test\Handler\Website\WebsiteInterface + + Main Website + base + 1 + website_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index 860526844f17c..2d70ad7c1e12e 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -15,6 +15,9 @@ Magento\Tax\Test\Repository\TaxClass Magento\Tax\Test\Handler\TaxClass\TaxClassInterface + + Tax Class %isolation% + class_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index 06837ecbbb6b4..625d410054327 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -15,6 +15,13 @@ code Magento\Tax\Test\Repository\TaxRate Magento\Tax\Test\Handler\TaxRate\TaxRateInterface + + Tax Rate %isolation% + 10 + United States + * + California + tax_calculation_rate_id diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index e23b875b4f607..f9d8ccae40a8f 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -15,6 +15,12 @@ code Magento\Tax\Test\Repository\TaxRule Magento\Tax\Test\Handler\TaxRule\TaxRuleInterface + + TaxIdentifier%isolation% + + US-CA-Rate_1 + + tax_calculation_rule_id diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index 2dba647b57483..9bcbc9722e652 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -15,6 +15,10 @@ request_path Magento\UrlRewrite\Test\Repository\UrlRewrite Magento\UrlRewrite\Test\Handler\UrlRewrite\UrlRewriteInterface + + Main Website/Main Website Store/Default Store View + test_request%isolation% + id diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index 8bb9a5a862b56..bbb56ec6cfc0a 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -14,6 +14,10 @@ Magento\User\Model\Resource\Role\User\Collection Magento\User\Test\Repository\AdminUserRole Magento\User\Test\Handler\AdminUserRole\AdminUserRoleInterface + + AdminRole%isolation% + All + role_id diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index c38fd249f2011..8a6cf757c923e 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -14,6 +14,15 @@ Magento\User\Model\Resource\User\Collection Magento\User\Test\Repository\User Magento\User\Test\Handler\User\UserInterface + + AdminUser%isolation% + FirstName%isolation% + LastName%isolation% + email%isolation%@example.com + 123123q + 123123q + Active + user_id From a944e5b232de12b839685de3d9e34e3055cd471b Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 20 Jan 2015 17:32:51 +0200 Subject: [PATCH 18/29] MTA-1355: Update tests with configuration fixture - fixed acceptance build plan - fixed static tests --- .../Magento/Catalog/Test/Repository/CatalogProductSimple.xml | 2 +- .../app/Magento/User/Test/Fixture/User/CurrentPassword.php | 4 +--- lib/internal/Magento/Framework/Test/Utility/Classes.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 7cc0fe3a5d216..243dc4641d7bd 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -208,7 +208,7 @@ default_subcategory - Ma"bsite + Main Website simple_with_category simple-product-%isolation% diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php index d69196de4e9d2..6604f250e80f0 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php @@ -7,7 +7,6 @@ namespace Magento\User\Test\Fixture\User; use Mtf\ObjectManager; -use Mtf\Fixture\FixtureFactory; use Mtf\Fixture\FixtureInterface; use Magento\User\Test\Fixture\AdminUserRole; @@ -32,11 +31,10 @@ class CurrentPassword implements FixtureInterface /** * @construct - * @param FixtureFactory $fixtureFactory * @param array $params * @param string $data */ - public function __construct(FixtureFactory $fixtureFactory, array $params, $data = '') + public function __construct(array $params, $data = '') { $this->params = $params; /** @var \Mtf\System\Config $systemConfig */ diff --git a/lib/internal/Magento/Framework/Test/Utility/Classes.php b/lib/internal/Magento/Framework/Test/Utility/Classes.php index 88e42800450ef..4382510e7a143 100644 --- a/lib/internal/Magento/Framework/Test/Utility/Classes.php +++ b/lib/internal/Magento/Framework/Test/Utility/Classes.php @@ -273,7 +273,7 @@ public static function resolveVirtualType($className) public static function isAutogenerated($className) { if (preg_match('/.*\\\\[a-zA-Z0-9]{1,}(Factory|Proxy|SearchResults|DataBuilder)$/', $className) - || preg_match('/^Magento\\\\[\w]+\\\\(Test\\\\Page)\\\\/', $className) + || preg_match('/^Magento\\\\[\w]+\\\\Test\\\\(?:Page|Fixture)\\\\/', $className) ) { return true; } From 83c44124f903082b06643bde65115bb60b678219 Mon Sep 17 00:00:00 2001 From: Oleksandr Manchenko Date: Thu, 22 Jan 2015 16:50:25 +0200 Subject: [PATCH 19/29] MTA-1397: Update setValue() method for basic typified elements --- .../Mtf/Client/Element/ConditionsElement.php | 21 +++++++- dev/tests/functional/phpunit.xml.dist | 2 +- .../Backend/Test/Block/Widget/Grid.php | 2 + .../Test/TestStep/CreateCatalogRuleStep.php | 4 +- .../Block/Adminhtml/Edit/CustomerForm.php | 17 ++++--- .../Block/Adminhtml/Edit/Tab/Addresses.php | 48 ++++++++----------- .../TestCase/BackendCustomerCreateTest.php | 1 - .../testCreateCustomerBackendEntity.csv | 12 ++--- .../testUpdateCustomerBackendEntity.csv | 8 ++-- ...axCalculationAfterCheckoutDownloadable.php | 2 +- ...axRuleIsAppliedToAllPricesDownloadable.php | 4 +- .../AbstractAssertOrderTaxOnBackend.php | 4 +- ...tractAssertTaxCalculationAfterCheckout.php | 4 +- .../Tax/Test/TestStep/CreateTaxRuleStep.php | 4 +- 14 files changed, 70 insertions(+), 63 deletions(-) diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php index ea8d59e184ec1..8b04e6bd56c84 100644 --- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php +++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php @@ -192,8 +192,12 @@ public function setValue($value) protected function addConditionsCombination($condition, ElementInterface $context) { $condition = $this->parseCondition($condition); + + $this->driver->selectWindow(); $newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH); $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click(); + + $this->driver->selectWindow(); $typeNewCondition = $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select'); $typeNewCondition->setValue($condition['type']); @@ -235,16 +239,23 @@ protected function addSingleCondition($condition, ElementInterface $context) { $condition = $this->parseCondition($condition); + $this->driver->selectWindow(); $newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH); $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click(); + $typeNew = $this->typeNew; $newCondition->waitUntil( function () use ($newCondition, $typeNew) { $element = $newCondition->find($typeNew, Locator::SELECTOR_XPATH, 'select'); - return $element->isVisible() ? true : null; + if ($element->isVisible()) { + return true; + } + $this->driver->selectWindow(); + return null; } ); $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($condition['type']); + $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH); $this->waitForCondition($createdCondition); $this->fillCondition($condition['rules'], $createdCondition); @@ -264,6 +275,8 @@ protected function fillCondition(array $rules, ElementInterface $element) foreach ($rules as $rule) { /** @var ElementInterface $param */ $param = $this->findNextParam($element); + + $this->driver->selectWindow(); $param->find('a')->click(); if (preg_match('`%(.*?)%`', $rule, $chooserGrid)) { @@ -392,7 +405,11 @@ protected function waitForCondition(ElementInterface $element) { $this->waitUntil( function () use ($element) { - return $element->getAttribute('class') == 'rule-param-wait' ? null : true; + if ($element->getAttribute('class') == 'rule-param-wait') { + $this->driver->selectWindow(); + return null; + } + return true; } ); } diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist index 1bc47ba8998a8..53ebfb2bb9bb4 100755 --- a/dev/tests/functional/phpunit.xml.dist +++ b/dev/tests/functional/phpunit.xml.dist @@ -38,7 +38,7 @@ - + diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php index 3843da95b7b0a..6c3e11540c9dd 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php @@ -455,6 +455,8 @@ public function sortGridByField($field, $sort = "desc") */ protected function openFilterBlock() { + $this->getTemplateBlock()->waitForElementNotVisible($this->loader); + $button = $this->_rootElement->find($this->filterButton); if ($button->isVisible() && !$this->_rootElement->find($this->filterButton . $this->active)->isVisible()) { $button->click(); diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php index f17c6b3962160..3cf247de49fd1 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php @@ -6,8 +6,8 @@ namespace Magento\CatalogRule\Test\TestStep; -use Mtf\Fixture\FixtureFactory; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestStep\TestStepInterface; /** * Creating catalog rule diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php index cdf70642bbd4a..e7cfa1adc79fd 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php @@ -11,27 +11,26 @@ use Magento\Mtf\Fixture\InjectableFixture; /** - * Class CustomerForm - * Form for creation of the customer + * Form for creation of the customer. */ class CustomerForm extends FormTabs { /** - * Load spinner + * Magento form loader. * * @var string */ - protected $spinner = '[data-role="spinner"]'; + protected $loader = '[data-role="spinner"]'; /** - * Customer form to load + * Customer form to load. * * @var string */ protected $activeFormTab = '.entry-edit.form-inline [data-bind="visible: active"]:not([style="display: none;"])'; /** - * Fill Customer forms on tabs by customer, addresses data + * Fill Customer forms on tabs by customer, addresses data. * * @param FixtureInterface $customer * @param FixtureInterface|FixtureInterface[]|null $address @@ -53,7 +52,7 @@ public function fillCustomer(FixtureInterface $customer, $address = null) } /** - * Update Customer forms on tabs by customer, addresses data + * Update Customer forms on tabs by customer, addresses data. * * @param FixtureInterface $customer * @param FixtureInterface|FixtureInterface[]|null $address @@ -84,8 +83,8 @@ public function updateCustomer(FixtureInterface $customer, $address = null) public function getDataCustomer(FixtureInterface $customer, $address = null) { $this->waitForm(); - $data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()]; + $data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()]; if (null !== $address) { $this->openTab('addresses'); $data['addresses'] = $this->getTabElement('addresses')->getDataAddresses($address); @@ -102,7 +101,7 @@ public function getDataCustomer(FixtureInterface $customer, $address = null) */ protected function waitForm() { - $this->waitForElementNotVisible($this->spinner); + $this->waitForElementNotVisible($this->loader); $this->waitForElementVisible($this->activeFormTab); } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php index 864fbb11f815d..22b5a2b92ec64 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php @@ -7,41 +7,46 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab; use Magento\Backend\Test\Block\Widget\Tab; -use Magento\Customer\Test\Fixture\AddressInjectable; use Magento\Mtf\Client\Element\SimpleElement; use Magento\Mtf\Client\Element; use Magento\Mtf\Client\Locator; use Magento\Mtf\Fixture\FixtureInterface; /** - * Class Addresses - * Customer addresses edit block + * Customer addresses edit block. */ class Addresses extends Tab { /** - * "Add New Customer" button + * "Add New Customer" button. * * @var string */ protected $addNewAddress = '.address-list-actions .add'; /** - * Open customer address + * Open customer address. * * @var string */ protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]'; /** - * Magento loader + * Active address tab. + * + * @var string + */ + protected $addressTab = '.address-item-edit[data-bind="visible: element.active"]:not([style="display: none;"])'; + + /** + * Magento loader. * * @var string */ protected $loader = '//ancestor::body/div[@data-role="loader"]'; /** - * Fill customer addresses + * Fill customer addresses. * * @param FixtureInterface|FixtureInterface[] $address * @return $this @@ -51,15 +56,6 @@ public function fillAddresses($address) $addresses = is_array($address) ? $address : [$address]; foreach ($addresses as $address) { $this->addNewAddress(); - - /* Fix switch between region_id and region */ - /** @var AddressInjectable $address */ - $countryId = $address->getCountryId(); - if ($countryId && $this->mapping['country_id']) { - $this->_fill($this->dataMapping(['country_id' => $countryId])); - $this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH); - } - $this->fillFormTab($address->getData(), $this->_rootElement); } @@ -67,7 +63,7 @@ public function fillAddresses($address) } /** - * Update customer addresses + * Update customer addresses. * * @param FixtureInterface|FixtureInterface[] $address * @return $this @@ -90,13 +86,6 @@ public function updateAddresses($address) } $this->openCustomerAddress($addressNumber); - /* Fix switch between region_id and region */ - /** @var AddressInjectable $address */ - $countryId = $address->getCountryId(); - if ($countryId && $this->mapping['country_id']) { - $this->_fill($this->dataMapping(['country_id' => $countryId])); - $this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH); - } $defaultAddress = ['default_billing' => 'No', 'default_shipping' => 'No']; $addressData = $address->getData(); foreach ($defaultAddress as $key => $value) { @@ -113,7 +102,7 @@ public function updateAddresses($address) } /** - * Get data of Customer addresses + * Get data of Customer addresses. * * @param FixtureInterface|FixtureInterface[]|null $address * @return array @@ -144,7 +133,7 @@ public function getDataAddresses($address = null) } /** - * Get data to fields on tab + * Get data to fields on tab. * * @param array|null $fields * @param SimpleElement|null $element @@ -159,15 +148,16 @@ public function getDataFormTab($fields = null, SimpleElement $element = null) } /** - * Click "Add New Address" button + * Click "Add New Address" button. */ protected function addNewAddress() { $this->_rootElement->find($this->addNewAddress)->click(); + $this->waitForElementVisible($this->addressTab); } /** - * Open customer address + * Open customer address. * * @param int $addressNumber * @throws \Exception @@ -186,7 +176,7 @@ protected function openCustomerAddress($addressNumber) } /** - * Check is visible customer address + * Check is visible customer address. * * @param int $addressNumber * @return bool diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php index c979cd41c25bb..3fa885c3ff882 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php @@ -13,7 +13,6 @@ class BackendCustomerCreateTest extends Functional { /* tags */ const TEST_TYPE = 'acceptance_test'; - const STABLE = 'no'; /* end tags */ /** 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 index 3474c0f076557..7db78a347381a 100644 --- 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 @@ -1,6 +1,6 @@ -"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" -"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" -"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" +"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/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv index 457306867243d..f1e0e24884439 100644 --- 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 @@ -1,4 +1,4 @@ -"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" -"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" -"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" +"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/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php index f8bf3012cfa96..009f5e1cacd07 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php @@ -11,7 +11,7 @@ use Magento\Checkout\Test\Page\CheckoutOnepageSuccess; use Magento\Customer\Test\Fixture\CustomerInjectable; use Magento\Sales\Test\Page\OrderView; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout; /** diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php index bd74cdb32ae3b..a0c10b6fc59fb 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php @@ -11,8 +11,8 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Tax\Test\Constraint\AbstractAssertTaxRuleIsAppliedToAllPrices; -use Mtf\Fixture\FixtureFactory; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset. 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 aa63949e9de9d..f039b6f00b8e3 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 @@ -6,12 +6,12 @@ namespace Magento\Tax\Test\Constraint; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Sales\Test\Page\Adminhtml\OrderView; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew; use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that prices displayed excluding tax in order are correct on backend. diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php index debc24c79bb65..fd580fd0c21bb 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php @@ -6,13 +6,13 @@ namespace Magento\Tax\Test\Constraint; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Checkout\Test\Page\CheckoutOnepage; use Magento\Checkout\Test\Page\CheckoutOnepageSuccess; use Magento\Customer\Test\Fixture\CustomerInjectable; use Magento\Sales\Test\Page\OrderView; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that prices excluding tax on order review and customer order pages are equal to specified in dataset. diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php index e90c0be6bc439..555af5a2594c6 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php @@ -6,8 +6,8 @@ namespace Magento\Tax\Test\TestStep; -use Mtf\Fixture\FixtureFactory; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestStep\TestStepInterface; /** * Creating tax rule From d61ecb53ebc190e865859accad8e7474c6d965ae Mon Sep 17 00:00:00 2001 From: Oleksandr Manchenko Date: Fri, 23 Jan 2015 06:56:36 +0200 Subject: [PATCH 20/29] MTA-1397: Update setValue() method for basic typified elements - Updated wait load customer form --- .../Block/Adminhtml/Edit/CustomerForm.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php index e7cfa1adc79fd..e2fa4a7994adf 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php @@ -7,6 +7,7 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit; use Magento\Backend\Test\Block\Widget\FormTabs; +use Magento\Mtf\Client\Locator; use Magento\Mtf\Fixture\FixtureInterface; use Magento\Mtf\Fixture\InjectableFixture; @@ -29,6 +30,34 @@ class CustomerForm extends FormTabs */ protected $activeFormTab = '.entry-edit.form-inline [data-bind="visible: active"]:not([style="display: none;"])'; + /** + * Field label on customer form. + * + * @var string + */ + protected $fieldLabel = './/*[contains(@class, "form__field")]/*[contains(@class,"label")]'; + + /** + * Field with absent label on customer form. + * + * @var string + */ + protected $fieldLabelAbsent = './/*[contains(@class, "form__field") and not(./*[contains(@class,"label")]/*)]'; + + /** + * Wrapper for field on customer form. + * + * @var string + */ + protected $fieldWrapperControl = './/*[contains(@class, "form__field")]/*[contains(@class,"control")]'; + + /** + * Wrapper with absent field on customer form. + * + * @var string + */ + protected $fieldWrapperControlAbsent = './/*[contains(@class, "form__field") and not(./input or ./*[contains(@class,"control")]/*)]'; + /** * Fill Customer forms on tabs by customer, addresses data. * @@ -103,5 +132,12 @@ protected function waitForm() { $this->waitForElementNotVisible($this->loader); $this->waitForElementVisible($this->activeFormTab); + + $this->waitForElementVisible($this->fieldLabel, Locator::SELECTOR_XPATH); + $this->waitForElementNotVisible($this->fieldLabelAbsent, Locator::SELECTOR_XPATH); + $this->waitForElementVisible($this->fieldWrapperControl, Locator::SELECTOR_XPATH); + $this->waitForElementNotVisible($this->fieldWrapperControlAbsent, Locator::SELECTOR_XPATH); + + usleep(500000); } } From ab3d43c9223560f7eef1896afef895acd50679cb Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Fri, 23 Jan 2015 14:43:08 +0200 Subject: [PATCH 21/29] MTA-1316 Apply fixture changes to Magento - fix tests --- .../Backend/Test/Fixture/GlobalSearch.xml | 2 +- .../Backend/Test/Repository/ConfigData.xml | 2 +- .../Bundle/Test/Fixture/BundleProduct.xml | 2 +- .../Fixture/BundleProduct/CheckoutData.php | 8 +- .../Bundle/Test/Repository/BundleProduct.xml | 2 +- .../Test/Constraint/AssertProductPage.php | 5 +- .../Test/Fixture/CatalogAttributeSet.xml | 2 +- .../Test/Fixture/CatalogProductAttribute.xml | 2 +- .../Test/Fixture/CatalogProductSimple.xml | 4 +- .../Test/Fixture/CatalogProductVirtual.xml | 2 +- .../Magento/Catalog/Test/Fixture/Category.xml | 2 +- .../Test/Repository/CatalogAttributeSet.xml | 2 +- .../Repository/CatalogProductAttribute.xml | 2 +- .../Test/Repository/CatalogProductSimple.xml | 2 +- .../Test/Repository/CatalogProductVirtual.xml | 2 +- .../Catalog/Test/Repository/Category.xml | 2 +- .../Category/DeleteCategoryEntityTest.php | 1 - .../testCreateProductAttribute.csv | 20 +- .../Test/Repository/ConfigData.xml | 2 +- .../CatalogRule/Test/Fixture/CatalogRule.xml | 2 +- .../Test/Repository/CatalogRule.xml | 2 +- .../Test/TestStep/CreateCatalogRuleStep.php | 4 +- .../Test/Fixture/CatalogSearchQuery.xml | 2 +- .../Test/Repository/CatalogSearchQuery.xml | 2 +- .../CreateSearchTermEntityTest/test.csv | 2 +- .../EditSearchTermEntityTest/test.csv | 2 +- .../Checkout/Test/Block/Onepage/Billing.php | 4 +- .../Checkout/Test/Block/Onepage/Login.php | 4 +- .../Test/Block/Onepage/Payment/Methods.php | 4 +- .../Checkout/Test/Block/Onepage/Review.php | 239 ++++++++++++++- .../Checkout/Test/Block/Onepage/Shipping.php | 10 +- .../Test/Block/Onepage/Shipping/Method.php | 4 +- .../Checkout/Test/Block/Onepage/Success.php | 14 +- .../Magento/Checkout/Test/Fixture/Cart.xml | 2 +- .../test.csv | 18 +- .../test.csv | 18 +- .../Block/Agreement/Edit/AgreementsForm.php | 2 +- .../Test/Block/Onepage/AgreementReview.php | 2 +- .../Constraint/AssertTermAbsentInGrid.php | 2 +- .../Constraint/AssertTermAbsentOnCheckout.php | 12 +- .../Test/Constraint/AssertTermInGrid.php | 2 +- .../Test/Constraint/AssertTermOnCheckout.php | 12 +- .../AssertTermSuccessDeleteMessage.php | 2 +- .../AssertTermSuccessSaveMessage.php | 2 +- .../Test/Fixture/CheckoutAgreement.xml | 2 +- .../Test/Fixture/CheckoutAgreement/Stores.php | 4 +- .../CheckoutAgreementInterface.php | 2 +- .../Test/Handler/CheckoutAgreement/Curl.php | 12 +- .../Test/Repository/CheckoutAgreement.xml | 2 +- .../Test/Repository/ConfigData.xml | 2 +- .../Test/TestCase/CreateTermEntityTest.php | 4 +- .../Test/TestCase/DeleteTermEntityTest.php | 4 +- .../Test/TestCase/UpdateTermEntityTest.php | 4 +- .../TestStep/DeleteAllTermsEntityStep.php | 2 +- .../tests/app/Magento/Cms/Test/Block/Page.php | 4 +- ...AssertConfigurableProductDuplicateForm.php | 1 + .../Fixture/ConfigurableProductInjectable.xml | 2 +- .../ConfigurableProductInjectable.xml | 2 +- .../Magento/Core/Test/Fixture/ConfigData.xml | 2 +- .../Core/Test/Fixture/SystemVariable.xml | 2 +- .../Core/Test/Repository/SystemVariable.xml | 2 +- .../Test/TestStep/SetupConfigurationStep.php | 4 +- .../Adminhtml/System/CurrencySymbolForm.php | 12 +- .../AssertCurrencySymbolOnCatalogPage.php | 2 +- .../AssertCurrencySymbolOnProductPage.php | 8 +- ...AssertCurrencySymbolSuccessSaveMessage.php | 2 +- .../Test/Fixture/CurrencySymbolEntity.xml | 2 +- .../Handler/CurrencySymbolEntity/Curl.php | 12 +- .../CurrencySymbolEntityInterface.php | 2 +- .../Test/Repository/CurrencySymbolEntity.xml | 2 +- .../TestCase/EditCurrencySymbolEntityTest.php | 4 +- .../ResetCurrencySymbolEntityTest.php | 4 +- .../Test/Fixture/AddressInjectable.xml | 2 +- .../Test/Fixture/CustomerGroupInjectable.xml | 2 +- .../Test/Fixture/CustomerInjectable.xml | 2 +- .../Test/Repository/AddressInjectable.xml | 2 +- .../Repository/CustomerGroupInjectable.xml | 2 +- .../Test/Repository/CustomerInjectable.xml | 2 +- .../TestCase/ChangeCustomerPasswordTest.php | 111 +++++++ .../ChangeCustomerPasswordTest/test.csv | 4 + .../Dhl/Test/Repository/ConfigData.xml | 2 +- .../Test/Block/Currency/Switcher.php | 5 +- .../Directory/Test/Repository/ConfigData.xml | 2 +- ...axCalculationAfterCheckoutDownloadable.php | 2 +- ...axRuleIsAppliedToAllPricesDownloadable.php | 4 +- .../Fixture/DownloadableProductInjectable.xml | 2 +- .../DownloadableProductInjectable.xml | 2 +- .../Fedex/Test/Repository/ConfigData.xml | 2 +- .../GiftMessage/Test/Fixture/GiftMessage.xml | 2 +- .../Test/Repository/ConfigData.xml | 2 +- .../Test/Repository/GiftMessage.xml | 2 +- .../TestCase/CheckoutWithGiftMessagesTest.php | 2 +- .../CreateGiftMessageOnBackendTest.php | 2 +- .../Test/Fixture/GoogleShoppingAttribute.xml | 2 +- .../Repository/GoogleShoppingAttribute.xml | 2 +- .../Test/Fixture/GroupedProductInjectable.xml | 2 +- .../Repository/GroupedProductInjectable.xml | 2 +- .../Test/Fixture/ImportExport.xml | 2 +- .../Magento/Install/Test/Fixture/Install.xml | 2 +- .../Integration/Test/Fixture/Integration.xml | 2 +- .../Test/Repository/Integration.xml | 2 +- ...ReAuthorizeTokensIntegrationEntityTest.php | 1 - .../Newsletter/Test/Fixture/Template.xml | 2 +- .../Newsletter/Test/Repository/Template.xml | 2 +- .../Test/Repository/ConfigData.xml | 2 +- .../Test/Repository/ConfigData.xml | 2 +- .../Reports/Test/Repository/ConfigData.xml | 2 +- .../Magento/Review/Test/Fixture/Rating.xml | 2 +- .../Magento/Review/Test/Fixture/Review.xml | 6 +- .../Magento/Review/Test/Repository/Rating.xml | 2 +- .../{ReviewInjectable.xml => Review.xml} | 2 +- .../Shipping/Test/Repository/ConfigData.xml | 2 +- .../Magento/Sitemap/Test/Fixture/Sitemap.xml | 2 +- .../Sitemap/Test/Repository/Sitemap.xml | 2 +- .../app/Magento/Store/Test/Fixture/Store.xml | 2 +- .../Magento/Store/Test/Fixture/StoreGroup.xml | 2 +- .../Magento/Store/Test/Fixture/Website.xml | 2 +- .../Magento/Store/Test/Repository/Store.xml | 2 +- .../Store/Test/Repository/StoreGroup.xml | 2 +- .../Magento/Store/Test/Repository/Website.xml | 2 +- .../AbstractAssertOrderTaxOnBackend.php | 4 +- ...tractAssertTaxCalculationAfterCheckout.php | 4 +- .../app/Magento/Tax/Test/Fixture/TaxClass.xml | 2 +- .../app/Magento/Tax/Test/Fixture/TaxRate.xml | 2 +- .../app/Magento/Tax/Test/Fixture/TaxRule.xml | 2 +- .../Tax/Test/Repository/ConfigData.xml | 273 +++--------------- .../Magento/Tax/Test/Repository/TaxClass.xml | 2 +- .../Magento/Tax/Test/Repository/TaxRate.xml | 2 +- .../Magento/Tax/Test/Repository/TaxRule.xml | 2 +- .../Tax/Test/TestStep/CreateTaxRuleStep.php | 4 +- .../Ups/Test/Repository/ConfigData.xml | 2 +- .../UrlRewrite/Test/Fixture/UrlRewrite.xml | 2 +- .../UrlRewrite/Test/Repository/UrlRewrite.xml | 2 +- .../User/Test/Fixture/AdminUserRole.xml | 2 +- .../app/Magento/User/Test/Fixture/User.xml | 4 +- .../Test/Fixture/User/CurrentPassword.php | 8 +- .../User/Test/Repository/AdminUserRole.xml | 2 +- .../app/Magento/User/Test/Repository/User.xml | 2 +- .../CreateAdminUserEntityTest/test.csv | 12 +- .../Usps/Test/Repository/ConfigData.xml | 2 +- .../app/Magento/Weee/Test/Block/Cart.php | 4 +- .../Magento/Weee/Test/Block/Cart/CartItem.php | 2 +- .../Weee/Test/Block/Cart/CartItem/Fpt.php | 4 +- .../Magento/Weee/Test/Block/Cart/Totals.php | 2 +- .../Weee/Test/Block/Cart/Totals/Fpt.php | 4 +- .../Weee/Test/Block/Product/ListProduct.php | 2 +- .../Magento/Weee/Test/Block/Product/View.php | 2 +- .../Weee/Test/Constraint/AssertFptApplied.php | 2 +- .../Weee/Test/Repository/ConfigData.xml | 186 ++++-------- .../Test/TestCase/CreateTaxWithFptTest.php | 6 +- .../TestCase/CreateTaxWithFptTest/test.csv | 22 +- ...eProductFromShoppingCartToWishlistTest.php | 2 +- dev/tests/functional/utils/generate.php | 19 +- .../functional/utils/generate/factory.php | 2 +- .../functional/utils/generate/fixture.php | 6 +- dev/tests/functional/utils/generate/page.php | 1 + .../functional/utils/generate/repository.php | 6 +- .../Framework/Test/Utility/Classes.php | 2 +- 158 files changed, 737 insertions(+), 629 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv rename dev/tests/functional/tests/app/Magento/Review/Test/Repository/{ReviewInjectable.xml => Review.xml} (97%) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml index 0d47141a591ab..b42876f1a7815 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml @@ -6,7 +6,7 @@ */ --> Magento_Backend diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml index d95a3fae93252..d77c4a76dd187 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Store 1 diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 2a1f76fb5baba..5e88525da9742 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -6,7 +6,7 @@ */ --> Magento_Bundle eav diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php index a6de998417597..055c7f80488c3 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php @@ -166,11 +166,11 @@ protected function getPreset($name) ], [ 'title' => 'attribute_key_10', - 'value' => '12/12/2014', + 'value' => '12/12/2015', ], [ 'title' => 'attribute_key_11', - 'value' => '12/12/2014/12/30/AM', + 'value' => '12/12/2015/12/30/AM', ], [ 'title' => 'attribute_key_12', @@ -257,11 +257,11 @@ protected function getPreset($name) ], [ 'title' => 'attribute_key_7', - 'value' => '12/12/2014', + 'value' => '12/12/2015', ], [ 'title' => 'attribute_key_8', - 'value' => '12/12/2014/12/30/AM', + 'value' => '12/12/2015/12/30/AM', ], [ 'title' => 'attribute_key_9', diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml index 9feb33d25afcb..f8d27a60783b6 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + BundleDynamic_sku_10735074493 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php index 23e31de68caf9..94bd2b2647082 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php @@ -131,11 +131,10 @@ protected function verifyPrice() */ protected function verifySpecialPrice() { - $fixtureProductSpecialPrice = $this->product->getSpecialPrice(); - if (!$fixtureProductSpecialPrice) { + if (!$this->product->hasData('special_price')) { return null; } - + $fixtureProductSpecialPrice = $this->product->getSpecialPrice(); $fixtureProductSpecialPrice = number_format($fixtureProductSpecialPrice, 2); $formProductSpecialPrice = $this->productView->getPriceBlock()->getSpecialPrice(); if ($fixtureProductSpecialPrice == $formProductSpecialPrice) { diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml index 079e03598f3ad..ede6703369d54 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml @@ -6,7 +6,7 @@ */ --> Magento_Catalog flat diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml index ce545948fe110..abe87d1040677 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml @@ -6,7 +6,7 @@ */ --> Magento_Catalog composite diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index fb53c5dfcbc38..f24e386252451 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -6,7 +6,7 @@ */ --> Magento_Catalog eav @@ -43,7 +43,7 @@ product - + category_ids static 0 diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml index 91cbc6dda9190..30a872c70b94a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -6,7 +6,7 @@ */ --> Magento_Catalog eav diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index c78448fe2447a..9bf9670e19660 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -6,7 +6,7 @@ */ --> Magento_Catalog eav diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml index af0c211e69118..4c36327a4f813 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Default diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml index c8ee79fff6d2e..74294dba90c1e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + attribute_text%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml index 243dc4641d7bd..03d8f449d9343 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml index 71369a45046e5..6d8121608c524 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml index 9aca370ce3f42..ec4dc51b4d511 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Default Category diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php index 85496befeb3a3..e6bafe0e25615 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php @@ -70,7 +70,6 @@ public function __inject(CatalogCategoryIndex $catalogCategoryIndex, CatalogCate */ public function test(Category $category) { - $this->markTestIncomplete('MAGETWO-31723'); $category->persist(); $this->catalogCategoryIndex->open(); $this->catalogCategoryIndex->getTreeCategories()->selectCategory($category); 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 index c17decc4632f6..b09fc94a96eab 100755 --- 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 @@ -1,10 +1,10 @@ -"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_configurable";"productAttribute/data/manage_frontend_label";"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";"constraint";"issue" -"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";"" \ No newline at end of file +"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_configurable";"productAttribute/data/manage_frontend_label";"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";"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";"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/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml index f583e313c73c9..de76f9b2295fc 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml index 1e3c0877ec131..ea231170ed7d3 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml @@ -6,7 +6,7 @@ */ --> Magento_CatalogRule eav diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml index 123e2e3be4c02..043457a8e8de2 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Active Catalog Rule diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php index f17c6b3962160..3cf247de49fd1 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php @@ -6,8 +6,8 @@ namespace Magento\CatalogRule\Test\TestStep; -use Mtf\Fixture\FixtureFactory; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestStep\TestStepInterface; /** * Creating catalog rule diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index deeb42ebe7492..59befc307268f 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -6,7 +6,7 @@ */ --> Magento_CatalogSearch flat diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml index 75f42645b95dd..c1ca5e3e2284c 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 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 index 124f69344b39a..57d68290ccaa9 100644 --- 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 @@ -1,2 +1,2 @@ "searchTerm/data/query_text/value";"searchTerm/data/store_id";"searchTerm/data/synonym_for";"searchTerm/data/redirect";"searchTerm/data/display_in_terms";"constraint" -"catalogProductSimple::getSku";"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";"assertSearchTermSuccessSaveMessage, assertSearchTermInGrid, assertSearchTermForm, assertSearchTermOnFrontend, assertSearchTermSynonymOnFrontend" 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 index c7e90bce0d3be..2e260a6a786e2 100644 --- 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 @@ -1,2 +1,2 @@ "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::getSku";"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";"assertSearchTermSuccessSaveMessage, assertSearchTermForm, assertSearchTermInGrid, assertSearchTermOnFrontend" diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php index 110f959421c5c..db9b6109a05b7 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php @@ -8,8 +8,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable; use Magento\Customer\Test\Fixture\CustomerInjectable; -use Mtf\Block\Form; -use Mtf\Client\Element; +use Magento\Mtf\Block\Form; /** * Class Billing @@ -60,6 +59,7 @@ public function fillBilling( if ($isShippingAddress) { $this->_rootElement->find($this->useForShipping)->click(); } + $this->waitForElementNotVisible($this->waitElement); } /** diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php index a6b9d36be4d7b..3825719ad4eec 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php @@ -6,8 +6,8 @@ namespace Magento\Checkout\Test\Block\Onepage; use Magento\Checkout\Test\Fixture\Checkout; -use Mtf\Block\Form; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Block\Form; +use Magento\Mtf\Fixture\FixtureInterface; /** * Class Login diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php index 83e9fb1459f7f..7ce79345368e4 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php @@ -6,7 +6,7 @@ namespace Magento\Checkout\Test\Block\Onepage\Payment; -use Mtf\Block\Form; +use Magento\Mtf\Block\Form; /** * Class Methods @@ -70,7 +70,7 @@ public function selectPaymentMethod(array $payment) if ($paymentSelector->isVisible()) { $paymentSelector->click(); } else { - $paymentCount = count($this->_rootElement->find($this->paymentMethodLabels)->getElements()); + $paymentCount = count($this->_rootElement->getElements($this->paymentMethodLabels)); $paymentSelector = $this->_rootElement->find(sprintf($this->paymentMethodLabel, $payment['method'])); if ($paymentCount !== 1 && !$paymentSelector->isVisible()) { throw new \Exception('Such payment method is absent.'); diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php index b60eb15393677..5839491a28e8d 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Review.php @@ -6,16 +6,17 @@ namespace Magento\Checkout\Test\Block\Onepage; -use Mtf\Block\Block; -use Mtf\Block\BlockFactory; -use Mtf\Client\Driver\Selenium\Browser; -use Mtf\Client\Element; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; +use Magento\Mtf\Block\BlockFactory; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Client\Element\SimpleElement; /** * Class Review * One page checkout status review block * + * @SuppressWarnings(PHPMD.TooManyFields) */ class Review extends Block { @@ -38,21 +39,100 @@ class Review extends Block * * @var string */ - protected $grandTotal = '//tr[@class="grand totals"]/td[@class="amount"]//span'; + protected $grandTotal = '[class="grand totals"] span'; + + /** + * Grand total excluding tax search mask + * + * @var string + */ + protected $grandTotalExclTax = '[class="grand totals excl"] span'; + + /** + * Grand total including tax search mask + * + * @var string + */ + protected $grandTotalInclTax = '[class="grand totals incl"] span'; /** * Subtotal search mask * * @var string */ - protected $subtotal = '//tr[@class="totals sub"]/td[@class="amount"]//span'; + protected $subtotal = '.totals.sub .price'; + + /** + * Subtotal excluding tax search mask + * + * @var string + */ + protected $subtotalExclTax = '[class="totals sub excl"] span'; + + /** + * Subtotal including tax search mask + * + * @var string + */ + protected $subtotalInclTax = '[class="totals sub incl"] span'; /** * Tax search mask * * @var string */ - protected $tax = '//tr[@class="totals-tax"]/td[@class="amount"]//span'; + protected $tax = '.totals-tax span'; + + /** + * Discount search mask + * + * @var string + */ + protected $discount = '[class="totals"] .amount>span'; + + /** + * Shipping excluding tax search mask + * + * @var string + */ + protected $shippingExclTax = '[class="totals shipping excl"] span'; + + /** + * Shipping including tax search mask + * + * @var string + */ + protected $shippingInclTax = '[class="totals shipping incl"] span'; + + /** + * Product price excluding tax search mask + * + * @var string + */ + protected $itemExclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-excluding-tax"]/span'; + + /** + * Product price including tax search mask + * + * @var string + */ + protected $itemInclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-including-tax"]/span'; + + // @codingStandardsIgnoreStart + /** + * Product price subtotal excluding tax search mask + * + * @var string + */ + protected $itemSubExclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-excluding-tax"]/span'; + + /** + * Product price subtotal including tax search mask + * + * @var string + */ + protected $itemSubInclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-including-tax"]/span'; + // @codingStandardsIgnoreEnd /** * Wait element @@ -63,15 +143,15 @@ class Review extends Block /** * @constructor - * @param Element $element + * @param SimpleElement $element * @param BlockFactory $blockFactory - * @param Browser $browser + * @param BrowserInterface $browser */ - public function __construct(Element $element, BlockFactory $blockFactory, Browser $browser) + public function __construct(SimpleElement $element, BlockFactory $blockFactory, BrowserInterface $browser) { parent::__construct($element, $blockFactory, $browser); - $this->browser->switchToFrame(); } + /** * Fill billing address * @@ -100,7 +180,81 @@ public function waitForCardValidation() */ public function getGrandTotal() { - $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText(); + $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText(); + return $this->escapeCurrency($grandTotal); + } + + /** + * Get Item price excluding tax + * + * @param string $productName + * @return string|null + */ + public function getItemPriceExclTax($productName) + { + $locator = sprintf($this->itemExclTax, $productName); + $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH); + return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null; + } + + /** + * Get Item price including tax + * + * @param string $productName + * @return string|null + */ + public function getItemPriceInclTax($productName) + { + $locator = sprintf($this->itemInclTax, $productName); + $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH); + return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null; + } + + /** + * Get Item subtotal price excluding tax + * + * @param string $productName + * @return string|null + */ + public function getItemSubExclTax($productName) + { + $locator = sprintf($this->itemSubExclTax, $productName); + $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH); + return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null; + } + + /** + * Get Item subtotal price excluding tax + * + * @param string $productName + * @return string|null + */ + public function getItemSubInclTax($productName) + { + $locator = sprintf($this->itemSubInclTax, $productName); + $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH); + return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null; + } + + /** + * Get Grand Total excluding tax text + * + * @return string + */ + public function getGrandTotalExclTax() + { + $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_CSS)->getText(); + return $this->escapeCurrency($grandTotal); + } + + /** + * Get Grand Total including tax text + * + * @return string + */ + public function getGrandTotalInclTax() + { + $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS)->getText(); return $this->escapeCurrency($grandTotal); } @@ -111,10 +265,21 @@ public function getGrandTotal() */ public function getTax() { - $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText(); + $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS)->getText(); return $this->escapeCurrency($tax); } + /** + * Get Discount text from Order Totals + * + * @return string|null + */ + public function getDiscount() + { + $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_CSS); + return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null; + } + /** * Get Subtotal text * @@ -122,10 +287,54 @@ public function getTax() */ public function getSubtotal() { - $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText(); + $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_CSS)->getText(); return $this->escapeCurrency($subTotal); } + /** + * Get Subtotal excluding tax text + * + * @return string + */ + public function getSubtotalExclTax() + { + $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS)->getText(); + return $this->escapeCurrency($subTotal); + } + + /** + * Get Subtotal including tax text + * + * @return string + */ + public function getSubtotalInclTax() + { + $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS)->getText(); + return $this->escapeCurrency($subTotal); + } + + /** + * Get Shipping including tax price text + * + * @return string|null + */ + public function getShippingInclTax() + { + $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_CSS); + return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null; + } + + /** + * Get Shipping excluding tax price text + * + * @return string|null + */ + public function getShippingExclTax() + { + $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_CSS); + return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null; + } + /** * Method that escapes currency symbols * diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php index bb130c59edd53..796b272a9579b 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php @@ -6,10 +6,10 @@ namespace Magento\Checkout\Test\Block\Onepage; +use Magento\Mtf\Block\Form; +use Magento\Mtf\Client\Locator; +use Magento\Mtf\Client\Element\SimpleElement; use Magento\Checkout\Test\Fixture\Checkout; -use Mtf\Block\Form; -use Mtf\Client\Element; -use Mtf\Client\Element\Locator; /** * Class Shipping @@ -36,10 +36,10 @@ class Shipping extends Form * Fill form data. Unset 'email' field as it absent in current form * * @param array $fields - * @param Element $element + * @param SimpleElement $element * @return void */ - protected function _fill(array $fields, Element $element = null) + protected function _fill(array $fields, SimpleElement $element = null) { unset($fields['email']); parent::_fill($fields, $element); diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php index bd4775ced89fa..8842ad897a8af 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php @@ -6,8 +6,8 @@ namespace Magento\Checkout\Test\Block\Onepage\Shipping; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Class Method diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php index d947881db4eb7..bd7db8956f146 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Success.php @@ -7,8 +7,8 @@ namespace Magento\Checkout\Test\Block\Onepage; use Magento\Checkout\Test\Fixture\Checkout; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Class Success @@ -69,4 +69,14 @@ public function getGuestOrderId() preg_match('/[\d]+/', $orderString, $orderId); return end($orderId); } + + /** + * Click order id link + * + * @return void + */ + public function openOrder() + { + $this->_rootElement->find($this->orderId, Locator::SELECTOR_CSS)->click(); + } } diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml index 62c9018f78a27..a787298d02a6f 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml @@ -6,7 +6,7 @@ */ --> Magento_Checkout flat 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 index d5bcec10813bb..e754cc39c2c32 100644 --- 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 @@ -1,9 +1,9 @@ -"productsData";"cart/data/grand_total";"constraint";"issue" -"bundleProduct::bundle_dynamic_product";"200";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"" -"bundleProduct::bundle_fixed_product";"756";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-28350" -"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";"Bug: MAGETWO-24195" -"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";"Bug: MAGETWO-28350" +"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/DeleteProductsFromShoppingCartTest/test.csv b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest/test.csv index 1ab5c0a0b3724..78905d9e68380 100644 --- 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 @@ -1,9 +1,9 @@ -"productsData";"constraint";"issue" -"bundleProduct::bundle_dynamic_product";"assertCartIsEmpty";"" -"bundleProduct::bundle_fixed_product";"assertCartIsEmpty";"Bug: MAGETWO-28350" -"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";"Bug: MAGETWO-28350" +"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/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php index 2a366434270c1..509bef65926d1 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.php @@ -6,7 +6,7 @@ namespace Magento\CheckoutAgreements\Test\Block\Adminhtml\Block\Agreement\Edit; -use Mtf\Block\Form; +use Magento\Mtf\Block\Form; /** * Class AgreementsForm diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php index 3a8ea6908562b..b8e534a350720 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php @@ -8,7 +8,7 @@ use Magento\Checkout\Test\Block\Onepage\Review; use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Client\Locator; /** * Class AgreementReview diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php index a67d13cfeb8ad..d7e9c12b01e97 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php @@ -8,7 +8,7 @@ use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertTermAbsentInGrid diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php index daa97e9b92bed..19842adc066a9 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php @@ -10,10 +10,10 @@ use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Checkout\Test\Page\CheckoutOnepage; use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; -use Mtf\Client\Browser; -use Mtf\Constraint\AbstractConstraint; -use Mtf\Fixture\FixtureFactory; -use Mtf\ObjectManager; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\ObjectManager; /** * Class AssertTermAbsentOnCheckout @@ -31,7 +31,7 @@ class AssertTermAbsentOnCheckout extends AbstractConstraint * @param FixtureFactory $fixtureFactory * @param ObjectManager $objectManager * @param string $product - * @param Browser $browser + * @param BrowserInterface $browser * @param CatalogProductView $catalogProductView * @param CheckoutCart $checkoutCart * @param CheckoutOnepage $checkoutOnepage @@ -46,7 +46,7 @@ public function processAssert( FixtureFactory $fixtureFactory, ObjectManager $objectManager, $product, - Browser $browser, + BrowserInterface $browser, CatalogProductView $catalogProductView, CheckoutCart $checkoutCart, CheckoutOnepage $checkoutOnepage, diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php index 9d1ac1e2eeef4..2e653e52bdf36 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php @@ -8,7 +8,7 @@ use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertTermInGrid diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php index bf9e00f9ab13a..386c4038028ea 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php @@ -11,10 +11,10 @@ use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Checkout\Test\Page\CheckoutOnepage; use Magento\Checkout\Test\Page\CheckoutOnepageSuccess; -use Mtf\Client\Browser; -use Mtf\Constraint\AbstractConstraint; -use Mtf\Fixture\FixtureFactory; -use Mtf\ObjectManager; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\ObjectManager; /** * Class AssertTermOnCheckout @@ -40,7 +40,7 @@ class AssertTermOnCheckout extends AbstractConstraint * @param FixtureFactory $fixtureFactory * @param ObjectManager $objectManager * @param string $product - * @param Browser $browser + * @param BrowserInterface $browser * @param CatalogProductView $catalogProductView * @param CheckoutCart $checkoutCart * @param CheckoutOnepage $checkoutOnepage @@ -56,7 +56,7 @@ public function processAssert( FixtureFactory $fixtureFactory, ObjectManager $objectManager, $product, - Browser $browser, + BrowserInterface $browser, CatalogProductView $catalogProductView, CheckoutCart $checkoutCart, CheckoutOnepage $checkoutOnepage, diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php index e3976b6f8f10e..d43f7f581e575 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php @@ -7,7 +7,7 @@ namespace Magento\CheckoutAgreements\Test\Constraint; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertTermSuccessDeleteMessage diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php index cb735f5b65377..1f27a0220978f 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php @@ -7,7 +7,7 @@ namespace Magento\CheckoutAgreements\Test\Constraint; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertTermSuccessSaveMessage diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml index b15e360a10894..1f21222eeb2da 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml @@ -6,7 +6,7 @@ */ --> Magento_CheckoutAgreements flat diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php index 39c713585cc2f..38b0fb89d8ad4 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement/Stores.php @@ -7,8 +7,8 @@ namespace Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\Store\Test\Fixture\Store; -use Mtf\Fixture\FixtureFactory; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\Fixture\FixtureInterface; /** * Class Stores diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php index 8bd1c6197383c..acde7787f0f67 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/CheckoutAgreementInterface.php @@ -6,7 +6,7 @@ namespace Magento\CheckoutAgreements\Test\Handler\CheckoutAgreement; -use Mtf\Handler\HandlerInterface; +use Magento\Mtf\Handler\HandlerInterface; /** * Interface CheckoutAgreementInterface diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php index 9a4fd1785fd58..2a57d70674070 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php @@ -6,12 +6,12 @@ namespace Magento\CheckoutAgreements\Test\Handler\CheckoutAgreement; -use Mtf\Fixture\FixtureInterface; -use Mtf\Handler\Curl as AbstractCurl; -use Mtf\System\Config; -use Mtf\Util\Protocol\CurlInterface; -use Mtf\Util\Protocol\CurlTransport; -use Mtf\Util\Protocol\CurlTransport\BackendDecorator; +use Magento\Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Handler\Curl as AbstractCurl; +use Magento\Mtf\System\Config; +use Magento\Mtf\Util\Protocol\CurlInterface; +use Magento\Mtf\Util\Protocol\CurlTransport; +use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator; /** * Class Curl diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml index 9e5d653eddaef..458088176cf95 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/CheckoutAgreement.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + TermDisabledTextName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml index 27de2b18a63da..3b1573fffd2c1 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php index 76b2d3a215ea4..6ab07b7f9280d 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.php @@ -9,8 +9,8 @@ use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementNew; -use Mtf\ObjectManager; -use Mtf\TestCase\Injectable; +use Magento\Mtf\ObjectManager; +use Magento\Mtf\TestCase\Injectable; /** * Test creation for CreateTermEntity. diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php index 66657cf1dcf33..54db2bc5d2105 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.php @@ -9,8 +9,8 @@ use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementNew; -use Mtf\ObjectManager; -use Mtf\TestCase\Injectable; +use Magento\Mtf\ObjectManager; +use Magento\Mtf\TestCase\Injectable; /** * Test creation for DeleteTermEntityTest. diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php index 4c851358989ab..37a0f0d0dd241 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.php @@ -9,8 +9,8 @@ use Magento\CheckoutAgreements\Test\Fixture\CheckoutAgreement; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementNew; -use Mtf\ObjectManager; -use Mtf\TestCase\Injectable; +use Magento\Mtf\ObjectManager; +use Magento\Mtf\TestCase\Injectable; /** * Test creation for UpdateTermEntityTest. diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php index 90e5506c1a1ab..f57baf78acc59 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/DeleteAllTermsEntityStep.php @@ -9,7 +9,7 @@ use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementIndex; use Magento\CheckoutAgreements\Test\Page\Adminhtml\CheckoutAgreementNew; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\TestStep\TestStepInterface; /** * Class DeleteAllTermsEntityStep diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php index e4f4542dfffe8..63cacfea8b6a5 100644 --- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php +++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php @@ -6,8 +6,8 @@ namespace Magento\Cms\Test\Block; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Cms Page block for the content on the frontend. diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php index 7bc07b5c9907c..5c54456e8df61 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php @@ -60,6 +60,7 @@ public function processAssert( protected function prepareFixtureData(array $data, array $sortFields = []) { $data['url_key'] = $this->prepareUrlKey($data['url_key']); + $data['quantity_and_stock_status']['is_in_stock'] = 'Out of Stock'; return parent::prepareFixtureData($data, $sortFields); } diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 1dae8384f2209..ebf560c60d456 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_ConfigurableProduct eav diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml index 0160a9c28013e..5290b878250fa 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Test configurable product %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml index d411f7faaa47c..c6868dfef0a60 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.xml @@ -6,7 +6,7 @@ */ --> Magento_Core flat diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml index 392235da6ace9..ccaf981cef37f 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.xml @@ -6,7 +6,7 @@ */ --> Magento_Core composite diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml index 15e1b3bb91461..e38b91df291d2 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml +++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php index 6718506b82b9e..9b6daf2f9704d 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php +++ b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php @@ -6,8 +6,8 @@ namespace Magento\Core\Test\TestStep; -use Mtf\Fixture\FixtureFactory; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestStep\TestStepInterface; /** * Class SetupConfigurationStep diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php index c527e90bac513..020ae28779832 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php @@ -6,10 +6,10 @@ namespace Magento\CurrencySymbol\Test\Block\Adminhtml\System; -use Mtf\Block\Form; -use Mtf\Client\Element; -use Mtf\Client\Element\Locator; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Block\Form; +use Magento\Mtf\Client\Locator; +use Magento\Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Client\Element\SimpleElement; /** * Class CurrencySymbolForm @@ -28,10 +28,10 @@ class CurrencySymbolForm extends Form * Fill the root form * * @param FixtureInterface $fixture - * @param Element|null $element + * @param SimpleElement|null $element * @return $this */ - public function fill(FixtureInterface $fixture, Element $element = null) + public function fill(FixtureInterface $fixture, SimpleElement $element = null) { $element = $this->_rootElement->find(sprintf($this->currencyRow, $fixture->getCode()), Locator::SELECTOR_XPATH); return parent::fill($fixture, $element); diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php index a1554a8c104a0..37ac563a1e32a 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php @@ -10,7 +10,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView; use Magento\Cms\Test\Page\CmsIndex; use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertCurrencySymbolOnCatalogPage diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php index 9c4bc288a31df..b00d27a778221 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php @@ -10,8 +10,8 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Cms\Test\Page\CmsIndex; use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity; -use Mtf\Client\Browser; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Check that after applying changes, currency symbol changed on Product Details Page. @@ -26,7 +26,7 @@ class AssertCurrencySymbolOnProductPage extends AbstractConstraint * Assert that after applying changes, currency symbol changed on Product Details Page. * * @param CatalogProductSimple $product - * @param Browser $browser + * @param BrowserInterface $browser * @param CmsIndex $cmsIndex * @param CatalogProductView $catalogProductView * @param CurrencySymbolEntity $currencySymbol @@ -34,7 +34,7 @@ class AssertCurrencySymbolOnProductPage extends AbstractConstraint */ public function processAssert( CatalogProductSimple $product, - Browser $browser, + BrowserInterface $browser, CmsIndex $cmsIndex, CatalogProductView $catalogProductView, CurrencySymbolEntity $currencySymbol diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php index d7193616fb52c..262cebd7b3a94 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php @@ -7,7 +7,7 @@ namespace Magento\CurrencySymbol\Test\Constraint; use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencySymbolIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Class AssertCurrencySymbolSuccessSaveMessage diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml index ad10a878c5294..b9b6fb5804d5d 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Fixture/CurrencySymbolEntity.xml @@ -6,7 +6,7 @@ */ --> Magento_CurrencySymbol flat diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php index 453377a7b6bc7..616500d5f0996 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/Curl.php @@ -6,12 +6,12 @@ namespace Magento\CurrencySymbol\Test\Handler\CurrencySymbolEntity; -use Mtf\Fixture\FixtureInterface; -use Mtf\Handler\Curl as AbstractCurl; -use Mtf\System\Config; -use Mtf\Util\Protocol\CurlInterface; -use Mtf\Util\Protocol\CurlTransport; -use Mtf\Util\Protocol\CurlTransport\BackendDecorator; +use Magento\Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Handler\Curl as AbstractCurl; +use Magento\Mtf\System\Config; +use Magento\Mtf\Util\Protocol\CurlInterface; +use Magento\Mtf\Util\Protocol\CurlTransport; +use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator; /** * Class Curl diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php index 5514059c69cb4..e964969586806 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Handler/CurrencySymbolEntity/CurrencySymbolEntityInterface.php @@ -6,7 +6,7 @@ namespace Magento\CurrencySymbol\Test\Handler\CurrencySymbolEntity; -use Mtf\Handler\HandlerInterface; +use Magento\Mtf\Handler\HandlerInterface; /** * Interface CurrencySymbolEntityInterface diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml index f1a5c14398c3a..b7dded3a56ca8 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/CurrencySymbolEntity.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php index 2d21b61c47b9c..71d6d450faa75 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.php @@ -6,8 +6,8 @@ namespace Magento\CurrencySymbol\Test\TestCase; -use Mtf\TestCase\Injectable; -use Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestCase\Injectable; +use Magento\Mtf\Fixture\FixtureFactory; use Magento\Catalog\Test\Fixture\CatalogProductSimple; use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity; use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex; diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php index 67fcfe2ac96be..6c4dbffee168c 100644 --- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/ResetCurrencySymbolEntityTest.php @@ -6,8 +6,8 @@ namespace Magento\CurrencySymbol\Test\TestCase; -use Mtf\TestCase\Injectable; -use Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestCase\Injectable; +use Magento\Mtf\Fixture\FixtureFactory; use Magento\Catalog\Test\Fixture\CatalogProductSimple; use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity; use Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencyIndex; diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml index 3acc23d395c5d..cdc7f3ee9d49d 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_Customer eav diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml index fd82088851305..b89f6fe3600ea 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_Customer flat diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index 1c89583e6418c..ca8a9add498b0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_Customer eav diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml index 321376ce25eec..6156dd05eadcc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + John diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml index b9148ef750e66..1136a9d8219d0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml index 902e91e9e7215..1df4d47dcaa79 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + John diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php new file mode 100644 index 0000000000000..b29e28cb54b08 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php @@ -0,0 +1,111 @@ +cmsIndex = $cmsIndex; + $this->customerAccountLogin = $customerAccountLogin; + $this->customerAccountIndex = $customerAccountIndex; + $this->customerAccountEdit = $customerAccountEdit; + } + + /** + * Run Change customer password test. + * + * @param CustomerInjectable $initialCustomer + * @param CustomerInjectable $customer + * @return void + */ + public function test(CustomerInjectable $initialCustomer, CustomerInjectable $customer) + { + // Preconditions + $initialCustomer->persist(); + + // Steps + $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $initialCustomer] + )->run(); + + $this->cmsIndex->getLinksBlock()->openLink('My Account'); + $this->customerAccountIndex->getInfoBlock()->openChangePassword(); + $this->customerAccountEdit->getAccountInfoForm()->fill($customer); + $this->customerAccountEdit->getAccountInfoForm()->submit(); + } +} 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 new file mode 100644 index 0000000000000..b002dd32e3b58 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv @@ -0,0 +1,4 @@ +"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/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml index 185791d7077bc..28125eaae4169 100644 --- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 0 diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php index a8a86b9352433..51754f3be6139 100644 --- a/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php +++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Block/Currency/Switcher.php @@ -7,8 +7,8 @@ namespace Magento\Directory\Test\Block\Currency; use Magento\CurrencySymbol\Test\Fixture\CurrencySymbolEntity; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Switcher Currency Symbol. @@ -53,7 +53,6 @@ public function switchCurrency(CurrencySymbolEntity $currencySymbol) $currencyLink = $this->_rootElement ->find(sprintf($this->currencyLinkLocator, $currencyCode), Locator::SELECTOR_XPATH); $currencyLink->click(); - $this->reinitRootElement(); $this->waitForElementVisible($this->language . $currencyCode); } } diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml index 35b637616337d..cad045644dd53 100644 --- a/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php index f8bf3012cfa96..009f5e1cacd07 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php @@ -11,7 +11,7 @@ use Magento\Checkout\Test\Page\CheckoutOnepageSuccess; use Magento\Customer\Test\Fixture\CustomerInjectable; use Magento\Sales\Test\Page\OrderView; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout; /** diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php index bd74cdb32ae3b..a0c10b6fc59fb 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php @@ -11,8 +11,8 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Tax\Test\Constraint\AbstractAssertTaxRuleIsAppliedToAllPrices; -use Mtf\Fixture\FixtureFactory; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset. diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml index f492bfb376b00..20652c29b0227 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_Downloadable eav diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml index cd72a7494845f..77e82d777f9a4 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Test downloadable product %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml index d7507e89fdcc3..4b7bd19f1f397 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 0 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml index 824f410ef7466..a1d49ff04bf44 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -6,7 +6,7 @@ */ --> Magento_GiftMessage flat diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml index 7f5ad89236729..609f6d89a1077 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml index fe991095c8f65..42798cdb8a340 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + John Doe diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php index 59bdcb1102357..26105a20e15e4 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php @@ -6,7 +6,7 @@ namespace Magento\GiftMessage\Test\TestCase; -use Mtf\TestCase\Scenario; +use Magento\Mtf\TestCase\Scenario; /** * Test Flow: diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php index 5537dfb61f5b3..ada89404bb3ec 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CreateGiftMessageOnBackendTest.php @@ -6,7 +6,7 @@ namespace Magento\GiftMessage\Test\TestCase; -use Mtf\TestCase\Scenario; +use Magento\Mtf\TestCase\Scenario; /** * Test Flow: diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml index b194f297989d1..ac7a4e551e345 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.xml @@ -6,7 +6,7 @@ */ --> Magento_GoogleShopping flat diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml index a41e85f58cfad..5f01282765725 100644 --- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml +++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + United States diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml index 194212e9011ce..c06f177fb98d2 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.xml @@ -6,7 +6,7 @@ */ --> Magento_GroupedProduct eav diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml index 7469adfb2cd54..11efc48b035f3 100644 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Test grouped product %isolation% diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml index bed8edd01cf56..01af4b90b3b04 100644 --- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml +++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml @@ -6,7 +6,7 @@ */ --> Magento_ImportExport flat diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml index 26145eb47cdb0..b603c251063a3 100644 --- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml +++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml @@ -6,7 +6,7 @@ */ --> Magento_Install virtual diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml index 7fff97468bfd5..7e11f3ef96781 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.xml @@ -6,7 +6,7 @@ */ --> Magento_Integration composite diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml index 19b87ceb9cf82..daef104702cee 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + default_integration_%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php index 8519bb70812d7..9c5d0e9b3d715 100644 --- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php @@ -72,7 +72,6 @@ public function __inject(IntegrationIndex $integrationIndex, FixtureFactory $fix */ public function test(Integration $integration) { - $this->markTestIncomplete('MAGETWO-26850'); // Precondition $integration->persist(); $filter = ['name' => $integration->getName()]; diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml index c270caed525ee..ff3cc6eadac8e 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml @@ -6,7 +6,7 @@ */ --> Magento_Newsletter flat diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml index 4aa8886a786a7..99f02715c2c1c 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Newsletter Template %isolation% diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml index 721bec405886b..352dc12fc9068 100644 --- a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml index 63db12aa1d662..bea1eac843f77 100644 --- a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml index 5c54491e18fd4..39b04be4a6f88 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + website diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml index a7e6223491960..fc016eef2ae8e 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.xml @@ -6,7 +6,7 @@ */ --> Magento_Review flat diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml index 18fca86e0bdb1..67798c3a7ff2c 100755 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.xml @@ -6,7 +6,7 @@ */ --> Magento_Review composite @@ -15,8 +15,8 @@ Magento\Review\Model\Resource\Review\Collection - Magento\Review\Test\Repository\ReviewInjectable - Magento\Review\Test\Handler\ReviewInjectable\ReviewInjectableInterface + Magento\Review\Test\Repository\Review + Magento\Review\Test\Handler\Review\ReviewInterface Approved diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml index f33e6e8c44530..07ce07abaac7d 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Rating %isolation% diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml similarity index 97% rename from dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml rename to dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml index 7e6724de2aea5..f00233db0fd8b 100644 --- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/ReviewInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + Approved diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml index 6b66a6a682812..6b9a58904e297 100644 --- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + US diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml index 199162c801413..0e696d0d3f0e2 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.xml @@ -6,7 +6,7 @@ */ --> Magento_Sitemap flat diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml index ebbeff18fe061..e9d777e594dd7 100644 --- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml +++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + sitemap.xml diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml index 67f23516a8302..37e439d7bfa62 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml @@ -6,7 +6,7 @@ */ --> Magento_Store flat diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml index 58c290458f7cb..8b0c5218c9a11 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml @@ -6,7 +6,7 @@ */ --> Magento_Store flat diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml index 420e0fd7a3d48..8e42c9575a25a 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml @@ -6,7 +6,7 @@ */ --> Magento_Store flat diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml index ec1bbbea3ea26..031e011f2cb47 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml index 7a21d1b544077..13a4b53decfbe 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml index 5173bc5fb3c96..893eba588609e 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml +++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + All Websites 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 aa63949e9de9d..f039b6f00b8e3 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 @@ -6,12 +6,12 @@ namespace Magento\Tax\Test\Constraint; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Sales\Test\Page\Adminhtml\OrderView; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew; use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that prices displayed excluding tax in order are correct on backend. diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php index debc24c79bb65..fd580fd0c21bb 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php @@ -6,13 +6,13 @@ namespace Magento\Tax\Test\Constraint; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Checkout\Test\Page\CheckoutOnepage; use Magento\Checkout\Test\Page\CheckoutOnepageSuccess; use Magento\Customer\Test\Fixture\CustomerInjectable; use Magento\Sales\Test\Page\OrderView; -use Mtf\Fixture\InjectableFixture; +use Magento\Mtf\Fixture\InjectableFixture; /** * Checks that prices excluding tax on order review and customer order pages are equal to specified in dataset. diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml index 2d70ad7c1e12e..a5200183867b8 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.xml @@ -6,7 +6,7 @@ */ --> Magento_Tax flat diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml index 625d410054327..0fb44a5512497 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.xml @@ -6,7 +6,7 @@ */ --> Magento_Tax flat diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml index f9d8ccae40a8f..a8cc830c9c219 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.xml @@ -6,7 +6,7 @@ */ --> Magento_Tax flat diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml index 37b160b47c7d0..30b50ab497547 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 2 @@ -15,12 +15,42 @@ 0 - - ROW_BASE_CALCULATION - 1 + + 0 + TOTAL_BASE_CALCULATION + 0 0 - 1 + 0 0 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 0 + + + + 2 + 2 + 2 + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 1 + + + 3 3 3 @@ -28,6 +58,18 @@ 3 1 0 + 3 + 3 + 3 + 1 + + + + ROW_BASE_CALCULATION + 1 + 0 + 1 + 0 0 @@ -37,13 +79,6 @@ 1 0 1 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -53,13 +88,6 @@ 1 1 0 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -69,13 +97,6 @@ 0 0 1 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -85,13 +106,6 @@ 0 1 1 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -101,13 +115,6 @@ 1 0 1 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -117,13 +124,6 @@ 0 1 0 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -133,13 +133,6 @@ 0 0 0 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -149,13 +142,6 @@ 1 1 1 - 3 - 3 - 3 - 3 - 3 - 1 - 0 0 @@ -165,29 +151,6 @@ 1 1 0 - 3 - 3 - 3 - 3 - 3 - 1 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 0 0 @@ -197,13 +160,6 @@ 1 0 1 - 2 - 2 - 2 - 2 - 2 - 0 - 0 1 @@ -213,142 +169,7 @@ 0 0 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 1 - - - TOTAL_BASE_CALCULATION - 0 - 0 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 0 - 0 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - TOTAL_BASE_CALCULATION - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml index f158cfbc7fab6..a48e7e788ae52 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 2 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml index e842c0ead0235..1c157d3d3f3ba 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 1 diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml index b1b4e9f0aba4e..4fd226bd3fac2 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + TaxIdentifier%isolation% diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php index e90c0be6bc439..555af5a2594c6 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php @@ -6,8 +6,8 @@ namespace Magento\Tax\Test\TestStep; -use Mtf\Fixture\FixtureFactory; -use Mtf\TestStep\TestStepInterface; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\TestStep\TestStepInterface; /** * Creating tax rule diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml index 98f103ad9e01a..a62220d76a939 100644 --- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 0 diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml index 9bcbc9722e652..be287841dbfa5 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.xml @@ -6,7 +6,7 @@ */ --> Magento_UrlRewrite virtual diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml index 9e65d3460c51b..bff977c298f8b 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + test-test-test%isolation%.html diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml index bbb56ec6cfc0a..2980c7da29803 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.xml @@ -6,7 +6,7 @@ */ --> Magento_User flat diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml index 8a6cf757c923e..944496bf15d6f 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.xml @@ -6,7 +6,7 @@ */ --> Magento_User flat @@ -22,6 +22,7 @@ 123123q 123123q Active + %current_password% @@ -157,6 +158,7 @@ current_password virtual user-info + Magento\User\Test\Fixture\User\CurrentPassword diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php index 6604f250e80f0..c33e266adb0b3 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php @@ -6,8 +6,8 @@ namespace Magento\User\Test\Fixture\User; -use Mtf\ObjectManager; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\ObjectManager; +use Magento\Mtf\Fixture\FixtureInterface; use Magento\User\Test\Fixture\AdminUserRole; /** @@ -37,9 +37,9 @@ class CurrentPassword implements FixtureInterface public function __construct(array $params, $data = '') { $this->params = $params; - /** @var \Mtf\System\Config $systemConfig */ + /** @var \Magento\Mtf\System\Config $systemConfig */ if ($data == '%current_password%') { - $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config'); + $systemConfig = ObjectManager::getInstance()->create('Magento\Mtf\System\Config'); $data = $systemConfig->getConfigParam('application/backend_user_credentials/password'); } $this->data = $data; diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml index 3843d8230bdb8..d1eae7f24d3d3 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd"> RoleName%isolation% diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml index 4be62392dd494..d91db93cf7061 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml +++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + admin 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 index 178ac7b96f4ca..9cfc5494ac9b7 100644 --- 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 @@ -1,7 +1,7 @@ "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"; "123123q" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Inactive";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q" -"-";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"username";"assertUserDuplicateMessage"; "123123q" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"-";"123123q";"123123q";"Active";"Administrators";"email";"assertUserDuplicateMessage"; "123123q" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"-";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q" -"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.cim";"123123q";"123123q";"Active";"-";"-";"assertUserInvalidEmailMessage"; "123123q" +"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/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml index 369408dfd5358..cd4a0e0499d19 100644 --- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + 0 diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php index e47ee138df0f6..fc5f6a9b8d853 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart.php @@ -7,8 +7,8 @@ namespace Magento\Weee\Test\Block; use Magento\Weee\Test\Block\Cart\CartItem; -use Mtf\Client\Element\Locator; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Client\Locator; +use Magento\Mtf\Fixture\FixtureInterface; /** * Shopping cart block diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php index 8cc1a8eb49bee..0fc733bb291d1 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem.php @@ -6,7 +6,7 @@ namespace Magento\Weee\Test\Block\Cart; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Client\Locator; /** * Product item fpt block on cart page diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php index 7be616dc6452d..da370aa92d9d0 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/CartItem/Fpt.php @@ -6,8 +6,8 @@ namespace Magento\Weee\Test\Block\Cart\CartItem; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Product item fpt block on cart page diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php index c856ff8f2bba4..b91c0eb4b826d 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php @@ -6,7 +6,7 @@ namespace Magento\Weee\Test\Block\Cart; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Client\Locator; /** * Cart totals fpt block diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php index e35524be5c57b..f2b679fd9e2d1 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals/Fpt.php @@ -6,8 +6,8 @@ namespace Magento\Weee\Test\Block\Cart\Totals; -use Mtf\Block\Block; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Block\Block; +use Magento\Mtf\Client\Locator; /** * Cart totals fpt block diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php index 4a32c14868d53..bba6bbcdf6474 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/ListProduct.php @@ -6,7 +6,7 @@ namespace Magento\Weee\Test\Block\Product; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Client\Locator; /** * Product list diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php index 121653a4285cb..1fd1a7814e335 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/View.php @@ -6,7 +6,7 @@ namespace Magento\Weee\Test\Block\Product; -use Mtf\Client\Element\Locator; +use Magento\Mtf\Client\Element\Locator; /** * Product view block on the product page diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php index 8e1c7a622602d..579f0972482d3 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php @@ -11,7 +11,7 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Cms\Test\Page\CmsIndex; -use Mtf\Constraint\AbstractConstraint; +use Magento\Mtf\Constraint\AbstractConstraint; /** * Checks that prices with fpt on category, product and cart pages are equal to specified in dataset. diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml index 0edb9a2ae1422..8472f3bbe08f4 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml @@ -5,98 +5,8 @@ * See COPYING.txt for license details. */ --> - + - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - 0 1 @@ -106,25 +16,13 @@ 0 - - 0 - 1 - 1 - 1 - 0 - 0 - - - - 0 - 1 - 1 - 1 - 0 - 0 - - - + + TOTAL_BASE_CALCULATION + 0 + 0 + 1 + 0 + 0 1 2 2 @@ -133,25 +31,43 @@ 1 - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 1 + 0 1 - 2 - 2 - 2 + 1 + 1 + 1 1 1 - + + TOTAL_BASE_CALCULATION + 1 + 1 + 1 + 0 + 0 1 - 1 - 1 - 1 + 2 + 2 + 2 1 1 - + + TOTAL_BASE_CALCULATION + 1 + 1 + 0 + 1 + 0 1 1 1 @@ -160,7 +76,13 @@ 1 - + + TOTAL_BASE_CALCULATION + 0 + 0 + 1 + 0 + 0 1 2 2 @@ -169,7 +91,13 @@ 1 - + + TOTAL_BASE_CALCULATION + 0 + 0 + 0 + 1 + 0 1 2 2 @@ -178,7 +106,13 @@ 1 - + + TOTAL_BASE_CALCULATION + 1 + 1 + 1 + 0 + 0 1 2 2 @@ -187,7 +121,13 @@ 1 - + + TOTAL_BASE_CALCULATION + 1 + 1 + 0 + 1 + 0 1 1 1 diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php index 098a43b691d8c..7a23a2d49ca3d 100644 --- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php +++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php @@ -9,9 +9,9 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet; use Magento\Catalog\Test\Fixture\CatalogProductSimple; use Magento\Customer\Test\Fixture\CustomerInjectable; -use Mtf\Fixture\FixtureFactory; -use Mtf\ObjectManager; -use Mtf\TestCase\Injectable; +use Magento\Mtf\Fixture\FixtureFactory; +use Magento\Mtf\ObjectManager; +use Magento\Mtf\TestCase\Injectable; /** * Test CreateTaxWithFptTest. 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 index 10b94c40e8061..f24d1f7af97e0 100644 --- 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 @@ -1,12 +1,12 @@ "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_disp_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_disp_incl";"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_disp_incl";"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_disp_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_disp_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_disp_incl";"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_disp_incl";"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_disp_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_disp_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_disp_incl";"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_disp_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" +"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/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php index 5c528bfccaf3a..4446df6cc863d 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php @@ -9,7 +9,7 @@ use Magento\Checkout\Test\Constraint\AssertAddedProductToCartSuccessMessage; use Magento\Checkout\Test\Page\CheckoutCart; use Magento\Customer\Test\Fixture\CustomerInjectable; -use Mtf\Fixture\FixtureInterface; +use Magento\Mtf\Fixture\FixtureInterface; /** * Test Flow: diff --git a/dev/tests/functional/utils/generate.php b/dev/tests/functional/utils/generate.php index 5855e2d708d41..f3b422ba46b6b 100644 --- a/dev/tests/functional/utils/generate.php +++ b/dev/tests/functional/utils/generate.php @@ -5,10 +5,21 @@ */ require_once dirname(__FILE__) . '/' . 'bootstrap.php'; +// Generate page $objectManager->create('Magento\Mtf\Util\Generate\Page')->launch(); -$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch(); -$objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); -$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch(); -$objectManager->create('Magento\Mtf\Util\Generate\Factory')->launch(); + +// Generate fixtures +$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER); +$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER); +$fieldsProvider = $magentoObjectManager->create('\Magento\Mtf\Util\Generate\Fixture\FieldsProvider'); +$objectManager->create('Magento\Mtf\Util\Generate\Fixture', ['fieldsProvider' => $fieldsProvider])->launch(); + +// Generate repositories +$magentoObjectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); +$collectionProvider = $magentoObjectManager->create('\Magento\Mtf\Util\Generate\Repository\CollectionProvider'); +$objectManager->create('Magento\Mtf\Util\Generate\Repository', ['collectionProvider' => $collectionProvider])->launch(); + +// Generate factories for old end-to-end tests +$magentoObjectManager->create('Magento\Mtf\Util\Generate\Factory')->launch(); \Magento\Mtf\Util\Generate\GenerateResult::displayResults(); diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php index f41fe8372f610..5cbb2fdb36f86 100644 --- a/dev/tests/functional/utils/generate/factory.php +++ b/dev/tests/functional/utils/generate/factory.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ - require_once dirname(__DIR__) . '/' . 'bootstrap.php'; + $objectManager->create('Magento\Mtf\Util\Generate\Factory')->launch(); \Magento\Mtf\Util\Generate\GenerateResult::displayResults(); diff --git a/dev/tests/functional/utils/generate/fixture.php b/dev/tests/functional/utils/generate/fixture.php index d2e13c07ba655..982286f75f194 100644 --- a/dev/tests/functional/utils/generate/fixture.php +++ b/dev/tests/functional/utils/generate/fixture.php @@ -5,5 +5,7 @@ */ require_once dirname(__DIR__) . '/' . 'bootstrap.php'; -$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch(); -\Magento\Mtf\Util\Generate\GenerateResult::displayResults(); +$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER); +$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER); +$fieldsProvider = $magentoObjectManager->create('\Magento\Mtf\Util\Generate\Fixture\FieldsProvider'); +$objectManager->create('Magento\Mtf\Util\Generate\Fixture', ['fieldsProvider' => $fieldsProvider])->launch(); diff --git a/dev/tests/functional/utils/generate/page.php b/dev/tests/functional/utils/generate/page.php index f15e030c24c43..5b9370185b767 100644 --- a/dev/tests/functional/utils/generate/page.php +++ b/dev/tests/functional/utils/generate/page.php @@ -4,5 +4,6 @@ * See COPYING.txt for license details. */ require_once dirname(__DIR__) . '/' . 'bootstrap.php'; + $objectManager->create('Magento\Mtf\Util\Generate\Page')->launch(); \Magento\Mtf\Util\Generate\GenerateResult::displayResults(); diff --git a/dev/tests/functional/utils/generate/repository.php b/dev/tests/functional/utils/generate/repository.php index 5355cf45e7596..fc204e011c5d6 100644 --- a/dev/tests/functional/utils/generate/repository.php +++ b/dev/tests/functional/utils/generate/repository.php @@ -5,6 +5,6 @@ */ require_once dirname(__DIR__) . '/' . 'bootstrap.php'; -$objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); -$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch(); -\Magento\Mtf\Util\Generate\GenerateResult::displayResults(); +$magentoObjectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); +$collectionProvider = $magentoObjectManager->create('\Magento\Mtf\Util\Generate\Repository\CollectionProvider'); +$objectManager->create('Magento\Mtf\Util\Generate\Repository', ['collectionProvider' => $collectionProvider])->launch(); diff --git a/lib/internal/Magento/Framework/Test/Utility/Classes.php b/lib/internal/Magento/Framework/Test/Utility/Classes.php index 4382510e7a143..f92b0ff43a2ca 100644 --- a/lib/internal/Magento/Framework/Test/Utility/Classes.php +++ b/lib/internal/Magento/Framework/Test/Utility/Classes.php @@ -273,7 +273,7 @@ public static function resolveVirtualType($className) public static function isAutogenerated($className) { if (preg_match('/.*\\\\[a-zA-Z0-9]{1,}(Factory|Proxy|SearchResults|DataBuilder)$/', $className) - || preg_match('/^Magento\\\\[\w]+\\\\Test\\\\(?:Page|Fixture)\\\\/', $className) + || preg_match('/^Magento\\\\[\w]+\\\\(Test\\\\(Page|Fixture))\\\\/', $className) ) { return true; } From 467312f75aa5c369d12e32518482f9ba00640a97 Mon Sep 17 00:00:00 2001 From: Oleksandr Manchenko Date: Fri, 23 Jan 2015 14:45:27 +0200 Subject: [PATCH 22/29] MTA-1397: Update setValue() method for basic typified elements - Fixed logical and code style errors --- .../Block/Adminhtml/Edit/CustomerForm.php | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php index e2fa4a7994adf..106d0f9c481dc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php @@ -21,7 +21,7 @@ class CustomerForm extends FormTabs * * @var string */ - protected $loader = '[data-role="spinner"]'; + protected $spinner = '[data-role="spinner"]'; /** * Customer form to load. @@ -31,32 +31,34 @@ class CustomerForm extends FormTabs protected $activeFormTab = '.entry-edit.form-inline [data-bind="visible: active"]:not([style="display: none;"])'; /** - * Field label on customer form. + * Field wrapper with label on form. * * @var string */ - protected $fieldLabel = './/*[contains(@class, "form__field")]/*[contains(@class,"label")]'; + protected $fieldLabel = './/*[contains(@class, "form__field")]/*[contains(@class,"label")]'; /** - * Field with absent label on customer form. + * Field wrapper with absent label on form. * * @var string */ - protected $fieldLabelAbsent = './/*[contains(@class, "form__field") and not(./*[contains(@class,"label")]/*)]'; + protected $fieldLabelAbsent = './/*[contains(@class, "form__field") and not(./*[contains(@class,"label")]/*)]'; /** - * Wrapper for field on customer form. + * Field wrapper with control block on form. * * @var string */ protected $fieldWrapperControl = './/*[contains(@class, "form__field")]/*[contains(@class,"control")]'; + // @codingStandardsIgnoreStart /** - * Wrapper with absent field on customer form. + * Field wrapper with absent control block on form. * * @var string */ protected $fieldWrapperControlAbsent = './/*[contains(@class, "form__field") and not(./input or ./*[contains(@class,"control")]/*)]'; + // @codingStandardsIgnoreEnd /** * Fill Customer forms on tabs by customer, addresses data. @@ -67,8 +69,10 @@ class CustomerForm extends FormTabs */ public function fillCustomer(FixtureInterface $customer, $address = null) { - $isHasData = ($customer instanceof InjectableFixture) ? $customer->hasData() : true; $this->waitForm(); + $this->waitFields(); + + $isHasData = ($customer instanceof InjectableFixture) ? $customer->hasData() : true; if ($isHasData) { parent::fill($customer); } @@ -89,8 +93,9 @@ public function fillCustomer(FixtureInterface $customer, $address = null) */ public function updateCustomer(FixtureInterface $customer, $address = null) { - $isHasData = ($customer instanceof InjectableFixture) ? $customer->hasData() : true; $this->waitForm(); + + $isHasData = ($customer instanceof InjectableFixture) ? $customer->hasData() : true; if ($isHasData) { parent::fill($customer); } @@ -130,14 +135,25 @@ public function getDataCustomer(FixtureInterface $customer, $address = null) */ protected function waitForm() { - $this->waitForElementNotVisible($this->loader); + $this->waitForElementNotVisible($this->spinner); $this->waitForElementVisible($this->activeFormTab); + } + /** + * Wait for User before fill form which calls JS validation on correspondent fields of form. + * See details in MAGETWO-31435. + * + * @return void + */ + protected function waitFields() + { + /* Wait for field label is visible in the form */ $this->waitForElementVisible($this->fieldLabel, Locator::SELECTOR_XPATH); + /* Wait for render all field's labels(assert that absent field without label) in the form */ $this->waitForElementNotVisible($this->fieldLabelAbsent, Locator::SELECTOR_XPATH); + /* Wait for field's control block is visible in the form */ $this->waitForElementVisible($this->fieldWrapperControl, Locator::SELECTOR_XPATH); + /* Wait for render all field's control blocks(assert that absent field without control block) in the form */ $this->waitForElementNotVisible($this->fieldWrapperControlAbsent, Locator::SELECTOR_XPATH); - - usleep(500000); } } From aba60ed292a1241240e228281e7acb748ff7e66a Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Fri, 23 Jan 2015 17:52:38 +0200 Subject: [PATCH 23/29] MTA-1316: Apply fixture changes to Magento --- dev/tests/functional/phpunit.xml.dist | 2 +- .../app/Magento/User/Test/Fixture/User/CurrentPassword.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist index 735ae2787c1a6..e35a918f69d4d 100755 --- a/dev/tests/functional/phpunit.xml.dist +++ b/dev/tests/functional/phpunit.xml.dist @@ -38,7 +38,7 @@ - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php index c33e266adb0b3..0774280ab8ad6 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/CurrentPassword.php @@ -8,7 +8,6 @@ use Magento\Mtf\ObjectManager; use Magento\Mtf\Fixture\FixtureInterface; -use Magento\User\Test\Fixture\AdminUserRole; /** * Current password source. From 8c2c2631e7ddbfab9a8897e8682dff1badde3b4a Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Mon, 26 Jan 2015 16:37:30 +0200 Subject: [PATCH 24/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 --- .../AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php | 2 ++ lib/internal/Magento/Framework/Test/Utility/Classes.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php index a0c10b6fc59fb..eeb8d10cb5f83 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php @@ -38,6 +38,8 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends Abs * @param CheckoutCart $checkoutCart * @param FixtureFactory $fixtureFactory * @return void + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function processAssert( InjectableFixture $product, diff --git a/lib/internal/Magento/Framework/Test/Utility/Classes.php b/lib/internal/Magento/Framework/Test/Utility/Classes.php index f92b0ff43a2ca..c8c4e2b3f5065 100644 --- a/lib/internal/Magento/Framework/Test/Utility/Classes.php +++ b/lib/internal/Magento/Framework/Test/Utility/Classes.php @@ -273,7 +273,7 @@ public static function resolveVirtualType($className) public static function isAutogenerated($className) { if (preg_match('/.*\\\\[a-zA-Z0-9]{1,}(Factory|Proxy|SearchResults|DataBuilder)$/', $className) - || preg_match('/^Magento\\\\[\w]+\\\\(Test\\\\(Page|Fixture))\\\\/', $className) + || preg_match('/Magento\\\\[\w]+\\\\(Test\\\\(Page|Fixture))\\\\/', $className) ) { return true; } From cec6e92586e1ffaaa333b455a53bfe324ae65b5f Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 27 Jan 2015 09:55:14 +0200 Subject: [PATCH 25/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 --- dev/tests/functional/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 0cd1467c6a917..7b5d70371961b 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,6 +1,6 @@ { "require": { - "magento/mtf": "1.0.0-rc14", + "magento/mtf": "1.0.0-rc15", "php": ">=5.4.0", "phpunit/phpunit": "4.1.0", "phpunit/phpunit-selenium": ">=1.2", From 3e9f3b156d097a764aadf6987e9322cdd3b3a112 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 27 Jan 2015 12:59:56 +0200 Subject: [PATCH 26/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 - moved test to corresponded repository --- .../Catalog/Test/Block/Product/View.php | 3 +- .../MultishippingAgreementReview.php | 16 ++++ ...mRequireMessageOnMultishippingCheckout.php | 90 +++++++++++++++++++ .../Page/MultishippingCheckoutOverview.xml | 16 ++++ .../TestCase/CreateTermEntityTest/test.csv | 11 +-- .../TestStep/CheckTermOnMultishippingStep.php | 52 +++++++++++ .../Test/TestStep/CreateTermEntityStep.php | 41 +++++++++ .../Test/etc/constraint.xml | 3 + .../Test/Repository/CustomerInjectable.xml | 14 +++ .../Test/Block/Checkout/Addresses.php | 65 ++++++++++++++ .../Test/Block/Checkout/Billing.php | 48 ++++++++++ .../Test/Block/Checkout/Link.php | 25 ++++++ .../Test/Block/Checkout/Overview.php | 38 ++++++++ .../Test/Block/Checkout/Shipping.php | 60 +++++++++++++ .../Test/Block/Checkout/Success.php | 68 ++++++++++++++ .../AssertOrderSuccessPlacedMessage.php | 49 ++++++++++ .../Multishipping/Test/Page/CheckoutCart.xml | 16 ++++ ...ultishippingCheckoutAddressNewShipping.php | 51 +++++++++++ .../Page/MultishippingCheckoutAddresses.xml | 16 ++++ .../Page/MultishippingCheckoutBilling.xml | 16 ++++ .../Test/Page/MultishippingCheckoutCart.php | 42 +++++++++ .../Test/Page/MultishippingCheckoutLogin.php | 49 ++++++++++ .../Page/MultishippingCheckoutOverview.xml | 16 ++++ .../Page/MultishippingCheckoutRegister.php | 51 +++++++++++ .../Page/MultishippingCheckoutShipping.xml | 16 ++++ .../Page/MultishippingCheckoutSuccess.xml | 21 +++++ .../TestStep/FillCustomerAddressesStep.php | 85 ++++++++++++++++++ .../TestStep/FillShippingInformationStep.php | 66 ++++++++++++++ .../Test/TestStep/PlaceOrderStep.php | 41 +++++++++ .../ProceedToMultipleAddressCheckoutStep.php | 40 +++++++++ .../Test/TestStep/SelectPaymentMethodStep.php | 49 ++++++++++ .../Multishipping/Test/etc/constraint.xml | 12 +++ 32 files changed, 1179 insertions(+), 7 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Multishipping/MultishippingAgreementReview.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermRequireMessageOnMultishippingCheckout.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CheckTermOnMultishippingStep.php create mode 100644 dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CreateTermEntityStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertOrderSuccessPlacedMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddressNewShipping.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutCart.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutLogin.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutRegister.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillCustomerAddressesStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/PlaceOrderStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/ProceedToMultipleAddressCheckoutStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/SelectPaymentMethodStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php index b658bb823cdfd..d2c48765f52aa 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php @@ -204,8 +204,7 @@ public function setQtyAndClickAddToCart($qty) */ public function setQty($qty) { - $this->browser->selectWindow(); - $this->_rootElement->find($this->qty)->keys([$qty]); + $this->_rootElement->find($this->qty)->setValue($qty); $this->_rootElement->click(); } diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Multishipping/MultishippingAgreementReview.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Multishipping/MultishippingAgreementReview.php new file mode 100644 index 0000000000000..cbc6a610b231a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Multishipping/MultishippingAgreementReview.php @@ -0,0 +1,16 @@ + ['dataSet' => 'johndoe_with_multiple_addresses']]; + $customer = $stepFactory->create('\Magento\Customer\Test\TestStep\CreateCustomerStep', $customer)->run(); + $product = $stepFactory->create('\Magento\Catalog\Test\TestStep\CreateProductsStep', ['products' => $product]) + ->run(); + $stepFactory->create('\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', $customer)->run(); + $stepFactory->create('\Magento\Checkout\Test\TestStep\AddProductsToTheCartStep', $product)->run(); + $stepFactory->create('\Magento\Multishipping\Test\TestStep\ProceedToMultipleAddressCheckoutStep')->run(); + $stepFactory->create( + '\Magento\Multishipping\Test\TestStep\FillCustomerAddressesStep', + array_merge($product, $customer) + )->run(); + $stepFactory->create( + '\Magento\Multishipping\Test\TestStep\FillShippingInformationStep', + array_merge(['shippingMethod' => $shipping], $customer) + )->run(); + $stepFactory->create( + '\Magento\Multishipping\Test\TestStep\SelectPaymentMethodStep', + ['payment' => $payment] + )->run(); + $stepFactory->create( + '\Magento\CheckoutAgreements\Test\TestStep\CheckTermOnMultishippingStep', + ['agreementValue' => 'No'] + )->run(); + $stepFactory->create('\Magento\Multishipping\Test\TestStep\PlaceOrderStep')->run(); + \PHPUnit_Framework_Assert::assertEquals( + self::NOTIFICATION_MESSAGE, + $page->getAgreementReview()->getNotificationMassage(), + 'Notification required message of Terms and Conditions is absent.' + ); + $stepFactory->create( + '\Magento\CheckoutAgreements\Test\TestStep\CheckTermOnMultishippingStep', + ['agreementValue' => 'Yes'] + )->run(); + $stepFactory->create('\Magento\Multishipping\Test\TestStep\PlaceOrderStep')->run(); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Validation error message for terms and conditions checkbox is present on multishipping checkout.'; + } +} 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 new file mode 100644 index 0000000000000..cb0aaa575c9b0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml @@ -0,0 +1,16 @@ + + + + + + \Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview + #checkout-agreements + css selector + + + 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 index 45ac149ca4243..5bbef09db6773 100644 --- 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 @@ -1,5 +1,6 @@ -"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" -"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout" -"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout" +"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/TestStep/CheckTermOnMultishippingStep.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CheckTermOnMultishippingStep.php new file mode 100644 index 0000000000000..ababbf1f3594c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CheckTermOnMultishippingStep.php @@ -0,0 +1,52 @@ +multishippingCheckoutOverview = $multishippingCheckoutOverview; + $this->agreementValue = $agreementValue; + } + + /** + * Process Terms and Conditions checkbox on multiple addresses checkout overview step. + * + * @return void + */ + public function run() + { + $this->multishippingCheckoutOverview->getAgreementReview()->setAgreement($this->agreementValue); + } +} diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CreateTermEntityStep.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CreateTermEntityStep.php new file mode 100644 index 0000000000000..cb852a58079f9 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/CreateTermEntityStep.php @@ -0,0 +1,41 @@ +agreement = $agreement; + } + + /** + * Create checkout agreement. + * + * @return array + */ + public function run() + { + $this->agreement->persist(); + return ['agreement' => $this->agreement]; + } +} 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 0b97d3e052a01..b46e597fdccf3 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 @@ -24,4 +24,7 @@ low + + high + diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml index 1df4d47dcaa79..5df2e83a4d1bb 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.xml @@ -119,5 +119,19 @@ US_address_TX + + + John + Doe%isolation% + + General + + JohnDoe_%isolation%@example.com + 123123q + 123123q + + US_address_NY, US_address + + diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php new file mode 100644 index 0000000000000..7b78245100391 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php @@ -0,0 +1,65 @@ +_rootElement->find($this->newAddress, Locator::SELECTOR_CSS)->click(); + } + + /** + * Select shipping addresses for products. + * + * @param array $bindings + */ + public function selectAddresses($bindings) + { + foreach ($bindings as $key => $value) { + $this->_rootElement->find( + '//tr[//a[text()="' . $key . '"]]/following-sibling::*//select', + Locator::SELECTOR_XPATH, + 'select' + )->setValue($value); + } + $this->clickContinueButton(); + } + + /** + * Click "Continue to Billing Information" button. + * + * @return void + */ + public function clickContinueButton() + { + $this->_rootElement->find($this->continue)->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php new file mode 100644 index 0000000000000..c275689c5ff76 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php @@ -0,0 +1,48 @@ +_rootElement->find('#p_method_' . $payment['method'], Locator::SELECTOR_CSS)->click(); + if (isset($payment['dataConfig']['payment_form_class'])) { + $paymentFormClass = $payment['dataConfig']['payment_form_class']; + /** @var $formBlock \Mtf\Block\Form */ + $formBlock = $this->blockFactory->create( + $paymentFormClass, + ['element' => $this->_rootElement->find('#payment_form_' . $payment['method'], Locator::SELECTOR_CSS)] + ); + $formBlock->fill($payment['credit_card']); + } + + $this->_rootElement->find($this->continue, Locator::SELECTOR_CSS)->click(); + $this->waitForElementNotVisible('.please-wait'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php new file mode 100644 index 0000000000000..011222f64eef7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php @@ -0,0 +1,25 @@ +_rootElement->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php new file mode 100644 index 0000000000000..8627f0ba34014 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php @@ -0,0 +1,38 @@ +_rootElement->find($this->placeOrder, Locator::SELECTOR_CSS)->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php new file mode 100644 index 0000000000000..f18e91c195596 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php @@ -0,0 +1,60 @@ +getData('fields'); + $shippingService = $method['shipping_service']; + $shippingMethod = $method['shipping_method']; + } else { + $shippingService = $shipping['shipping_service']; + $shippingMethod = $shipping['shipping_method']; + } + $selector = '//div[' . $count++ . '][contains(@class,"block-shipping")]//dt[text()="' + . $shippingService . '"]/following-sibling::*//*[contains(text(), "' + . $shippingMethod . '")]'; + $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click(); + } + $this->clickContinueButton(); + } + + /** + * Click continue button. + * + * @return void + */ + public function clickContinueButton() + { + $this->_rootElement->find($this->continueButton)->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php new file mode 100644 index 0000000000000..ba3b62d990bd2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php @@ -0,0 +1,68 @@ +_rootElement->find($this->continue, Locator::SELECTOR_CSS)->click(); + $this->waitForElementNotVisible('.please-wait'); + } + + /** + * Get ids for placed order + * + * @param GuestPaypalDirect $fixture + * @return array + */ + public function getOrderIds(GuestPaypalDirect $fixture) + { + $continueShopping = $this->_rootElement->find($this->continueShopping); + $this->_rootElement->waitUntil( + function () use ($continueShopping) { + return $continueShopping->isVisible() ? true : null; + } + ); + $orderIds = []; + $ordersNumber = count($fixture->getShippingMethods()); + for ($i = 1; $i <= $ordersNumber; $i++) { + $orderIds[] = $this->_rootElement->find( + '//a[' . $i . '][contains(@href, "view/order_id")]', + Locator::SELECTOR_XPATH + )->getText(); + } + + return $orderIds; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertOrderSuccessPlacedMessage.php new file mode 100644 index 0000000000000..712b95a577553 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertOrderSuccessPlacedMessage.php @@ -0,0 +1,49 @@ +getTitleBlock()->getTitle(), + 'Wrong success message is displayed.' + ); + } + + /** + * Returns string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return 'Success message on multiple address checkout page is correct.'; + } +} 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 new file mode 100644 index 0000000000000..82f6b8bace1ac --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/CheckoutCart.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Link + .action.multicheckout + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddressNewShipping.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddressNewShipping.php new file mode 100644 index 0000000000000..37d0cda809996 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddressNewShipping.php @@ -0,0 +1,51 @@ +_url = $_ENV['app_frontend_url'] . self::MCA; + } + + /** + * Get form for edit customer address + * + * @return \Magento\Customer\Test\Block\Address\Edit + */ + public function getEditBlock() + { + return Factory::getBlockFactory()->getMagentoCustomerAddressEdit( + $this->_browser->find($this->editBlock, Locator::SELECTOR_CSS) + ); + } +} 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 new file mode 100644 index 0000000000000..8ca2bd9f3e462 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutAddresses.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Addresses + #checkout_multishipping_form + css selector + + + 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 new file mode 100644 index 0000000000000..03ab6314da4bb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutBilling.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Billing + #multishipping-billing-form + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutCart.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutCart.php new file mode 100644 index 0000000000000..acbd1375dbbbb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutCart.php @@ -0,0 +1,42 @@ +getMagentoMultishippingCheckoutLink( + $this->_browser->find($this->multishippingLinkBlock, Locator::SELECTOR_CSS) + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutLogin.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutLogin.php new file mode 100644 index 0000000000000..cb233ab410587 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutLogin.php @@ -0,0 +1,49 @@ +_url = $_ENV['app_frontend_url'] . self::MCA; + } + + /** + * Get form for customer login + * + * @return \Magento\Customer\Test\Block\Form\Login + */ + public function getLoginBlock() + { + return Factory::getBlockFactory()->getMagentoCustomerFormLogin( + $this->_browser->find($this->loginBlock, Locator::SELECTOR_CSS) + ); + } +} 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 new file mode 100644 index 0000000000000..d4ad887f72f9b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutOverview.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Overview + #review-order-form + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutRegister.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutRegister.php new file mode 100644 index 0000000000000..4b858c8514a5f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutRegister.php @@ -0,0 +1,51 @@ +_url = $_ENV['app_frontend_url'] . self::MCA; + } + + /** + * Get customer register block form + * + * @return \Magento\Customer\Test\Block\Form\Register + */ + public function getRegisterBlock() + { + return Factory::getBlockFactory()->getMagentoCustomerFormRegister( + $this->_browser->find($this->registerBlock, Locator::SELECTOR_CSS) + ); + } +} 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 new file mode 100644 index 0000000000000..c950eac943f78 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutShipping.xml @@ -0,0 +1,16 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Shipping + #shipping_method_form + css selector + + + 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 new file mode 100644 index 0000000000000..0c4b39849c385 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml @@ -0,0 +1,21 @@ + + + + + + Magento\Multishipping\Test\Block\Checkout\Success + .multicheckout.success + css selector + + + Magento\Theme\Test\Block\Html\Title + .title + css selector + + + diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillCustomerAddressesStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillCustomerAddressesStep.php new file mode 100644 index 0000000000000..b88b563b4c098 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillCustomerAddressesStep.php @@ -0,0 +1,85 @@ +addresses = $addresses; + $this->customer = $customer; + $this->products = $products; + $this->objectManeger = $objectManager; + $this->objectManeger->configure( + ['\Magento\Customer\Test\Block\Address\Renderer' => ['shared' => false]] + ); + } + + /** + * Fill customer addresses and proceed to next step. + * + * @return void + */ + public function run() + { + $bindings = []; + foreach ($this->products as $key => $product) { + $productName = $product->getName(); + $addressRender = $this->objectManeger->create( + '\Magento\Customer\Test\Block\Address\Renderer', + ['address' => $this->customer->getAddress()[$key], 'type' => 'oneline'] + ); + $bindings[$productName] = $addressRender->render(); + } + $this->addresses->getAddressesBlock()->selectAddresses($bindings); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php new file mode 100644 index 0000000000000..311dbaaa8e422 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php @@ -0,0 +1,66 @@ +shippingInformation = $shippingInformation; + $this->shippingMethod = $shippingMethod; + $this->customer = $customer; + } + + /** + * Fill shipping information for each address and proceed to next step. + * + * @return void + */ + public function run() + { + $shippingMethods = []; + for ($i = 0; $i < count($this->customer->getAddress()); $i++) { + $shippingMethods[] = $this->shippingMethod; + } + $this->shippingInformation->getShippingBlock()->selectShippingMethod($shippingMethods); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/PlaceOrderStep.php new file mode 100644 index 0000000000000..a4f72f980c332 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/PlaceOrderStep.php @@ -0,0 +1,41 @@ +multishippingCheckoutOverview = $multishippingCheckoutOverview; + } + + /** + * Place order with multiple addresses checkout. + * + * @return void + */ + public function run() + { + $this->multishippingCheckoutOverview->getOverviewBlock()->placeOrder(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/ProceedToMultipleAddressCheckoutStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/ProceedToMultipleAddressCheckoutStep.php new file mode 100644 index 0000000000000..23b69f7123443 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/ProceedToMultipleAddressCheckoutStep.php @@ -0,0 +1,40 @@ +checkoutCart = $checkoutCart; + } + + /** + * Start checkout with multiple addresses. + * + * @return void + */ + public function run() + { + $this->checkoutCart->getMultipleAddressCheckoutBlock()->multipleAddressesCheckout(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/SelectPaymentMethodStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/SelectPaymentMethodStep.php new file mode 100644 index 0000000000000..28345b7057069 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/SelectPaymentMethodStep.php @@ -0,0 +1,49 @@ +billingInformation = $billingInformation; + $this->payment = $payment; + } + + /** + * Select payment method. + * + * @return void + */ + public function run() + { + $this->billingInformation->getBillingBlock()->selectPaymentMethod($this->payment); + } +} 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 new file mode 100644 index 0000000000000..8b6fe6fadc257 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/etc/constraint.xml @@ -0,0 +1,12 @@ + + + + + high + + From f4e6ee230363d708a5bbff745cad128163b4ff94 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 27 Jan 2015 14:12:28 +0200 Subject: [PATCH 27/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 - updated PHPDocs --- .../Multishipping/Test/Block/Checkout/Addresses.php | 3 +++ .../Multishipping/Test/Block/Checkout/Billing.php | 4 +--- .../Multishipping/Test/Block/Checkout/Link.php | 4 ++-- .../Multishipping/Test/Block/Checkout/Overview.php | 12 +++--------- .../Multishipping/Test/Block/Checkout/Success.php | 10 ++++------ 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php index 7b78245100391..0f19a6214f0a9 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php @@ -30,6 +30,8 @@ class Addresses extends Block /** * Add new customer address. + * + * @return void */ public function addNewAddress() { @@ -40,6 +42,7 @@ public function addNewAddress() * Select shipping addresses for products. * * @param array $bindings + * @return void */ public function selectAddresses($bindings) { diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php index c275689c5ff76..61a46218b952b 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Billing.php @@ -10,9 +10,7 @@ use Magento\Mtf\Client\Locator; /** - * Class Shipping * Multishipping billing information - * */ class Billing extends Form { @@ -34,7 +32,7 @@ public function selectPaymentMethod(array $payment) $this->_rootElement->find('#p_method_' . $payment['method'], Locator::SELECTOR_CSS)->click(); if (isset($payment['dataConfig']['payment_form_class'])) { $paymentFormClass = $payment['dataConfig']['payment_form_class']; - /** @var $formBlock \Mtf\Block\Form */ + /** @var $formBlock \Magento\Mtf\Block\Form */ $formBlock = $this->blockFactory->create( $paymentFormClass, ['element' => $this->_rootElement->find('#payment_form_' . $payment['method'], Locator::SELECTOR_CSS)] diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php index 011222f64eef7..2ac3f70e6b0f6 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Link.php @@ -9,14 +9,14 @@ use Magento\Mtf\Block\Block; /** - * Class Link * Multishipping cart link - * */ class Link extends Block { /** * Press 'Proceed to Checkout' link + * + * @return void */ public function multipleAddressesCheckout() { diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php index 8627f0ba34014..73a38881c9583 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Overview.php @@ -6,14 +6,10 @@ namespace Magento\Multishipping\Test\Block\Checkout; -use Magento\Multishipping\Test\Fixture\GuestPaypalDirect; use Magento\Mtf\Block\Block; -use Magento\Mtf\Client\Locator; /** - * Class Overview * Multishipping checkout overview information - * */ class Overview extends Block { @@ -27,12 +23,10 @@ class Overview extends Block /** * Place order * - * @param GuestPaypalDirect $fixture - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @return void */ - public function placeOrder(GuestPaypalDirect $fixture = null) + public function placeOrder() { - $this->_rootElement->find($this->placeOrder, Locator::SELECTOR_CSS)->click(); + $this->_rootElement->find($this->placeOrder)->click(); } } diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php index ba3b62d990bd2..f69b2f41617b3 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Success.php @@ -6,14 +6,11 @@ namespace Magento\Multishipping\Test\Block\Checkout; -use Magento\Multishipping\Test\Fixture\GuestPaypalDirect; use Magento\Mtf\Block\Block; use Magento\Mtf\Client\Locator; /** - * Class Success * Multishipping checkout success block - * */ class Success extends Block { @@ -33,6 +30,8 @@ class Success extends Block /** * Fill shipping address + * + * @return void */ public function continueShopping() { @@ -43,10 +42,10 @@ public function continueShopping() /** * Get ids for placed order * - * @param GuestPaypalDirect $fixture + * @param int $ordersNumber * @return array */ - public function getOrderIds(GuestPaypalDirect $fixture) + public function getOrderIds($ordersNumber) { $continueShopping = $this->_rootElement->find($this->continueShopping); $this->_rootElement->waitUntil( @@ -55,7 +54,6 @@ function () use ($continueShopping) { } ); $orderIds = []; - $ordersNumber = count($fixture->getShippingMethods()); for ($i = 1; $i <= $ordersNumber; $i++) { $orderIds[] = $this->_rootElement->find( '//a[' . $i . '][contains(@href, "view/order_id")]', From a9142862a1f92b54ed7de5d8a4b3bd00c2166203 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Wed, 28 Jan 2015 09:57:27 +0200 Subject: [PATCH 28/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 --- .../Catalog/Test/Constraint/AssertCategoryForm.php | 2 +- .../tests/app/Magento/Catalog/Test/Fixture/Category.xml | 6 ++++-- .../TestCase/Category/UpdateCategoryEntityTest/test.csv | 8 ++++---- .../Customer/Test/TestCase/BackendCustomerCreateTest.php | 1 + .../Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php index 06d7ce4fe0af9..2f17bd3a740a1 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php @@ -48,7 +48,7 @@ public function processAssert( $fixtureData = $this->prepareFixtureData($category->getData()); $formData = $catalogCategoryEdit->getEditForm()->getData($category); $error = $this->verifyData($this->sortData($fixtureData), $this->sortData($formData)); - \PHPUnit_Framework_Assert::assertEmpty($error); + \PHPUnit_Framework_Assert::assertEmpty($error, $error); } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml index 9bf9670e19660..b69d17a7c3231 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml @@ -16,11 +16,12 @@ Magento\Catalog\Test\Handler\Category\CategoryInterface Category%isolation% - Default Category category%isolation% Yes Yes - 2 + + default_category + @@ -50,6 +51,7 @@ 0 textarea + general_information parent_id 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 index 0be231009ddca..a1c50cd3e8f42 100644 --- 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 @@ -1,4 +1,4 @@ -"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" -"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage" -"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryPage" -"Name%isolation%";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm" +"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/Customer/Test/TestCase/BackendCustomerCreateTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php index 3fa885c3ff882..c979cd41c25bb 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php @@ -13,6 +13,7 @@ class BackendCustomerCreateTest extends Functional { /* tags */ const TEST_TYPE = 'acceptance_test'; + const STABLE = 'no'; /* end tags */ /** diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php index 41e9135fcad07..9477d5377db9b 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php @@ -220,7 +220,7 @@ function () use ($element, $inputSelector) { return $input->isVisible() ? true : null; } ); - $element->find($this->addNewInput)->setValue($taxClass); + $element->find($this->addNewInput)->keys([$taxClass]); $element->find($this->saveButton)->click(); $this->waitUntilOptionIsVisible($element, $taxClass); } From f3ac9b50c6a6605e5f71084bd5b0cd0785ee21b2 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Wed, 28 Jan 2015 10:19:45 +0200 Subject: [PATCH 29/29] MTA-1502: Sync qmt repository with mainline - Sprint 5 --- .../tests/app/Magento/Dhl/Test/Repository/ConfigData.xml | 6 +++--- .../app/Magento/Fedex/Test/Repository/ConfigData.xml | 8 ++++---- .../tests/app/Magento/Ups/Test/Repository/ConfigData.xml | 8 ++++---- .../tests/app/Magento/Usps/Test/Repository/ConfigData.xml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml index 28125eaae4169..765bfdd508254 100644 --- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml @@ -14,9 +14,9 @@ 1 https://xmlpitest-ea.dhl.com/XMLShippingServlet - EvgeniyDE - aplNb6Rop - 152691811 + CARRIERS_DHL_ID + CARRIERS_DHL_PASSWORD + CARRIERS_DHL_ACCOUNT 1 1 diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml index 4b7bd19f1f397..a3a12ad9fa80c 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml @@ -13,10 +13,10 @@ 1 - 510087801 - 100047915 - INdxa6ug7qZ2KD7y - pTfh4K0nkHcHVginelU4HmJkA + CARRIERS_FEDEX_ACCOUNT + CARRIERS_FEDEX_METER_NUMBER + CARRIERS_FEDEX_KEY + CARRIERS_FEDEX_PASSWORD 1 diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml index a62220d76a939..c5ebd4d6bba23 100644 --- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml @@ -16,14 +16,14 @@ 1 UPS_XML 0 - magento200 - magento + CARRIERS_UPS_PASSWORD + CARRIERS_UPS_USERNAME 0 https://wwwcie.ups.com/ups.app/xml/Rate Shipments Originating in United States - ECAB751ABF189ECA + CARRIERS_UPS_ACCESS_LICENSE_NUMBER 0 - 207W88 + CARRIERS_UPS_SHIPPER_NUMBER CP RES https://wwwcie.ups.com/ups.app/xml/Track diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml index cd4a0e0499d19..0d8ed3cbdea01 100644 --- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml @@ -15,8 +15,8 @@ 1 http://production.shippingapis.com/ShippingAPI.dll https://secure.shippingapis.com/ShippingAPI.dll - 721FRAGR6267 - 326ZL84XF990 + CARRIERS_USPS_USERID + CARRIERS_USPS_PASSWORD