Skip to content

Commit 0419965

Browse files
DianaRusinDianaRusin
committed
MAGETWO-95576: [FT][Amazon] Tests fail when Amazon is configured
1 parent ee11eb6 commit 0419965

25 files changed

+152
-26
lines changed

‎app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
6666
<waitForPageLoad stepKey="waitForPageLoad4"/>
6767
<!--Place order-->
68-
<click selector="{{CheckoutPaymentSection.placeOrder}}"
68+
<click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}}{{CheckoutPaymentSection.placeOrder}}"
6969
stepKey="PlaceOrder"/>
7070
<waitForPageLoad stepKey="waitForPageLoad5"/>
7171

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
7979
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
8080

81+
<!-- Checkout select Check/Money Order payment -->
82+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
83+
8184
<!-- Place Order -->
8285

8386
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>

‎app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
105105
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
106106
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
107+
<!-- Checkout select Check/Money Order payment -->
108+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
107109
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
108110
<waitForPageLoad stepKey="waitForOrderSuccessPage1"/>
109111
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
4444
</actionGroup>
4545

46+
<actionGroup name="GuestCheckoutFillShippingNoWaitForPaymentActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
47+
<remove keyForRemoval="waitForPaymentSectionLoaded"/>
48+
<remove keyForRemoval="assertCheckoutPaymentUrl"/>
49+
</actionGroup>
50+
4651
<!-- Guest checkout filling shipping section without region -->
4752
<actionGroup name="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup">
4853
<arguments>
@@ -88,6 +93,13 @@
8893
<see userInput="No Payment method available." stepKey="checkMessage"/>
8994
</actionGroup>
9095

96+
<actionGroup name="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" extends="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup">
97+
<arguments>
98+
<argument name="paymentMethod" type="string"/>
99+
</arguments>
100+
<remove keyForRemoval="checkMessage"/>
101+
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" parametrized="true" stepKey="paymentMethodDoesNotAvailable"/>
102+
</actionGroup>
91103
<!-- Logged in user checkout filling shipping section -->
92104
<actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
93105
<arguments>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,11 @@
6565
<selectOption selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
6666
<clearField selector="{{classPrefix}} {{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
6767
</actionGroup>
68-
</actionGroups>
68+
<actionGroup name="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" extends="GuestCheckoutFillNewBillingAddressActionGroup">
69+
<arguments>
70+
<argument name="paymentMethod" type="string"/>
71+
</arguments>
72+
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="waitForLoading3" stepKey="waitForPaymentSectionLoaded"/>
73+
<conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" parametrized="true" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
74+
</actionGroup>
75+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
2323
<element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
2424
<element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
25-
<element name="billingAddress" type="text" selector="div.billing-address-details"/>
25+
<element name="billingAddress" type="text" selector=".payment-method._active div.billing-address-details"/>
2626
<element name="cartItems" type="text" selector="ol.minicart-items"/>
2727
<element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
2828
<element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active" timeout="30"/>
@@ -52,5 +52,6 @@
5252
<element name="addressAction" type="button" selector="//span[text()='{{action}}']" parameterized="true"/>
5353
<element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
5454
<element name="noQuotes" type="text" selector=".no-quotes-block"/>
55+
<element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
5556
</section>
5657
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
5656
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
5757
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
58-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest3"/>
59-
58+
<!-- Checkout select Check/Money Order payment -->
59+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
6060
<!--Click Place Order button-->
6161
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
6262
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
@@ -81,7 +81,8 @@
8181
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
8282
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton2"/>
8383
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
84-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest4"/>
84+
<!-- Checkout select Check/Money Order payment -->
85+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
8586

8687
<!--Click Place Order button-->
8788
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
@@ -105,7 +106,9 @@
105106
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
106107
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton3"/>
107108
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext3"/>
108-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest5"/>
109+
110+
<!-- Checkout select Check/Money Order payment -->
111+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
109112

110113
<!--Click Place Order button-->
111114
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
@@ -165,6 +168,9 @@
165168
<argument name="customerAddressVar" value="CustomerAddressSimple" />
166169
</actionGroup>
167170

171+
<!-- Checkout select Check/Money Order payment -->
172+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
173+
168174
<!--Click Place Order button-->
169175
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
170176
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
@@ -198,6 +204,9 @@
198204
<argument name="customerAddressVar" value="CustomerAddressSimple" />
199205
</actionGroup>
200206

207+
<!-- Checkout select Check/Money Order payment -->
208+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
209+
201210
<!--Click Place Order button-->
202211
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
203212
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
<click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
4949
<waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
5050
<click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
51+
<!-- Checkout select Check/Money Order payment -->
52+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
5153
<waitForPageLoad stepKey="s39"/>
5254
<waitForElement stepKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
5355
<see stepKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
@@ -163,7 +165,8 @@
163165
<click stepKey="selectFirstShippingMethod1" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
164166
<waitForElement stepKey="waitForShippingMethodSelect1" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
165167
<click stepKey="clickNextOnShippingMethodLoad1" selector="{{CheckoutShippingMethodsSection.next}}" />
166-
<waitForPageLoad stepKey="waitForPaymentLoad1"/>
168+
<!-- Checkout select Check/Money Order payment -->
169+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
167170
<waitForElement stepKey="waitForPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
168171
<see stepKey="seeBillingAddressIsCorrect1" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
169172
<click stepKey="clickPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" />
@@ -186,7 +189,8 @@
186189
<click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
187190
<waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
188191
<click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />
189-
<waitForPageLoad stepKey="waitForPaymentLoad2"/>
192+
<!-- Checkout select Check/Money Order payment -->
193+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
190194
<waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
191195
<see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" />
192196
<click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
@@ -242,8 +246,7 @@
242246
<click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}" />
243247
<waitForPageLoad stepKey="waitBillingForm"/>
244248
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
245-
<waitForElementVisible selector="{{CheckoutPaymentSection.noQuotes}}" stepKey="waitMessage"/>
246-
<see userInput="No Payment method available." stepKey="checkMessage"/>
249+
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
247250

248251
<!-- Fill UK Address and verify that payment available and checkout successful -->
249252
<click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@
109109
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
110110

111111
<!-- Fill US Address and verify that no payment available -->
112-
<actionGroup ref="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup" stepKey="guestCheckoutFillingShippingSection">
112+
<actionGroup ref="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" stepKey="guestCheckoutFillingShippingSection">
113113
<argument name="customerVar" value="CustomerEntityOne" />
114114
<argument name="customerAddressVar" value="CustomerAddressSimple" />
115+
<argument name="paymentMethod" value="Check / Money order"/>
115116
</actionGroup>
116117

117118
<!-- Fill UK Address and verify that payment available and checkout successful -->

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,32 @@
311311
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
312312
</actionGroup>
313313

314+
<actionGroup name="CreateOrderInStoreActionGroup">
315+
<arguments>
316+
<argument name="product"/>
317+
<argument name="customer"/>
318+
<argument name="storeView"/>
319+
</arguments>
320+
<amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
321+
<click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
322+
<waitForPageLoad stepKey="waitForStoresPageOpened"/>
323+
<click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
324+
<scrollToTopOfPage stepKey="scrollToTop"/>
325+
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
326+
<waitForPageLoad stepKey="waitForProductsListForOrder"/>
327+
<click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
328+
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
329+
<waitForPageLoad stepKey="waitForProductAddedInOrder"/>
330+
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
331+
<waitForPageLoad stepKey="waitForShippingMethods"/>
332+
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
333+
<waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
334+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
335+
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
336+
<click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
337+
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
338+
</actionGroup>
339+
314340
<!--Cancel order that is in pending status-->
315341
<actionGroup name="cancelPendingOrder">
316342
<click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
@@ -320,4 +346,10 @@
320346
<see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
321347
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
322348
</actionGroup>
323-
</actionGroups>
349+
350+
<!--Select Check Money payment method-->
351+
<actionGroup name="SelectCheckMoneyPaymentMethod">
352+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
353+
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
354+
</actionGroup>
355+
</actionGroups>

0 commit comments

Comments
 (0)