Skip to content

Commit f576607

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-30884' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-30884
2 parents 8b335c5 + 103ab98 commit f576607

File tree

28 files changed

+955
-1973
lines changed

28 files changed

+955
-1973
lines changed

‎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/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>

0 commit comments

Comments
 (0)