Skip to content

Commit d6196a8

Browse files
committed
Merge branch 'MC-4239' of github.com:magento-borg/magento2ce into MC-4239
2 parents 956707a + b948c39 commit d6196a8

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsConfigData.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.
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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="AuthorizenetAcceptjsOrderValidationData" type="AuthorizenetAcceptjsCredentials">
12+
<data key="virtualProductOrderAmount">$24.68</data>
13+
<data key="twoSimpleProductsOrderAmount">$128.00</data>
14+
<data key="processingStatusProcessing">Processing</data>
15+
<data key="captureStatusCapture">Capture</data>
16+
<data key="closedStatusNo">No</data>
17+
</entity>
18+
</entities>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
<element name="reports" type="button" selector="#menu-magento-reports-report"/>
2020
<element name="stores" type="button" selector="#menu-magento-backend-stores"/>
2121
<element name="system" type="button" selector="#menu-magento-backend-system"/>
22+
<element name="findPartners" type="button" selector="#menu-magento-marketplace-partners"/>
23+
<element name="currencySetup" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Currency Setup']"/>
2224
</section>
2325
</sections>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565

6666
<!--View and validate order-->
6767
<actionGroup ref="ViewAndValidateOrderActionGroup" stepKey="viewAndValidateOrder">
68-
<argument name="amount" value="$128.00"/>
69-
<argument name="status" value="Processing"/>
70-
<argument name="captureStatus" value="Capture"/>
71-
<argument name="closedStatus" value="No"/>
68+
<argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.twoSimpleProductsOrderAmount}}"/>
69+
<argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
70+
<argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
71+
<argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
7272
</actionGroup>
7373
</test>
7474
</tests>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<waitForPageLoad stepKey="waitForCartToFill"/>
5858
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCartAgain"/>
5959
<waitForPageLoad stepKey="waitForCartToFillAgain"/>
60-
60+
6161
<!--Checkout steps-->
6262
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
6363
<waitForPageLoad stepKey="waitForCheckoutLoad"/>
@@ -73,10 +73,10 @@
7373

7474
<!--View and validate order-->
7575
<actionGroup ref="ViewAndValidateOrderActionGroupNoSubmit" stepKey="viewAndValidateOrder">
76-
<argument name="amount" value="$24.68"/>
77-
<argument name="status" value="Processing"/>
78-
<argument name="captureStatus" value="Capture"/>
79-
<argument name="closedStatus" value="No"/>
76+
<argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.virtualProductOrderAmount}}"/>
77+
<argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
78+
<argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
79+
<argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
8080
</actionGroup>
8181
</test>
8282
</tests>

0 commit comments

Comments
 (0)