Skip to content

Commit 7f72008

Browse files
shashikant.kumarshanthi
shashikant.kumar
authored and
shanthi
committed
extented action group
1 parent 4077dae commit 7f72008

File tree

3 files changed

+10
-31
lines changed

3 files changed

+10
-31
lines changed

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AssertStorefrontMultishippingAddressAndItemUKGEActionGroup.xml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,14 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AssertStorefrontMultishippingAddressAndItemUKGEActionGroup">
11+
<actionGroup name="AssertStorefrontMultishippingAddressAndItemUKGEActionGroup" extends="AssertStorefrontMultishippingAddressAndItemActionGroup">
1212
<annotations>
13-
<description>Verify item information on Ship to Multiple Addresses page.</description>
13+
<description>Verify item information on Ship to Multiple Addresses page for UK and Germany.</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="productSequenceNumber" type="string" defaultValue="1"/>
1716
<argument name="addressQtySequenceNumber" type="string" defaultValue="1"/>
18-
<argument name="productName" type="string" defaultValue="{{SimpleProduct.name}}"/>
19-
<argument name="quantity" type="string" defaultValue="1"/>
20-
<argument name="firstName" type="string" defaultValue="{{US_Address_CA.firstname}}"/>
21-
<argument name="lastName" type="string" defaultValue="{{US_Address_CA.lastname}}"/>
22-
<argument name="city" type="string" defaultValue="{{US_Address_CA.city}}"/>
23-
<argument name="postCode" type="string" defaultValue="{{US_Address_CA.postcode}}"/>
24-
<argument name="country" type="string" defaultValue="{{US_Address_CA.country}}"/>
25-
<argument name="addressStreetLine1" type="string" defaultValue="{{US_Address_CA.street[0]}}"/>
2617
</arguments>
27-
28-
<seeElement selector="{{MultishippingSection.productLink(productName, productSequenceNumber)}}" stepKey="verifyProductName"/>
29-
<seeInField selector="{{MultishippingSection.productQty(addressQtySequenceNumber)}}" userInput="{{quantity}}" stepKey="verifyQuantity"/>
30-
<seeInField selector="{{MultishippingSection.shippingAddressSelector(addressQtySequenceNumber)}}" userInput="{{firstName}} {{lastName}}, {{addressStreetLine1}}, {{city}}, {{postCode}}, {{country}}" stepKey="verifyAddress"/>
18+
<remove keyForRemoval="verifyAddress"/>
19+
<seeInField selector="{{MultishippingSection.shippingAddressSelector(addressQtySequenceNumber)}}" userInput="{{firstName}} {{lastName}}, {{addressStreetLine1}}, {{city}}, {{postCode}}, {{country}}" stepKey="verifyAddressDetails"/>
3120
</actionGroup>
3221
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontAssertBillingAddressInBillingInfoStepGEActionGroup.xml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,10 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="StorefrontAssertBillingAddressInBillingInfoStepGEActionGroup">
11+
<actionGroup name="StorefrontAssertBillingAddressInBillingInfoStepGEActionGroup" extends="StorefrontAssertBillingAddressInBillingInfoStepActionGroup">
1212
<annotations>
13-
<description>Assert that Billing Address block contains provided Address data.</description>
13+
<description>Assert that Billing Address block contains provided Address data for Germany.</description>
1414
</annotations>
15-
<arguments>
16-
<argument name="address" type="entity" defaultValue="DE_Address_Berlin_Not_Default_Address"/>
17-
</arguments>
18-
19-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.firstname}}" stepKey="seeFirstname"/>
20-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.lastname}}" stepKey="seeLastname"/>
21-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.company}}" stepKey="seeCompany"/>
22-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.street[0]}}" stepKey="seeStreet"/>
23-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.city}}" stepKey="seeCity"/>
24-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.postcode}}" stepKey="seePostcode"/>
25-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.country}}" stepKey="seeCountry"/>
26-
<see selector="{{PaymentMethodSection.billingAddressBlock}}" userInput="{{address.telephone}}" stepKey="seeTelephone"/>
15+
<remove keyForRemoval="seeState"/>
2716
</actionGroup>
2817
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/Test/MultishipmentCheckoutWithDifferentProductTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<createData entity="Customer_US_UK_DE" stepKey="createCustomer"/>
25-
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2625
<!-- Create category and 2 simple product -->
2726
<createData entity="ApiCategory" stepKey="createCategory"/>
2827
<createData entity="ApiSimpleProduct" stepKey="firstSimpleProduct">
@@ -369,7 +368,9 @@
369368
<!-- See Order review Page is opened-->
370369
<seeInCurrentUrl url="{{MultishippingCheckoutOverviewPage.url}}" stepKey="seeMultishipingCheckoutOverviewPageIsOpened"/>
371370
<!-- Check Page contains customer's billing address on OverViewPage-->
372-
<actionGroup ref="StorefrontAssertBillingAddressInBillingInfoStepGEActionGroup" stepKey="assertCustomerBillingInformationOverViewPage"/>
371+
<actionGroup ref="StorefrontAssertBillingAddressInBillingInfoStepGEActionGroup" stepKey="assertCustomerBillingInformationOverViewPage">
372+
<argument name="address" value="DE_Address_Berlin_Not_Default_Address"/>
373+
</actionGroup>
373374
<!-- Check Payment Method on OverViewPage-->
374375
<seeElement selector="{{StorefrontMultishippingCheckoutAddressesToolbarSection.checkmoneyorderonOverViewPage}}" stepKey="seeCheckMoneyorderonOverViewPage"/>
375376
<!--Check total amount -->

0 commit comments

Comments
 (0)