Skip to content

Commit 079bdf0

Browse files
author
Joan He
authored
Merge pull request #4414 from magento-pangolin/2.3-tests-pr
Regression Automation Team Sprint #3
2 parents fb58417 + 3ddbf83 commit 079bdf0

File tree

36 files changed

+877
-31
lines changed

36 files changed

+877
-31
lines changed

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
10+
<!-- Skip by MQE-1576 -->
1111
<actionGroup name="ConfigureBraintree">
1212
<!-- GoTo ConfigureBraintree fields -->
1313
<click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
@@ -50,4 +50,4 @@
5050
<magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
5151
<magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
5252
</actionGroup>
53-
</actionGroups>
53+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77
-->
88

9-
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1110
<entity name="SampleBraintreeConfig" type="braintree_config_state">
1211
<requiredEntity type="title">SampleTitle</requiredEntity>
1312
<requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
@@ -54,13 +53,13 @@
5453
<data key="value">sandbox</data>
5554
</entity>
5655
<entity name="MerchantId" type="merchant_id">
57-
<data key="value">d4pdjhxgjfrsmzbf</data>
56+
<data key="value">MERCH_ID</data>
5857
</entity>
5958
<entity name="PublicKey" type="public_key">
60-
<data key="value">m7q4wmh43xrgyrst</data>
59+
<data key="value">PUBLIC_KEY</data>
6160
</entity>
6261
<entity name="PrivateKey" type="private_key">
63-
<data key="value">67de364080b1b4e2492d7a3de413a572</data>
62+
<data key="value">PRIVATE_KEY</data>
6463
</entity>
6564

6665
<!-- default configuration used to restore Magento config -->
@@ -138,14 +137,17 @@
138137
<data key="year">20</data>
139138
<data key="cvv">113</data>
140139
</entity>
140+
<entity name="StoredPaymentMethods">
141+
<data key="cardNumberEnding">5100</data>
142+
<data key="cardExpire">12/2020</data>
143+
</entity>
141144

142145
<entity name="BraintreeConfigurationData" type="data">
143146
<data key="title">Credit Card (Braintree)</data>
144-
<data key="merchantID">d4pdjhxgjfrsmzbf</data>
145-
<data key="publicKey">m7q4wmh43xrgyrst</data>
146-
<data key="privateKey">67de364080b1b4e2492d7a3de413a572</data>
147-
<data key="merchantAccountID">Magneto</data>
147+
<data key="merchantID">MERCH_ID</data>
148+
<data key="publicKey">PUBLIC_KEY</data>
149+
<data key="privateKey">PRIVATE_KEY</data>
150+
<data key="merchantAccountID">MERCH_ACCOUNT_ID</data>
148151
<data key="titleForPayPalThroughBraintree">PayPal (Braintree)</data>
149152
</entity>
150-
151153
</entities>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-93767"/>
1919
<group value="braintree"/>
20+
<skip>
21+
<issueId value="MQE-1576"/>
22+
</skip>
2023
</annotations>
2124

2225
<before>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-93677"/>
1919
<group value="braintree"/>
20+
<skip>
21+
<issueId value="MQE-1576"/>
22+
</skip>
2023
</annotations>
2124

2225

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-94472"/>
1919
<group value="braintree"/>
20+
<skip>
21+
<issueId value="MQE-1576"/>
22+
</skip>
2023
</annotations>
2124

2225
<before>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeProductSEOSettingsActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminChangeProductSEOSettingsActionGroup">
12+
<arguments>
13+
<argument name="productName" defaultValue="_defaultProduct.name"/>
14+
</arguments>
15+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickSearchEngineOptimizationTab"/>
16+
<waitForPageLoad stepKey="waitForTabOpen"/>
17+
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{productName}}" stepKey="setUrlKeyInput"/>
18+
<fillField selector="{{AdminProductSEOSection.metaTitleInput}}" userInput="{{productName}}" stepKey="setMetaTitleInput"/>
19+
<fillField selector="{{AdminProductSEOSection.metaKeywordsInput}}" userInput="{{productName}}" stepKey="setMetaKeywordsInput"/>
20+
<fillField selector="{{AdminProductSEOSection.metaDescriptionInput}}" userInput="{{productName}}" stepKey="setMetaDescriptionInput"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductDesignSettingsActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSetProductDesignSettingsActionGroup">
12+
<arguments>
13+
<argument name="designSettings" defaultValue="simpleBlankDesign"/>
14+
</arguments>
15+
<click selector="{{ProductDesignSection.DesignTab}}" stepKey="clickDesignTab"/>
16+
<waitForPageLoad stepKey="waitForTabOpen"/>
17+
<selectOption selector="{{ProductDesignSection.LayoutDropdown}}" userInput="{{designSettings.page_layout}}" stepKey="setLayout"/>
18+
<selectOption selector="{{ProductDesignSection.productOptionsContainer}}" userInput="{{designSettings.options_container}}" stepKey="setDisplayProductOptions"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchProductGiftMessageStatusActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSwitchProductGiftMessageStatusActionGroup">
12+
<arguments>
13+
<argument name="status" defaultValue="0"/>
14+
</arguments>
15+
<click selector="{{AdminProductGiftOptionsSection.giftOptions}}" stepKey="clickToExpandGiftOptionsTab"/>
16+
<waitForPageLoad stepKey="waitForGiftOptionsOpen"/>
17+
<uncheckOption selector="{{AdminProductGiftOptionsSection.useConfigSettingsMessage}}" stepKey="uncheckConfigSettingsMessage"/>
18+
<click selector="{{AdminProductGiftOptionsSection.toggleProductGiftMessage}}" stepKey="clickToGiftMessageSwitcher"/>
19+
<seeElement selector="{{AdminProductGiftOptionsSection.giftMessageStatus('status')}}" stepKey="assertGiftMessageStatus"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertGiftMessageFieldsActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontAssertGiftMessageFieldsActionGroup">
11+
<waitForElementVisible selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="waitForCartGiftOptionVisible"/>
12+
<click selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="clickGiftOptionBtn"/>
13+
<seeElement selector="{{StorefrontProductCartGiftOptionSection.fieldTo}}" stepKey="seeFieldTo"/>
14+
<seeElement selector="{{StorefrontProductCartGiftOptionSection.fieldFrom}}" stepKey="seeFieldFrom"/>
15+
<seeElement selector="{{StorefrontProductCartGiftOptionSection.message}}" stepKey="seeMessageArea"/>
16+
<seeElement selector="{{StorefrontProductCartGiftOptionSection.update}}" stepKey="seeUpdateButton"/>
17+
<seeElement selector="{{StorefrontProductCartGiftOptionSection.cancel}}" stepKey="seeCancelButton"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductDesignData.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="simpleBlankDesign" type="product">
12+
<data key="custom_design">Magento Blank</data>
13+
<data key="page_layout">2 columns with left bar</data>
14+
<data key="options_container">Product Info Column</data>
15+
</entity>
16+
<entity name="simpleLumaDesign" type="product">
17+
<data key="custom_design">Magento Luma</data>
18+
<data key="page_layout">Empty</data>
19+
<data key="options_container">Block after Info Column</data>
20+
</entity>
21+
</entities>

0 commit comments

Comments
 (0)