Skip to content

Commit 547407c

Browse files
sivaschenkosivaschenko
committed
Merge branch 'MAGETWO-30884' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into config2
Conflicts: dev/tests/functional/etc/variations.xsd dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerFrontendEntityTest/testCreateCustomer.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity/test.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.xml dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.xml dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.xml dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.xml dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.xml dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.xml dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.xml dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.xml dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.xml dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.xml dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.xml dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.xml dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.xml
2 parents 231b144 + 1f8e8b2 commit 547407c

File tree

156 files changed

+7244
-7464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+7244
-7464
lines changed

‎dev/tests/functional/etc/variations.xsd

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<constraint>
9-
<assertGlobalSearchProductName module="Magento_Backend">
10-
<severity>low</severity>
11-
</assertGlobalSearchProductName>
12-
<assertGlobalSearchOrderId module="Magento_Backend">
13-
<severity>low</severity>
14-
</assertGlobalSearchOrderId>
15-
<assertGlobalSearchNoRecordsFound module="Magento_Backend">
16-
<severity>low</severity>
17-
</assertGlobalSearchNoRecordsFound>
18-
<assertGlobalSearchCustomerName module="Magento_Backend">
19-
<severity>low</severity>
20-
</assertGlobalSearchCustomerName>
21-
</constraint>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/global/constraints.xsd">
9+
<constraint name="assertGlobalSearchProductName" module="Magento_Backend" severity="low"/>
10+
<constraint name="assertGlobalSearchOrderId" module="Magento_Backend" severity="low"/>
11+
<constraint name="assertGlobalSearchNoRecordsFound" module="Magento_Backend" severity="low"/>
12+
<constraint name="assertGlobalSearchCustomerName" module="Magento_Backend" severity="low"/>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<constraint>
9-
<assertBackupInGrid module="Magento_Backup">
10-
<severity>low</severity>
11-
</assertBackupInGrid>
12-
</constraint>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/global/constraints.xsd">
9+
<constraint name="assertBackupInGrid" module="Magento_Backup" severity="low"/>
10+
</config>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 516 additions & 479 deletions
Large diffs are not rendered by default.

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,54 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/variations.xsd">
9-
<testCase name="UpdateBundleProductEntityTest">
10-
<variation name="UpdateBundleProductEntityTestVariation1">
11-
<data name="originalProduct/dataSet">bundle_dynamic_product</data>
12-
<data name="product/data/name">bundle_fixed_%isolation%</data>
13-
<data name="product/data/sku_type">Fixed</data>
14-
<data name="product/data/sku">bundle_fixed_%isolation%</data>
15-
<data name="product/data/price/preset">dynamic-100</data>
16-
<data name="product/data/weight_type">Fixed</data>
17-
<data name="product/data/weight">1</data>
18-
<data name="product/data/category_ids/presets">-</data>
19-
<data name="product/data/description">Bundle Product Fixed Required</data>
20-
<data name="product/data/bundle_shipment_type">Together</data>
21-
<data name="product/data/bundle_selections/preset">default_dynamic</data>
22-
<data name="product/data/checkout_data/preset">default</data>
23-
<data name="product/data/visibility">-</data>
24-
<data name="product/data/url_key">bundle-fixed-url-%isolation%</data>
25-
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType</data>
26-
</variation>
27-
<variation name="UpdateBundleProductEntityTestVariation2">
28-
<data name="originalProduct/dataSet">bundle_fixed_product</data>
29-
<data name="product/data/name">bundle_dynamic_%isolation%</data>
30-
<data name="product/data/sku_type">Dynamic</data>
31-
<data name="product/data/sku">bundle_sku_%isolation%</data>
32-
<data name="product/data/price/preset">fixed-756</data>
33-
<data name="product/data/weight_type">Dynamic</data>
34-
<data name="product/data/weight">-</data>
35-
<data name="product/data/category_ids/presets">default_subcategory</data>
36-
<data name="product/data/description">-</data>
37-
<data name="product/data/bundle_shipment_type">Separately</data>
38-
<data name="product/data/bundle_selections/preset">default_fixed</data>
39-
<data name="product/data/checkout_data/preset">default</data>
40-
<data name="product/data/visibility">Catalog, Search</data>
41-
<data name="product/data/url_key">bundle-dynamic-url-%isolation%</data>
42-
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType</data>
43-
</variation>
44-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/global/variations.xsd">
9+
<testCase name="UpdateBundleProductEntityTest">
10+
<variation name="UpdateBundleProductEntityTestVariation1" firstConstraint="assertProductSaveMessage" method="test">
11+
<data name="originalProduct/dataSet" xsi:type="string">bundle_dynamic_product</data>
12+
<data name="product/data/name" xsi:type="string">bundle_dynamic_%isolation%</data>
13+
<data name="product/data/sku_type" xsi:type="string">Fixed</data>
14+
<data name="product/data/sku" xsi:type="string">bundle_dynamic_%isolation%</data>
15+
<data name="product/data/price/preset" xsi:type="string">dynamic-100</data>
16+
<data name="product/data/weight_type" xsi:type="string">Fixed</data>
17+
<data name="product/data/weight" xsi:type="string">1</data>
18+
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
19+
<data name="product/data/description" xsi:type="string">Bundle Product Fixed Required</data>
20+
<data name="product/data/bundle_shipment_type" xsi:type="string">Together</data>
21+
<data name="product/data/bundle_selections/preset" xsi:type="string">default_dynamic</data>
22+
<data name="product/data/checkout_data/preset" xsi:type="string">default</data>
23+
<data name="product/data/visibility" xsi:type="string">-</data>
24+
<constraint name="assertProductSaveMessage" next="assertProductInGrid"/>
25+
<constraint name="assertProductInGrid" next="assertBundleItemsOnProductPage" prev="assertProductSaveMessage"/>
26+
<constraint name="assertBundleItemsOnProductPage" next="assertBundleProductForm" prev="assertProductInGrid"/>
27+
<constraint name="assertBundleProductForm" next="assertBundleProductPage" prev="assertBundleItemsOnProductPage"/>
28+
<constraint name="assertBundleProductPage" next="assertProductInStock" prev="assertBundleProductForm"/>
29+
<constraint name="assertProductInStock" next="assertBundlePriceView" prev="assertBundleProductPage"/>
30+
<constraint name="assertBundlePriceView" next="assertBundlePriceType" prev="assertProductInStock"/>
31+
<constraint name="assertBundlePriceType" prev="assertBundlePriceView"/>
32+
</variation>
33+
<variation name="UpdateBundleProductEntityTestVariation2" firstConstraint="assertProductSaveMessage" method="test">
34+
<data name="originalProduct/dataSet" xsi:type="string">bundle_fixed_product</data>
35+
<data name="product/data/name" xsi:type="string">bundle_dynamic_%isolation%</data>
36+
<data name="product/data/sku_type" xsi:type="string">Dynamic</data>
37+
<data name="product/data/sku" xsi:type="string">bundle_sku_%isolation%</data>
38+
<data name="product/data/price/preset" xsi:type="string">fixed-756</data>
39+
<data name="product/data/weight_type" xsi:type="string">Dynamic</data>
40+
<data name="product/data/weight" xsi:type="string">-</data>
41+
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
42+
<data name="product/data/description" xsi:type="string">-</data>
43+
<data name="product/data/bundle_shipment_type" xsi:type="string">Separately</data>
44+
<data name="product/data/bundle_selections/preset" xsi:type="string">default_fixed</data>
45+
<data name="product/data/checkout_data/preset" xsi:type="string">default</data>
46+
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
47+
<constraint name="assertProductSaveMessage" next="assertProductInGrid"/>
48+
<constraint name="assertProductInGrid" next="assertBundleItemsOnProductPage" prev="assertProductSaveMessage"/>
49+
<constraint name="assertBundleItemsOnProductPage" next="assertBundleProductForm" prev="assertProductInGrid"/>
50+
<constraint name="assertBundleProductForm" next="assertBundleProductPage" prev="assertBundleItemsOnProductPage"/>
51+
<constraint name="assertBundleProductPage" next="assertProductInStock" prev="assertBundleProductForm"/>
52+
<constraint name="assertProductInStock" next="assertProductVisibleInCategory" prev="assertBundleProductPage"/>
53+
<constraint name="assertProductVisibleInCategory" next="assertBundlePriceView" prev="assertProductInStock"/>
54+
<constraint name="assertBundlePriceView" next="assertBundlePriceType" prev="assertProductVisibleInCategory"/>
55+
<constraint name="assertBundlePriceType" prev="assertBundlePriceView"/>
56+
</variation>
57+
</testCase>
4558
</config>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,24 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<constraint>
9-
<assertBundleInCategory module="Magento_Bundle">
10-
<severity>low</severity>
11-
<require>
12-
<catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
13-
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
14-
<product class="Magento\Bundle\Test\Fixture\BundleProduct" />
15-
<category class="Magento\Catalog\Test\Fixture\Category" />
16-
</require>
17-
</assertBundleInCategory>
18-
<assertBundleItemsOnProductPage module="Magento_Bundle">
19-
<severity>low</severity>
20-
</assertBundleItemsOnProductPage>
21-
<assertBundlePriceView module="Magento_Bundle">
22-
<severity>low</severity>
23-
</assertBundlePriceView>
24-
<assertBundlePriceType module="Magento_Bundle">
25-
<severity>low</severity>
26-
</assertBundlePriceType>
27-
<assertBundleProductForm module="Magento_Bundle">
28-
<severity>low</severity>
29-
</assertBundleProductForm>
30-
<assertTierPriceOnBundleProductPage module="Magento_Bundle">
31-
<severity>low</severity>
32-
</assertTierPriceOnBundleProductPage>
33-
<assertBundleProductPage module="Magento_Bundle">
34-
<severity>low</severity>
35-
</assertBundleProductPage>
36-
<assertGroupedPriceOnBundleProductPage module="Magento_Bundle">
37-
<severity>low</severity>
38-
</assertGroupedPriceOnBundleProductPage>
39-
<assertProductCustomOptionsOnBundleProductPage module="Magento_Bundle">
40-
<severity>low</severity>
41-
</assertProductCustomOptionsOnBundleProductPage>
42-
<assertBundleProductInCustomerWishlistOnBackendGrid module="Magento_Bundle">
43-
<severity>low</severity>
44-
</assertBundleProductInCustomerWishlistOnBackendGrid>
45-
</constraint>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/global/constraints.xsd">
9+
<constraint name="assertBundleInCategory" module="Magento_Bundle" severity="low">
10+
<argument name="catalogCategoryView">Magento\Catalog\Test\Page\Category\CatalogCategoryView</argument>
11+
<argument name="cmsIndex">Magento\Cms\Test\Page\CmsIndex</argument>
12+
<argument name="product">Magento\Bundle\Test\Fixture\BundleProduct</argument>
13+
<argument name="category">Magento\Catalog\Test\Fixture\Category</argument>
14+
</constraint>
15+
<constraint name="assertBundleItemsOnProductPage" module="Magento_Bundle" severity="low"/>
16+
<constraint name="assertBundlePriceView" module="Magento_Bundle" severity="low"/>
17+
<constraint name="assertBundlePriceType" module="Magento_Bundle" severity="low"/>
18+
<constraint name="assertBundleProductForm" module="Magento_Bundle" severity="low"/>
19+
<constraint name="assertTierPriceOnBundleProductPage" module="Magento_Bundle" severity="low"/>
20+
<constraint name="assertBundleProductPage" module="Magento_Bundle" severity="low"/>
21+
<constraint name="assertGroupedPriceOnBundleProductPage" module="Magento_Bundle" severity="low"/>
22+
<constraint name="assertProductCustomOptionsOnBundleProductPage" module="Magento_Bundle" severity="low"/>
23+
<constraint name="assertBundleProductInCustomerWishlistOnBackendGrid" module="Magento_Bundle" severity="low"/>
24+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
8989
protected function setTaxClassId($taxClassName)
9090
{
9191
$url = $_ENV['app_backend_url'] . 'tax/rule/new/';
92-
$curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
92+
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->create('Magento\Mtf\Config');
93+
$curl = new BackendDecorator(new CurlTransport(), $config);
9394
$curl->addOption(CURLOPT_HEADER, 1);
9495
$curl->write(CurlInterface::POST, $url, '1.0', [], []);
9596
$response = $curl->read();

0 commit comments

Comments
 (0)