Skip to content

Commit 5765d64

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into Hammer_247_beta1_scope_17042023
2 parents 1f0c2f9 + 21a3692 commit 5765d64

10 files changed

+23
-9
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686

8787
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
8888

89-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
89+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
9191

9292
<openNewTab stepKey="openNewTab"/>
9393

@@ -115,12 +115,12 @@
115115
</actionGroup>
116116

117117
<click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
118-
118+
<waitForElementClickable selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="waitForUpdateCartButtonClickable" />
119119
<click selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="clickUpdateCartButton"/>
120-
120+
<waitForElementClickable selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitForProceedToCheckoutClickable" />
121121
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
122122

123-
<see selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
123+
<waitForText selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
124124

125125
</test>
126126
</tests>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
</before>
2525
<after>
2626
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
27+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductGridPage" />
28+
<actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="deleteProducts" />
2729
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2830
</after>
2931

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
<click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
2424
<waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
2525
<selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
26+
<wait time="2" stepKey="waitForPopupToAppear" />
2627
<seeInPopup userInput="There is already another PayPal solution enabled. Enable this solution instead?" stepKey="seeAlertMessage"/>
2728
<acceptPopup stepKey="acceptEnablePopUp"/>
29+
<waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigClickable" />
2830
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
2931
<waitForPageLoad stepKey="waitForPageLoad2"/>
3032
</actionGroup>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16675"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
</annotations>
2021
<selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16677"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-13146"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16678"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<field key="price">100</field>
2525
</createData>
2626
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
27-
<createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
27+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
2828
<createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
2929
<createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
3030
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -34,7 +34,7 @@
3434
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3535
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3636
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
37-
<createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
37+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
3838
<createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
3939
<createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
4040
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@
3131
<!--Prerequisites-->
3232
<!--Create store view to ensure multiple store views-->
3333
<comment userInput="Create prerequisite store view" stepKey="createStoreViewComment" before="createStoreView"/>
34-
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" before="navigateToNewOrderPage"/>
34+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" before="navigateToNewOrderPage">
35+
<argument name="customStore" value="customStore"/>
36+
</actionGroup>
3537

3638
<!--Admin creates order-->
3739
<comment userInput="Admin creates order" stepKey="adminCreateOrderComment" before="navigateToNewOrderPage"/>
3840
<actionGroup ref="AdminNavigateToNewOrderPageNewCustomerActionGroup" stepKey="navigateToNewOrderPage" after="deleteCategory"/>
3941

40-
<actionGroup ref="CheckRequiredFieldsNewOrderFormActionGroup" stepKey="checkRequiredFieldsNewOrder" after="navigateToNewOrderPage"/>
42+
<actionGroup ref="AdminSelectStoreDuringOrderCreationActionGroup" stepKey="selectCustomStore" after="navigateToNewOrderPage">
43+
<argument name="storeView" value="customStore"/>
44+
</actionGroup>
45+
<actionGroup ref="CheckRequiredFieldsNewOrderFormActionGroup" stepKey="checkRequiredFieldsNewOrder" after="selectCustomStore"/>
4146
<scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
4247
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
4348
<argument name="product" value="SimpleProduct"/>

‎dev/tests/acceptance/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ tests/functional/Magento/_generated
88
vendor/*
99
mftf.log
1010
/.credentials.example
11+
/.credentials
1112
/utils/

0 commit comments

Comments
 (0)