Skip to content

Commit f7b1caf

Browse files
tomreecetomreece
committed
MQE-523: Create mainline PRs for previous sprint (12)
- Fixed Alex's feedback
1 parent bd320a2 commit f7b1caf

File tree

9 files changed

+135
-135
lines changed

9 files changed

+135
-135
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="SampleBraintreeConfig" type="braintree_config_state">
12+
<required-entity type="title">SampleTitle</required-entity>
13+
<required-entity type="payment_action">SamplePaymentAction</required-entity>
14+
<required-entity type="environment">SampleEnvironment</required-entity>
15+
<required-entity type="merchant_id">SampleMerchantId</required-entity>
16+
<required-entity type="public_key">SamplePublicKey</required-entity>
17+
<required-entity type="private_key">SamplePrivateKey</required-entity>
18+
</entity>
19+
<entity name="SampleTitle" type="title">
20+
<data key="value">Sample Braintree Config</data>
21+
</entity>
22+
<entity name="SamplePaymentAction" type="payment_action">
23+
<data key="value">authorize</data>
24+
</entity>
25+
<entity name="SampleEnvironment" type="environment">
26+
<data key="value">sandbox</data>
27+
</entity>
28+
<entity name="SampleMerchantId" type="merchant_id">
29+
<data key="value">someMerchantId</data>
30+
</entity>
31+
<entity name="SamplePublicKey" type="public_key">
32+
<data key="value">somePublicKey</data>
33+
</entity>
34+
<entity name="SamplePrivateKey" type="private_key">
35+
<data key="value">somePrivateKey</data>
36+
</entity>
37+
38+
<!-- default configuration used to restore Magento config -->
39+
<entity name="DefaultBraintreeConfig" type="braintree_config_state">
40+
<required-entity type="title">DefaultTitle</required-entity>
41+
<required-entity type="payment_action">DefaultPaymentAction</required-entity>
42+
<required-entity type="environment">DefaultEnvironment</required-entity>
43+
<required-entity type="merchant_id">DefaultMerchantId</required-entity>
44+
<required-entity type="public_key">DefaultPublicKey</required-entity>
45+
<required-entity type="private_key">DefaultPrivateKey</required-entity>
46+
</entity>
47+
<entity name="DefaultTitle" type="title">
48+
<data key="value"/>
49+
</entity>
50+
<entity name="DefaultPaymentAction" type="payment_action">
51+
<data key="value"/>
52+
</entity>
53+
<entity name="DefaultEnvironment" type="environment">
54+
<data key="value"/>
55+
</entity>
56+
<entity name="DefaultMerchantId" type="merchant_id">
57+
<data key="value"/>
58+
</entity>
59+
<entity name="DefaultPublicKey" type="public_key">
60+
<data key="value"/>
61+
</entity>
62+
<entity name="DefaultPrivateKey" type="private_key">
63+
<data key="value"/>
64+
</entity>
65+
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Metadata/braintree_config-meta.xml renamed to ‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
11-
<operation name="createBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
11+
<operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
1212
<object key="groups" dataType="braintree_config_state">
1313
<object key="braintree_section" dataType="braintree_config_state">
1414
<object key="groups" dataType="braintree_config_state">
@@ -42,4 +42,4 @@
4242
</object>
4343
</object>
4444
</operation>
45-
</config>
45+
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml renamed to ‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="StorefrontProductPage" url="admin/catalog/product/view" module="Magento_Catalog">
11+
<page name="AdminProductPage" url="admin/catalog/product/view" module="Magento_Catalog">
1212
<section name="StorefrontProductInfoMainSection" />
1313
<section name="StorefrontProductInfoDetailsSection" />
1414
<section name="StorefrontProductImageSection" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Data/braintreeData.xml

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Data/paypalData.xml

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="SamplePaypalConfig" type="paypal_config_state">
12+
<required-entity type="business_account">SampleBusinessAccount</required-entity>
13+
<required-entity type="api_username">SampleApiUsername</required-entity>
14+
<required-entity type="api_password">SampleApiPassword</required-entity>
15+
<required-entity type="api_signature">SampleApiSignature</required-entity>
16+
<required-entity type="api_authentication">SampleApiAuthentication</required-entity>
17+
<required-entity type="sandbox_flag">SampleSandboxFlag</required-entity>
18+
<required-entity type="use_proxy">SampleUseProxy</required-entity>
19+
</entity>
20+
<entity name="SampleBusinessAccount" type="business_account">
21+
<data key="value">myBusinessAccount@magento.com</data>
22+
</entity>
23+
<entity name="SampleApiUsername" type="api_username">
24+
<data key="value">myApiUsername.magento.com</data>
25+
</entity>
26+
<entity name="SampleApiPassword" type="api_password">
27+
<data key="value">somePassword</data>
28+
</entity>
29+
<entity name="SampleApiSignature" type="api_signature">
30+
<data key="value">someApiSignature</data>
31+
</entity>
32+
<entity name="SampleApiAuthentication" type="api_authentication">
33+
<data key="value">0</data>
34+
</entity>
35+
<entity name="SampleSandboxFlag" type="sandbox_flag">
36+
<data key="value">0</data>
37+
</entity>
38+
<entity name="SampleUseProxy" type="use_proxy">
39+
<data key="value">0</data>
40+
</entity>
41+
42+
<!-- default configuration used to restore Magento config -->
43+
<entity name="DefaultPayPalConfig" type="paypal_config_state">
44+
<required-entity type="business_account">DefaultBusinessAccount</required-entity>
45+
<required-entity type="api_username">DefaultApiUsername</required-entity>
46+
<required-entity type="api_password">DefaultApiPassword</required-entity>
47+
<required-entity type="api_signature">DefaultApiSignature</required-entity>
48+
</entity>
49+
<entity name="DefaultBusinessAccount" type="business_account">
50+
<data key="value"/>
51+
</entity>
52+
<entity name="DefaultApiUsername" type="api_username">
53+
<data key="value"/>
54+
</entity>
55+
<entity name="DefaultApiPassword" type="api_password">
56+
<data key="value"/>
57+
</entity>
58+
<entity name="DefaultApiSignature" type="api_signature">
59+
<data key="value"/>
60+
</entity>
61+
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Metadata/paypal_config-meta.xml renamed to ‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
10-
<operation name="createPaypalConfigState" dataType="paypal_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
10+
<operation name="CreatePaypalConfigState" dataType="paypal_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
1111
<object key="groups" dataType="paypal_config_state">
1212
<object key="paypal_alternative_payment_methods" dataType="paypal_config_state">
1313
<object key="groups" dataType="paypal_config_state">

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
<!--see mergeKey="test" userInput="$$saleRule.store_labels[0][store_id]$$" selector="test"/-->
2121
</test>
2222
</cest>
23-
</config>
23+
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<cest name="SetPaymentConfigurationCest">
1212
<test name="SetPaypalConfigurationTest">
13-
<createData entity="samplePaypalConfig" mergeKey="createSamplePaypalConfig"/>
14-
<createData entity="defaultPaypalConfig" mergeKey="restoreDefaultPaypalConfig"/>
13+
<createData entity="SamplePaypalConfig" mergeKey="createSamplePaypalConfig"/>
14+
<createData entity="DefaultPayPalConfig" mergeKey="restoreDefaultPaypalConfig"/>
1515
</test>
1616
<test name="SetBraintreeConfigurationTest">
17-
<createData entity="sampleBraintreeConfig" mergeKey="createSampleBraintreeConfig"/>
18-
<createData entity="defaultBraintreeConfig" mergeKey="restoreDefaultBraintreeConfig"/>
17+
<createData entity="SampleBraintreeConfig" mergeKey="createSampleBraintreeConfig"/>
18+
<createData entity="DefaultBraintreeConfig" mergeKey="restoreDefaultBraintreeConfig"/>
1919
</test>
2020
</cest>
2121
</config>

0 commit comments

Comments
 (0)