Skip to content

Commit bd25c1d

Browse files
DmitryTsymbalDmitryTsymbal
committed
sections-refactoring
1 parent 65378b9 commit bd25c1d

9 files changed

+31
-22
lines changed

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminCreatesNewIntegrationActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argument name="name" type="string"/>
1616
<argument name="password" type="string"/>
1717
</arguments>
18-
<fillField stepKey="fillNameField" selector="{{AddNewIntegrationSection.name}}" userInput="{{name}}"/>
19-
<fillField stepKey="fillAdminPasswordField" selector="{{AddNewIntegrationSection.password}}" userInput="{{password}}"/>
18+
<fillField stepKey="fillNameField" selector="{{AdminNewIntegrationSection.name}}" userInput="{{name}}"/>
19+
<fillField stepKey="fillAdminPasswordField" selector="{{AdminNewIntegrationSection.password}}" userInput="{{password}}"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminDeleteIntegrationEntityActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminDeleteIntegrationEntityActionGroup">
12-
<click stepKey="clickRemoveButon" selector="{{IntegrationsGridSection.remove}}"/>
13-
<waitForElementVisible selector="{{IntegrationsGridSection.submitButton}}" stepKey="waitForConfirmButtonVisible"/>
14-
<click stepKey="clickSubmitButton" selector="{{IntegrationsGridSection.submitButton}}"/>
12+
<click stepKey="clickRemoveButon" selector="{{AdminIntegrationsGridSection.remove}}"/>
13+
<waitForElementVisible selector="{{AdminIntegrationsGridSection.submitButton}}" stepKey="waitForConfirmButtonVisible"/>
14+
<click stepKey="clickSubmitButton" selector="{{AdminIntegrationsGridSection.submitButton}}"/>
1515
<waitForPageLoad stepKey="waitForPageLoad"/>
1616
</actionGroup>
1717
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminNavigateToCreateIntegrationPageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!--Click the "Add New Integration" Button -->
1313

1414
<actionGroup name="AdminNavigateToCreateIntegrationPageActionGroup">
15-
<click stepKey="clickAddNewIntegrationButton" selector="{{IntegrationsGridSection.add}}"/>
15+
<click stepKey="clickAddNewIntegrationButton" selector="{{AdminIntegrationsGridSection.add}}"/>
1616
<waitForPageLoad stepKey="waitForNewNIntegrationPageLoaded"/>
1717
</actionGroup>
1818
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSearchIntegrationInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<!--Reset Search Filters -->
1616
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
1717
<!--Fill Integration Name Field -->
18-
<fillField selector="{{IntegrationsGridSection.name}}" userInput="{{name}}" stepKey="filterByName"/>
18+
<fillField selector="{{AdminIntegrationsGridSection.name}}" userInput="{{name}}" stepKey="filterByName"/>
1919
<!--Click "Search" Button -->
20-
<click selector="{{IntegrationsGridSection.search}}" stepKey="doFilter"/>
20+
<click selector="{{AdminIntegrationsGridSection.search}}" stepKey="doFilter"/>
2121
<waitForPageLoad stepKey="waitForSitemapPageLoadedAfterFiltering"/>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSubmitNewIntegrationFormActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<actionGroup name="AdminSubmitNewIntegrationFormActionGroup">
1313
<!--Click the "Save" Button -->
14-
<click stepKey="clickSaveButton" selector="{{AddNewIntegrationSection.saveButton}}"/>
14+
<click stepKey="clickSaveButton" selector="{{AdminNewIntegrationSection.saveButton}}"/>
1515
<waitForPageLoad stepKey="waitForPageLoad"/>
1616
</actionGroup>
1717
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminMessageCreateIntegrationEntityActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<argument name="message" type="string" defaultValue="The integration '{{name}}' has been saved."/>
1414
<argument name="messageType" type="string" defaultValue="success"/>
1515
</arguments>
16-
<waitForElementVisible selector="{{IntegrationsGridSection.messageByType(messageType)}}" stepKey="waitForMessage"/>
17-
<see userInput="{{message}}" selector="{{IntegrationsGridSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
16+
<waitForElementVisible selector="{{AdminIntegrationsGridSection.messageByType(messageType)}}" stepKey="waitForMessage"/>
17+
<see userInput="{{message}}" selector="{{AdminIntegrationsGridSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertDeletedIntegrationIsNotInGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<arguments>
1313
<argument name="name" type="string"/>
1414
</arguments>
15-
<dontSee userInput="{{name}}" selector="{{IntegrationsGridSection.rowByIndex('1')}}" stepKey="donSeeIntegration"/>
15+
<dontSee userInput="{{name}}" selector="{{AdminIntegrationsGridSection.rowByIndex('1')}}" stepKey="donSeeIntegration"/>
1616
</actionGroup>
1717
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsSection.xml renamed to ‎app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsGridSection.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010

11-
<section name="IntegrationsGridSection">
11+
<section name="AdminIntegrationsGridSection">
1212
<element name="add" type="button" selector=".page-actions .add"/>
1313
<element name="messageByType" type="block" selector="#messages .message-{{messageType}}" parameterized="true"/>
1414
<element name="name" type="input" selector=".data-grid-filters #integrationGrid_filter_name"/>
@@ -18,13 +18,4 @@
1818
<element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
1919
<element name="edit" type="button" selector=".data-grid .edit"/>
2020
</section>
21-
22-
<section name="AddNewIntegrationSection">
23-
<element name="name" type="input" selector="#integration_properties_name"/>
24-
<element name="password" type="input" selector="#integration_properties_current_password"/>
25-
<element name="saveButton" type="button" selector=".page-actions #save-split-button-button"/>
26-
<element name="endpoint" type="input" selector="#integration_properties_endpoint"/>
27-
<element name="linkUrl" type="input" selector="#integration_properties_identity_link_url"/>
28-
<element name="save" type="button" selector=".page-actions-buttons .save"/>
29-
</section>
3021
</sections>

‎app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminNewIntegrationSection">
11+
<element name="name" type="input" selector="#integration_properties_name"/>
12+
<element name="password" type="input" selector="#integration_properties_current_password"/>
13+
<element name="saveButton" type="button" selector=".page-actions #save-split-button-button"/>
14+
<element name="endpoint" type="input" selector="#integration_properties_endpoint"/>
15+
<element name="linkUrl" type="input" selector="#integration_properties_identity_link_url"/>
16+
<element name="save" type="button" selector=".page-actions-buttons .save"/>
17+
</section>
18+
</sections>

0 commit comments

Comments
 (0)