Skip to content

Commit 9c6b710

Browse files
MAGETWO-95812: Required RMA Attributes are not validated while Customer submits a return
- Updated automated test
1 parent f3920b4 commit 9c6b710

6 files changed

+14
-14
lines changed

app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!--Fill order information fields and click continue-->
12-
<actionGroup name="fillOrderInformationActionGroup">
12+
<actionGroup name="StorefrontFillOrderInformationActionGroup">
1313
<arguments>
1414
<argument name="orderId" type="string"/>
1515
<argument name="orderLastName"/>
1616
<argument name="orderEmail"/>
1717
</arguments>
1818
<amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
1919
<waitForPageLoad stepKey="waitForPageLoad"/>
20-
<fillField selector="{{OrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
21-
<fillField selector="{{OrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
22-
<fillField selector="{{OrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
23-
<click selector="{{OrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
20+
<fillField selector="{{StorefrontOrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
21+
<fillField selector="{{StorefrontOrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
22+
<fillField selector="{{StorefrontOrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
23+
<click selector="{{StorefrontOrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
2424
<waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
2525
<seeInCurrentUrl url="{{StorefrontOrderInformationPage.url}}" stepKey="seeOrderInformationUrl"/>
2626
</actionGroup>
2727

2828
<!--Enter quantity to return and submit-->
29-
<actionGroup name="fillQuantityToReturnActionGroup">
30-
<click selector="{{OrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
29+
<actionGroup name="StorefrontFillQuantityToReturnActionGroup">
30+
<click selector="{{StorefrontOrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
3131
<waitForPageLoad stepKey="waitForReturnPageLoad"/>
32-
<fillField selector="{{CreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
33-
<click selector="{{CreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
32+
<fillField selector="{{StorefrontCreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
33+
<click selector="{{StorefrontCreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
3434
<waitForPageLoad stepKey="waitForPageLoad"/>
3535
</actionGroup>
3636
</actionGroups>

app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="StorefrontCreateNewReturnPage" url="rma/guest/create/order_id/" area="guest" module="Magento_Sales">
12-
<section name="CreateNewReturnMainSection"/>
12+
<section name="StorefrontCreateNewReturnMainSection"/>
1313
</page>
1414
</pages>

app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="StorefrontOrderInformationPage" url="sales/guest/view" area="guest" module="Magento_Sales">
12-
<section name="OrderInformationMainSection"/>
12+
<section name="StorefrontOrderInformationMainSection"/>
1313
</page>
1414
</pages>

app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml renamed to app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml

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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="CreateNewReturnMainSection">
11+
<section name="StorefrontCreateNewReturnMainSection">
1212
<element name="quantityToReturn" type="input" selector="#items:qty_requested0"/>
1313
<element name="submit" type="submit" selector="//span[contains(text(), 'Submit')]"/>
1414
<element name="resolutionError" type="text" selector="//*[@id='items:resolution0']/following-sibling::div[contains(text(),'Please select an option')]"/>

app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml renamed to app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml

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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="OrderAndReturnInformationSection">
11+
<section name="StorefrontOrderAndReturnInformationSection">
1212
<element name="orderId" type="input" selector="#oar-order-id"/>
1313
<element name="bilingLastName" type="input" selector="#oar-billing-lastname"/>
1414
<element name="findOrderBy" type="select" selector="#quick-search-type-id"/>

app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml renamed to app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml

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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="OrderInformationMainSection">
11+
<section name="StorefrontOrderInformationMainSection">
1212
<element name="orderTitle" type="span" selector="#page-title-wrapper"/>
1313
<element name="return" type="span" selector="//span[contains(text(), 'Return')]"/>
1414
</section>

0 commit comments

Comments
 (0)