Skip to content

Commit 0d92a9a

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'mainline/develop' into cms-team-1-delivery
2 parents a578f00 + 7d26a19 commit 0d92a9a

File tree

15 files changed

+230
-2
lines changed

15 files changed

+230
-2
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/WYSIWYGDisabledSuite.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="WYSIWYGDisabledSuite">
10+
<before>
11+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
12+
<actionGroup ref="disablePageBuilderSetting" stepKey="turnOffPageBuilder"/>
13+
</before>
14+
<after>
15+
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
16+
</after>
17+
</suite>
18+
</suites>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
<group value="pagebuilder-row"/>
272272
<group value="pagebuilder-rowLayout"/>
273273
<skip>
274-
<issueId value="MC-3724"/>
274+
<issueId value="MC-4057"/>
275275
</skip>
276276
</annotations>
277277
<before>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTests.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@
467467
<group value="pagebuilder-tabs"/>
468468
<group value="pagebuilder-tabGroup"/>
469469
<skip>
470-
<issueId value="MC-2335"/>
470+
<issueId value="MC-4057"/>
471471
</skip>
472472
</annotations>
473473
<before>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Bundle\Test\TestCase\CreateBundleProductEntityTest" summary="Create Bundle Product" ticketId="MAGETWO-24118">
10+
<variation name="CreateBundleProductEntityTestVariation4" summary="Create bundle product with out of stock simple product" ticketId="MAGETWO-12801">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
</testCase>
14+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Category\CreateCategoryEntityTest" summary="Create Category from Category Page" ticketId="MAGETWO-23411">
10+
<variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
</testCase>
14+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
10+
<variation name="UpdateCategoryEntityFlatDataTestVariation1" summary="Update Category with custom name and description">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
</testCase>
14+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityTest" summary="Update Category" ticketId="MAGETWO-23290">
10+
<variation name="UpdateCategoryEntityTestVariation1_Name_Description_UrlKey_MetaTitle_ExcludeFromMenu">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
</testCase>
14+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityPartOneTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
10+
<variation name="CreateSimpleProductEntityTestVariation13">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
<variation name="CreateSimpleProductEntityTestVariation14">
14+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
15+
</variation>
16+
<variation name="CreateSimpleProductEntityTestVariation15">
17+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
18+
</variation>
19+
<variation name="CreateSimpleProductEntityTestVariation16">
20+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
21+
</variation>
22+
<variation name="CreateSimpleProductEntityTestVariation17">
23+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
24+
</variation>
25+
<variation name="CreateSimpleProductEntityTestVariation18" summary="Create simple product with imported options" ticketId="MAGETWO-71386">
26+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
27+
</variation>
28+
</testCase>
29+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
10+
<variation name="CreateSimpleProductEntityTestVariation1">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
<variation name="CreateSimpleProductEntityTestVariation2">
14+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
15+
</variation>
16+
<variation name="CreateSimpleProductEntityTestVariation3" summary="Create product with special price and custom options(fixed price)">
17+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
18+
</variation>
19+
<variation name="CreateSimpleProductEntityTestVariation4">
20+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
21+
</variation>
22+
<variation name="CreateSimpleProductEntityTestVariation5">
23+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
24+
</variation>
25+
<variation name="CreateSimpleProductEntityTestVariation6">
26+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
27+
</variation>
28+
<variation name="CreateSimpleProductEntityTestVariation7">
29+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
30+
</variation>
31+
<variation name="CreateSimpleProductEntityTestVariation8">
32+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
33+
</variation>
34+
<variation name="CreateSimpleProductEntityTestVariation9">
35+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
36+
</variation>
37+
</testCase>
38+
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityTest" summary="Create Product Attribute" ticketId="MAGETWO-24767">
10+
<variation name="CreateProductAttributeEntityTestVariation6" summary="Create custom dropdown attribute product field" ticketId="MAGETWO-17475, MAGETWO-14862">
11+
<data name="issue" xsi:type="string">MC-3294: MTF test from basic_green suite is broken for PB repository</data>
12+
</variation>
13+
</testCase>
14+
</config>

0 commit comments

Comments
 (0)