Skip to content

Commit 1445a8a

Browse files
okolesnykokolesnyk
committed
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF v2.0
1 parent 80696b8 commit 1445a8a

File tree

12 files changed

+51
-53
lines changed

12 files changed

+51
-53
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/BackendActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="LoginToAdminActionGroup">
1111
<amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
1212
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
1313
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
1414
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
1515
<waitForPageLoad stepKey="waitForPageLoad1"/>
1616
</actionGroup>
17-
</config>
17+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackendData.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1110
<entity name="backendDataOne" type="backend">
1211
<data key="backendConfigName">data</data>
1312
</entity>
14-
</config>
13+
</entities>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
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">
1111
<actionGroup name="AddSimpleProductToCart">
1212
<arguments>
1313
<argument name="product" defaultValue="product"/>
@@ -16,4 +16,4 @@
1616
<click stepKey="addToCart-{{product.name}}" selector="{{StorefrontProductPageSection.AddToCartBtn}}"/>
1717
<waitForElementVisible selector="{{StorefrontProductPageSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
1818
</actionGroup>
19-
</config>
19+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="StorefrontProductPage" url="/{{var1}}.html" module="Category" parameterized="true">
11+
<page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Category" parameterized="true">
1212
<section name="StorefrontProductPageSection"/>
1313
</page>
14-
</config>
14+
</pages>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="StorefrontProductPageSection">
1212
<element name="QtyInput" type="button" selector="input.input-text.qty"/>
1313
<element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
1414
<element name="SuccessMsg" type="button" selector="div.message-success"/>
1515
</section>
16-
</config>
16+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutHeaderSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
9+
<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="CheckoutHeaderSection">
1111
<element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)"/>
1212
<element name="reviewAndPaymentsStep" type="text" selector=".opc-progress-bar-item:nth-of-type(2)"/>
1313
</section>
14-
</config>
14+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/CustomerActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
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">
1111
<actionGroup name="CustomerLoginOnStorefront">
1212
<arguments>
1313
<argument name="customer" defaultValue="customer"/>
@@ -19,4 +19,4 @@
1919
<click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
2020
<waitForPageLoad stepKey="pageLoadAfterLogin"/>
2121
</actionGroup>
22-
</config>
22+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<testCaseId value="MAGETWO-72095"/>
1919
<group value="customer"/>
2020
<group value="create"/>
21-
<group value="skip"/>
2221
</annotations>
2322
<after>
2423
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceCest.xml renamed to ‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FlatRateShippingMethodData.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1010

1111
<!-- Enable Flat Rate Shipping method config -->
1212
<entity name="FlatRateShippingMethodConfig" type="flat_rate_shipping_method">
13-
<required-entity type="active">flatRateActiveEnable</required-entity>
13+
<requiredEntity type="active">flatRateActiveEnable</requiredEntity>
1414
</entity>
1515

1616
<entity name="flatRateActiveEnable" type="active">
@@ -19,18 +19,18 @@
1919

2020
<!-- Flat Rate Shipping method default setup -->
2121
<entity name="FlatRateShippingMethodDefault" type="flat_rate_shipping_method">
22-
<required-entity type="active">flatRateActiveDefault</required-entity>
23-
<required-entity type="title">flatRateTitleDefault</required-entity>
24-
<required-entity type="name">flatRateNameDefault</required-entity>
25-
<required-entity type="type">flatRateTypeDefault</required-entity>
26-
<required-entity type="price">flatRatePriceDefault</required-entity>
27-
<required-entity type="handling_type">flatRateHandlingTypeDefault</required-entity>
28-
<required-entity type="handling_fee">flatRateHandlingFeeDefault</required-entity>
29-
<required-entity type="specificerrmsg">flatRateSpecificerrmsgDefault</required-entity>
30-
<required-entity type="sallowspecific">flatRateSallowspecificDefault</required-entity>
31-
<required-entity type="specificcountry">flatRateSpecificcountryDefault</required-entity>
32-
<required-entity type="showmethod">flatRateShowmethodDefault</required-entity>
33-
<required-entity type="sort_order">flatRateSortOrderDefault</required-entity>
22+
<requiredEntity type="active">flatRateActiveDefault</requiredEntity>
23+
<requiredEntity type="title">flatRateTitleDefault</requiredEntity>
24+
<requiredEntity type="name">flatRateNameDefault</requiredEntity>
25+
<requiredEntity type="type">flatRateTypeDefault</requiredEntity>
26+
<requiredEntity type="price">flatRatePriceDefault</requiredEntity>
27+
<requiredEntity type="handling_type">flatRateHandlingTypeDefault</requiredEntity>
28+
<requiredEntity type="handling_fee">flatRateHandlingFeeDefault</requiredEntity>
29+
<requiredEntity type="specificerrmsg">flatRateSpecificerrmsgDefault</requiredEntity>
30+
<requiredEntity type="sallowspecific">flatRateSallowspecificDefault</requiredEntity>
31+
<requiredEntity type="specificcountry">flatRateSpecificcountryDefault</requiredEntity>
32+
<requiredEntity type="showmethod">flatRateShowmethodDefault</requiredEntity>
33+
<requiredEntity type="sort_order">flatRateSortOrderDefault</requiredEntity>
3434
</entity>
3535

3636
<entity name="flatRateActiveDefault" type="active">
@@ -58,12 +58,12 @@
5858
<data key="value">0</data>
5959
</entity>
6060
<entity name="flatRateSpecificcountryDefault" type="specificcountry">
61-
<data key="value"></data>
61+
<data key="value" />
6262
</entity>
6363
<entity name="flatRateShowmethodDefault" type="showmethod">
6464
<data key="value">0</data>
6565
</entity>
6666
<entity name="flatRateSortOrderDefault" type="sort_order">
67-
<data key="value"></data>
67+
<data key="value" />
6868
</entity>
69-
</config>
69+
</entities>

0 commit comments

Comments
 (0)