Skip to content

Commit fdf4a1c

Browse files
okolesnykokolesnyk
authored
Merge pull request #1678 from magento-pangolin/sprint-develop
[Pangolins] Write store settings before tests (Braintree, Paypal) - MQE-236: [Generator] Add additional Comment methods - MQE-388: Write store settings before tests - MQE-398: Rename Page.urlPath attribute - MQE-450: [Framework] Create a custom "clearField()" function for the framework. - MQE-465: Data object xml doesn't support multidimensional arrays - MQE-523: Create mainline PRs for previous sprint (12)
2 parents 7d2d2be + 0a78a1b commit fdf4a1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+447
-46
lines changed

‎dev/tests/acceptance/RoboFile.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ function buildProject()
4343
* @param array $opts
4444
* @return void
4545
*/
46-
function generateTests($opts = ['config' => null, 'env' => 'chrome'])
46+
function generateTests($opts = ['config' => null])
4747
{
4848
require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
49-
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllCestFiles($opts['config'], $opts['env']);
49+
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllCestFiles($opts['config']);
5050
$this->say("Generate Tests Command Run");
5151
}
5252

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>
3131
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" mergeKey="fillPassword"/>
3232
<click selector="{{AdminLoginFormSection.signIn}}" mergeKey="clickOnSignIn"/>
33-
<seeInCurrentUrl url="{{AdminLoginPage}}" mergeKey="seeAdminLoginUrl"/>
33+
<seeInCurrentUrl url="{{AdminLoginPage.url}}" mergeKey="seeAdminLoginUrl"/>
3434
</test>
3535
</cest>
3636
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.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="AdminLoginPage" urlPath="admin/admin" module="Magento_Backend">
11+
<page name="AdminLoginPage" url="admin/admin" module="Magento_Backend">
1212
<section name="AdminLoginFormSection"/>
1313
</page>
1414
</config>

‎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/Braintree/Metadata/braintree_config-meta.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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/dataOperation.xsd">
11+
<operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
12+
<object key="groups" dataType="braintree_config_state">
13+
<object key="braintree_section" dataType="braintree_config_state">
14+
<object key="groups" dataType="braintree_config_state">
15+
<object key="braintree" dataType="braintree_config_state">
16+
<object key="groups" dataType="braintree_config_state">
17+
<object key="braintree_required" dataType="braintree_config_state">
18+
<object key="fields" dataType="braintree_config_state">
19+
<object key="title" dataType="title">
20+
<field key="value">string</field>
21+
</object>
22+
<object key="environment" dataType="environment">
23+
<field key="value">string</field>
24+
</object>
25+
<object key="payment_action" dataType="payment_action">
26+
<field key="value">string</field>
27+
</object>
28+
<object key="merchant_id" dataType="merchant_id">
29+
<field key="value">string</field>
30+
</object>
31+
<object key="public_key" dataType="public_key">
32+
<field key="value">string</field>
33+
</object>
34+
<object key="private_key" dataType="private_key">
35+
<field key="value">string</field>
36+
</object>
37+
</object>
38+
</object>
39+
</object>
40+
</object>
41+
</object>
42+
</object>
43+
</object>
44+
</operation>
45+
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" mergeKey="fillSKU"/>
3838
<fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" mergeKey="fillPrice"/>
3939
<fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" mergeKey="fillQuantity"/>
40-
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="['$$createPreReqCategory.name$$']" mergeKey="searchAndSelectCategory"/>
40+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory.name$$]" mergeKey="searchAndSelectCategory"/>
4141
<click selector="{{AdminProductSEOSection.sectionHeader}}" mergeKey="openSeoSection"/>
4242
<fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" mergeKey="fillUrlKey"/>
4343
<click selector="{{AdminProductFormActionSection.saveButton}}" mergeKey="saveProduct"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.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="AdminCategoryPage" urlPath="admin/catalog/category/" module="Catalog">
11+
<page name="AdminCategoryPage" url="admin/catalog/category/" module="Catalog">
1212
<section name="AdminCategorySidebarActionSection"/>
1313
<section name="AdminCategorySidebarTreeSection"/>
1414
<section name="AdminCategoryBasicFieldSection"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.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="AdminProductEditPage" urlPath="admin/catalog/product/new" module="Magento_Catalog">
11+
<page name="AdminProductEditPage" url="admin/catalog/product/new" module="Magento_Catalog">
1212
<section name="AdminProductFormSection"/>
1313
<section name="AdminProductFormActionSection"/>
1414
<section name="AdminMessagesSection"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.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="AdminProductIndexPage" urlPath="admin/catalog/product/index" module="Magento_Catalog">
11+
<page name="AdminProductIndexPage" url="admin/catalog/product/index" module="Magento_Catalog">
1212
<section name="AdminProductGridActionSection" />
1313
<section name="AdminProductGridSection" />
1414
<section name="AdminMessagesSection" />

‎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" urlPath="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" />

0 commit comments

Comments
 (0)