Skip to content

Commit 9889d0f

Browse files
ivy00johnsivy00johns
committed
MQE-1421: Updating EndToEnd Tests
- Updating hardcoded schema paths with the URN versions.
1 parent 49128da commit 9889d0f

File tree

60 files changed

+126
-119
lines changed

Some content is hidden

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

60 files changed

+126
-119
lines changed

‎app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
1212
<section name="AdminMenuSection"/>
1313
</page>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
108

9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminOrderBraintreeFillActionGroup">
1212
<!--Select Braintree Payment method on Admin Order Create Page-->
1313
<click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
@@ -39,4 +39,4 @@
3939
<wait stepKey="waitForFillCVV" time="1"/>
4040
<switchToIFrame stepKey="switchBackFromCVV"/>
4141
</actionGroup>
42-
</actionGroups>
42+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="CreateCustomerActionGroup">
1112
<click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
1213
<waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
@@ -39,6 +40,5 @@
3940
<click stepKey="save" selector="{{NewCustomerPageSection.saveCustomer}}"/>
4041
<waitForPageLoad stepKey="waitForCustomersPage" time="10"/>
4142
<waitForElementVisible selector="{{NewCustomerPageSection.createdSuccessMessage}}" stepKey="waitForSuccessfullyCreatedMessage" time="20"/>
42-
4343
</actionGroup>
44-
</actionGroups>
44+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
108

9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="useBraintreeForMasterCard">
1212
<click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
1313
<waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
@@ -36,4 +36,4 @@
3636
<wait stepKey="waitForFillCVV" time="1"/>
3737
<switchToIFrame stepKey="switchBackFromCVV"/>
3838
</actionGroup>
39-
</actionGroups>
39+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="CreateNewProductActionGroup">
11-
1212
<click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
1313
<waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
1414
<click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
@@ -22,4 +22,4 @@
2222
<waitForElementVisible stepKey="waitForSuccessfullyCreatedMessage" selector="{{NewProductPageSection.createdSuccessMessage}}" time="10"/>
2323
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
2424
</actionGroup>
25-
</actionGroups>
25+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="DeleteProductActionGroup">
1112
<arguments>
1213
<argument name="productName" defaultValue=""/>
@@ -23,4 +24,4 @@
2324
<click stepKey="clickOnOk" selector="{{ProductsPageSection.ok}}"/>
2425
<waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{ProductsPageSection.deletedSuccessMessage}}" time="10"/>
2526
</actionGroup>
26-
</actionGroups>
27+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
108

9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!--Sign out-->
1212
<actionGroup name="SignOut">
1313
<click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
@@ -24,5 +24,4 @@
2424
<fillField userInput="{{NewAdmin.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
2525
<click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
2626
</actionGroup>
27-
28-
</actionGroups>
27+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="NewCustomerData" type="braintree_config_state">
1212
<data key="FirstName">Abgar</data>
1313
<data key="LastName">Abgaryan</data>
@@ -20,5 +20,4 @@
2020
<data key="PhoneNumber">9999</data>
2121
<data key="Country">Armenia</data>
2222
</entity>
23-
2423
</entities>

‎app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="NewProductData" type="braintree_config_state">
1212
<data key="ProductName">ProductTest</data>
1313
<data key="Price">100</data>
1414
<data key="Quantity">100</data>
1515
</entity>
16-
1716
</entities>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
911
<section name="AdminCreateRoleSection">
1012
<element name="create" type="button" selector="#add"/>
1113
<element name="name" type="button" selector="#role_name"/>
@@ -21,4 +23,4 @@
2123
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
2224
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
2325
</section>
24-
</sections>
26+
</sections>

0 commit comments

Comments
 (0)