Skip to content

Commit 0f71868

Browse files
author
Stanislav Idolov
authored
Merge pull request #2470 from magento-tsg/2.2-develop-mftf-pr1
[TSG] MFTF for 2.2 (pr1) (2.2.6)
2 parents 38e6464 + d791c4e commit 0f71868

File tree

73 files changed

+1583
-29
lines changed

Some content is hidden

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

73 files changed

+1583
-29
lines changed

‎dev/tests/acceptance/tests/_data/magento.jpg

54 KB
Loading

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminHeaderSection.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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminHeaderSection">
12+
<element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
13+
</section>
14+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1010
<section name="AdminMessagesSection">
1111
<element name="test" type="input" selector=".test"/>
12+
<element name="success" type="text" selector="#messages div.message-success"/>
1213
</section>
1314
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,19 @@
1515
<amOnPage stepKey="navigateProductPage" url="/{{product.name}}.html"/>
1616
<click stepKey="addToCart" selector="{{StorefrontProductPageSection.AddToCartBtn}}"/>
1717
<waitForElementVisible selector="{{StorefrontProductPageSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
18+
</actionGroup>.
19+
<!--Click Add to Cart button in storefront product page-->
20+
<actionGroup name="addToCartFromStorefrontProductPage">
21+
<arguments>
22+
<argument name="productName"/>
23+
</arguments>
24+
<click selector="{{StorefrontProductPageSection.AddToCartBtn}}" stepKey="addToCart"/>
25+
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdding"/>
26+
<waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
27+
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdded"/>
28+
<waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
29+
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
30+
<waitForPageLoad stepKey="waitForPageLoad"/>
31+
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
1832
</actionGroup>
1933
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCreateRootCategoryActionGroup.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!--Create a new root category-->
12+
<actionGroup name="AdminCreateRootCategoryActionGroup">
13+
<arguments>
14+
<argument name="categoryEntity" defaultValue="NewRootCategory"/>
15+
</arguments>
16+
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
17+
<click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="clickOnAddRootCategoryButton"/>
18+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
19+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryEntity.name}}" stepKey="enterNewRootCategoryName"/>
20+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
21+
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
22+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
23+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
24+
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
25+
<seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeNewCategoryPageTitle"/>
26+
<seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="seeCategoryInTree"/>
27+
</actionGroup>
28+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<!--Click Add to Cart button in storefront product page-->
11+
<actionGroup name="StorefrontAddToCartCustomOptionsProductPageActionGroup">
12+
<arguments>
13+
<argument name="productName"/>
14+
</arguments>
15+
<click selector="{{StorefrontProductPageSection.AddToCartBtn}}" stepKey="addToCart"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<see selector="{{StorefrontProductPageSection.SuccessMsg}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
18+
</actionGroup>
19+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryCheckActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!--Actions to check if a category exists on StoreFront-->
12+
<actionGroup name="StorefrontCategoryCheckActionGroup">
13+
<arguments>
14+
<argument name="categoryEntity" defaultValue="_defaultCategory"/>
15+
</arguments>
16+
<amOnPage url="/{{categoryEntity.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad1"/>
18+
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
19+
<seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeCategoryNameInTitle"/>
20+
</actionGroup>
21+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,40 @@
6868
<requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
6969
<requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
7070
</entity>
71+
<entity name="productWithOptions" type="product">
72+
<var key="sku" entityType="product" entityKey="sku" />
73+
<data key="file">magento.jpg</data>
74+
<requiredEntity type="product_option">ProductOptionField</requiredEntity>
75+
<requiredEntity type="product_option">ProductOptionArea</requiredEntity>
76+
<requiredEntity type="product_option">ProductOptionFile</requiredEntity>
77+
<requiredEntity type="product_option">ProductOptionDropDown</requiredEntity>
78+
<requiredEntity type="product_option">ProductOptionRadiobutton</requiredEntity>
79+
<requiredEntity type="product_option">ProductOptionCheckbox</requiredEntity>
80+
<requiredEntity type="product_option">ProductOptionMultiSelect</requiredEntity>
81+
<requiredEntity type="product_option">ProductOptionDate</requiredEntity>
82+
<requiredEntity type="product_option">ProductOptionDateTime</requiredEntity>
83+
<requiredEntity type="product_option">ProductOptionTime</requiredEntity>
84+
</entity>
85+
<entity name="VirtualProduct" type="product">
86+
<data key="sku" unique="suffix">virtualproduct</data>
87+
<data key="type_id">virtual</data>
88+
<data key="attribute_set_id">4</data>
89+
<data key="name" unique="suffix">VirtualProduct</data>
90+
<data key="price">99.99</data>
91+
<data key="quantity">250</data>
92+
<data key="weight">0</data>
93+
<data key="status">1</data>
94+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
95+
</entity>
96+
<entity name="VirtualProduct" type="product">
97+
<data key="sku" unique="suffix">virtualproduct</data>
98+
<data key="type_id">virtual</data>
99+
<data key="attribute_set_id">4</data>
100+
<data key="name" unique="suffix">VirtualProduct</data>
101+
<data key="price">99.99</data>
102+
<data key="quantity">250</data>
103+
<data key="weight">0</data>
104+
<data key="status">1</data>
105+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
106+
</entity>
71107
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionData.xml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="ProductOptionField" type="product_option">
11+
<var key="product_sku" entityType="product" entityKey="sku" />
12+
<data key="title">OptionField</data>
13+
<data key="type">field</data>
14+
<data key="is_require">true</data>
15+
<data key="sort_order">1</data>
16+
<data key="price">10</data>
17+
<data key="price_type">fixed</data>
18+
<data key="max_characters">0</data>
19+
</entity>
20+
<entity name="ProductOptionArea" type="product_option">
21+
<var key="product_sku" entityType="product" entityKey="sku" />
22+
<data key="title">OptionArea</data>
23+
<data key="type">area</data>
24+
<data key="is_require">true</data>
25+
<data key="sort_order">2</data>
26+
<data key="price">10</data>
27+
<data key="price_type">percent</data>
28+
<data key="max_characters">0</data>
29+
</entity>
30+
<entity name="ProductOptionFile" type="product_option">
31+
<var key="product_sku" entityType="product" entityKey="sku" />
32+
<data key="title">OptionFile</data>
33+
<data key="type">file</data>
34+
<data key="is_require">true</data>
35+
<data key="sort_order">3</data>
36+
<data key="price">9.99</data>
37+
<data key="price_type">fixed</data>
38+
<data key="file_extension">png, jpg, gif</data>
39+
<data key="image_size_x">0</data>
40+
<data key="image_size_y">0</data>
41+
</entity>
42+
<entity name="ProductOptionDropDown" type="product_option">
43+
<var key="product_sku" entityType="product" entityKey="sku" />
44+
<data key="title">OptionDropDown</data>
45+
<data key="type">drop_down</data>
46+
<data key="sort_order">4</data>
47+
<data key="is_require">true</data>
48+
<requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
49+
<requiredEntity type="product_option_value">ProductOptionValueDropdown2</requiredEntity>
50+
</entity>
51+
<entity name="ProductOptionRadiobutton" type="product_option">
52+
<var key="product_sku" entityType="product" entityKey="sku" />
53+
<data key="title">OptionRadioButtons</data>
54+
<data key="type">radio</data>
55+
<data key="sort_order">5</data>
56+
<data key="is_require">true</data>
57+
<requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
58+
<requiredEntity type="product_option_value">ProductOptionValueRadioButtons2</requiredEntity>
59+
</entity>
60+
<entity name="ProductOptionCheckbox" type="product_option">
61+
<var key="product_sku" entityType="product" entityKey="sku" />
62+
<data key="title">OptionCheckbox</data>
63+
<data key="type">checkbox</data>
64+
<data key="sort_order">6</data>
65+
<data key="is_require">true</data>
66+
<requiredEntity type="product_option_value">ProductOptionValueCheckbox</requiredEntity>
67+
</entity>
68+
<entity name="ProductOptionMultiSelect" type="product_option">
69+
<var key="product_sku" entityType="product" entityKey="sku" />
70+
<data key="title">OptionMultiSelect</data>
71+
<data key="type">multiple</data>
72+
<data key="sort_order">7</data>
73+
<data key="is_require">true</data>
74+
<requiredEntity type="product_option_value">ProductOptionValueMultiSelect1</requiredEntity>
75+
<requiredEntity type="product_option_value">ProductOptionValueMultiSelect2</requiredEntity>
76+
</entity>
77+
<entity name="ProductOptionDate" type="product_option">
78+
<var key="product_sku" entityType="product" entityKey="sku" />
79+
<data key="title">OptionDate</data>
80+
<data key="type">date</data>
81+
<data key="sort_order">8</data>
82+
<data key="is_require">true</data>
83+
<data key="price">1234</data>
84+
<data key="price_type">fixed</data>
85+
</entity>
86+
<entity name="ProductOptionDateTime" type="product_option">
87+
<var key="product_sku" entityType="product" entityKey="sku" />
88+
<data key="title">OptionDateTime</data>
89+
<data key="type">date_time</data>
90+
<data key="sort_order">9</data>
91+
<data key="is_require">true</data>
92+
<data key="price">0.00</data>
93+
<data key="price_type">fixed</data>
94+
</entity>
95+
<entity name="ProductOptionTime" type="product_option">
96+
<var key="product_sku" entityType="product" entityKey="sku" />
97+
<data key="title">OptionTime</data>
98+
<data key="type">time</data>
99+
<data key="sort_order">10</data>
100+
<data key="is_require">true</data>
101+
<data key="price">0.00</data>
102+
<data key="price_type">percent</data>
103+
</entity>
104+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionValueData.xml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="ProductOptionValueDropdown1" type="product_option_value">
11+
<data key="title">OptionValueDropDown1</data>
12+
<data key="sort_order">1</data>
13+
<data key="price">0.01</data>
14+
<data key="price_type">fixed</data>
15+
</entity>
16+
<entity name="ProductOptionValueDropdown2" type="product_option_value">
17+
<data key="title">OptionValueDropDown2</data>
18+
<data key="sort_order">2</data>
19+
<data key="price">0.01</data>
20+
<data key="price_type">percent</data>
21+
</entity>
22+
<entity name="ProductOptionValueRadioButtons1" type="product_option_value">
23+
<data key="title">OptionValueRadioButtons1</data>
24+
<data key="sort_order">1</data>
25+
<data key="price">99.99</data>
26+
<data key="price_type">fixed</data>
27+
</entity>
28+
<entity name="ProductOptionValueRadioButtons2" type="product_option_value">
29+
<data key="title">OptionValueRadioButtons2</data>
30+
<data key="sort_order">2</data>
31+
<data key="price">99.99</data>
32+
<data key="price_type">percent</data>
33+
</entity>
34+
<entity name="ProductOptionValueCheckbox" type="product_option_value">
35+
<data key="title">OptionValueCheckbox</data>
36+
<data key="sort_order">1</data>
37+
<data key="price">123</data>
38+
<data key="price_type">percent</data>
39+
</entity>
40+
<entity name="ProductOptionValueMultiSelect1" type="product_option_value">
41+
<data key="title">OptionValueMultiSelect1</data>
42+
<data key="sort_order">1</data>
43+
<data key="price">1</data>
44+
<data key="price_type">fixed</data>
45+
</entity>
46+
<entity name="ProductOptionValueMultiSelect2" type="product_option_value">
47+
<data key="title">OptionValueMultiSelect2</data>
48+
<data key="sort_order">2</data>
49+
<data key="price">2</data>
50+
<data key="price_type">fixed</data>
51+
</entity>
52+
</entities>

0 commit comments

Comments
 (0)