Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit f4496e9

Browse files
authored
Merge pull request #7 from magento/2.3-develop
2.3 develop
2 parents 360b7fd + 6178786 commit f4496e9

File tree

1,798 files changed

+16452
-14656
lines changed

Some content is hidden

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

1,798 files changed

+16452
-14656
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Admin Notification Functional Tests
2+
3+
The Functional Test Module for **Magento Admin Notification** module.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "magento/functional-test-module-admin-notification",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.1.3||~7.2.0",
9+
"magento/magento2-functional-testing-framework": "2.2.0",
10+
"magento/functional-test-module-backend": "100.0.0-dev",
11+
"magento/functional-test-module-media-storage": "100.0.0-dev",
12+
"magento/functional-test-module-store": "100.0.0-dev",
13+
"magento/functional-test-module-ui": "100.0.0-dev"
14+
},
15+
"type": "magento2-test",
16+
"license": [
17+
"OSL-3.0",
18+
"AFL-3.0"
19+
]
20+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Advanced Pricing Import Export Functional Tests
2+
3+
The Functional Test Module for **Magento Advanced Pricing Import Export** module.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "magento/functional-test-module-advanced-pricing-import-export",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.1.3||~7.2.0",
9+
"magento/magento2-functional-testing-framework": "2.2.0",
10+
"magento/functional-test-module-catalog": "100.0.0-dev",
11+
"magento/functional-test-module-catalog-import-export": "100.0.0-dev",
12+
"magento/functional-test-module-catalog-inventory": "100.0.0-dev",
13+
"magento/functional-test-module-customer": "100.0.0-dev",
14+
"magento/functional-test-module-eav": "100.0.0-dev",
15+
"magento/functional-test-module-import-export": "100.0.0-dev",
16+
"magento/functional-test-module-store": "100.0.0-dev"
17+
},
18+
"type": "magento2-test",
19+
"license": [
20+
"OSL-3.0",
21+
"AFL-3.0"
22+
]
23+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Advanced Search Functional Tests
2+
3+
The Functional Test Module for **Magento Advanced Search** module.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "magento/functional-test-module-advanced-search",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"magento/magento2-functional-testing-framework": "2.2.0",
9+
"magento/functional-test-module-backend": "100.0.0-dev",
10+
"magento/functional-test-module-catalog": "100.0.0-dev",
11+
"magento/functional-test-module-catalog-search": "100.0.0-dev",
12+
"magento/functional-test-module-config": "100.0.0-dev",
13+
"magento/functional-test-module-customer": "100.0.0-dev",
14+
"magento/functional-test-module-search": "100.0.0-dev",
15+
"magento/functional-test-module-store": "100.0.0-dev",
16+
"php": "~7.1.3||~7.2.0"
17+
},
18+
"type": "magento2-test",
19+
"license": [
20+
"proprietary"
21+
]
22+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Amqp Functional Tests
2+
3+
The Functional Test Module for **Magento Amqp** module.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "magento/functional-test-module-amqp",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"magento/magento2-functional-testing-framework": "2.2.0",
9+
"magento/framework-amqp": "100.0.0-dev",
10+
"magento/framework-message-queue": "100.0.0-dev",
11+
"php": "~7.1.3||~7.2.0"
12+
},
13+
"type": "magento2-test",
14+
"license": [
15+
"proprietary"
16+
]
17+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="adminNoReport" type="user">
12+
<data key="username" unique="suffix">noreport</data>
13+
<data key="firstname">No</data>
14+
<data key="lastname">Report</data>
15+
<data key="email" unique="prefix">[email protected]</data>
16+
<data key="password">123123q</data>
17+
<data key="password_confirmation">123123q</data>
18+
<data key="interface_local">en_US</data>
19+
<data key="is_active">true</data>
20+
<data key="current_password">123123q</data>
21+
</entity>
22+
<entity name="restrictedWebUser" type="user">
23+
<data key="username" unique="suffix">restrictedWebUser</data>
24+
<data key="firstname">restricted</data>
25+
<data key="lastname">webUser</data>
26+
<data key="email" unique="prefix">[email protected]</data>
27+
<data key="password">123123q</data>
28+
<data key="password_confirmation">123123q</data>
29+
<data key="interface_local">en_US</data>
30+
<data key="is_active">true</data>
31+
<data key="current_password">123123q</data>
32+
</entity>
33+
</entities>
Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="adminNoReportRole" type="user_role">
12+
<data key="rolename" unique="suffix">noreport</data>
13+
<data key="current_password">123123q</data>
14+
<array key="resource">
15+
<item>Magento_Backend::dashboard</item>
16+
<item>Magento_Sales::sales</item>
17+
<item>Magento_Sales::sales_operation</item>
18+
<item>Magento_Sales::sales_order</item>
19+
<item>Magento_Sales::actions</item>
20+
<item>Magento_Sales::create</item>
21+
<item>Magento_Sales::actions_view</item>
22+
<item>Magento_Sales::email</item>
23+
<item>Magento_Sales::reorder</item>
24+
<item>Magento_Sales::actions_edit</item>
25+
<item>Magento_Sales::cancel</item>
26+
<item>Magento_Sales::review_payment</item>
27+
<item>Magento_Sales::capture</item>
28+
<item>Magento_Sales::invoice</item>
29+
<item>Magento_Sales::creditmemo</item>
30+
<item>Magento_Sales::hold</item>
31+
<item>Magento_Sales::unhold</item>
32+
<item>Magento_Sales::ship</item>
33+
<item>Magento_Sales::comment</item>
34+
<item>Magento_Sales::emails</item>
35+
<item>Magento_Sales::sales_invoice</item>
36+
<item>Magento_Sales::shipment</item>
37+
<item>Magento_Sales::sales_creditmemo</item>
38+
<item>Magento_Paypal::billing_agreement</item>
39+
<item>Magento_Paypal::billing_agreement_actions</item>
40+
<item>Magento_Paypal::billing_agreement_actions_view</item>
41+
<item>Magento_Paypal::actions_manage</item>
42+
<item>Magento_Paypal::use</item>
43+
<item>Magento_Sales::transactions</item>
44+
<item>Magento_Sales::transactions_fetch</item>
45+
<item>Magento_Catalog::catalog</item>
46+
<item>Magento_Catalog::catalog_inventory</item>
47+
<item>Magento_Catalog::products</item>
48+
<item>Magento_Catalog::categories</item>
49+
<item>Magento_Customer::customer</item>
50+
<item>Magento_Customer::manage</item>
51+
<item>Magento_Customer::online</item>
52+
<item>Magento_Cart::cart</item>
53+
<item>Magento_Cart::manage</item>
54+
<item>Magento_Backend::myaccount</item>
55+
<item>Magento_Backend::marketing</item>
56+
<item>Magento_CatalogRule::promo</item>
57+
<item>Magento_CatalogRule::promo_catalog</item>
58+
<item>Magento_SalesRule::quote</item>
59+
<item>Magento_Backend::marketing_communications</item>
60+
<item>Magento_Email::template</item>
61+
<item>Magento_Newsletter::template</item>
62+
<item>Magento_Newsletter::queue</item>
63+
<item>Magento_Newsletter::subscriber</item>
64+
<item>Magento_Backend::marketing_seo</item>
65+
<item>Magento_Search::search</item>
66+
<item>Magento_Search::synonyms</item>
67+
<item>Magento_UrlRewrite::urlrewrite</item>
68+
<item>Magento_Sitemap::sitemap</item>
69+
<item>Magento_Backend::marketing_user_content</item>
70+
<item>Magento_Review::reviews_all</item>
71+
<item>Magento_Review::pending</item>
72+
<item>Magento_Backend::content</item>
73+
<item>Magento_Backend::content_elements</item>
74+
<item>Magento_Cms::page</item>
75+
<item>Magento_Cms::save</item>
76+
<item>Magento_Cms::page_delete</item>
77+
<item>Magento_Cms::block</item>
78+
<item>Magento_Widget::widget_instance</item>
79+
<item>Magento_Cms::media_gallery</item>
80+
<item>Magento_Backend::design</item>
81+
<item>Magento_Theme::theme</item>
82+
<item>Magento_Backend::schedule</item>
83+
<item>Magento_Backend::content_translation</item>
84+
<item>Magento_Backend::stores</item>
85+
<item>Magento_Backend::stores_settings</item>
86+
<item>Magento_Backend::store</item>
87+
<item>Magento_Config::config</item>
88+
<item>Magento_Payment::payment</item>
89+
<item>Magento_Cms::config_cms</item>
90+
<item>Magento_GoogleAnalytics::google</item>
91+
<item>Magento_Downloadable::downloadable</item>
92+
<item>Magento_Contact::contact</item>
93+
<item>Magento_CatalogInventory::cataloginventory</item>
94+
<item>Magento_Payment::payment_services</item>
95+
<item>Magento_Newsletter::newsletter</item>
96+
<item>Magento_Catalog::config_catalog</item>
97+
<item>Magento_CatalogSearch::config_catalog_search</item>
98+
<item>Magento_Shipping::config_shipping</item>
99+
<item>Magento_Shipping::shipping_policy</item>
100+
<item>Magento_Shipping::carriers</item>
101+
<item>Magento_Multishipping::config_multishipping</item>
102+
<item>Magento_Config::config_general</item>
103+
<item>Magento_Config::web</item>
104+
<item>Magento_Config::config_design</item>
105+
<item>Magento_Paypal::paypal</item>
106+
<item>Magento_Customer::config_customer</item>
107+
<item>Magento_Tax::config_tax</item>
108+
<item>Magento_Checkout::checkout</item>
109+
<item>Magento_Persistent::persistent</item>
110+
<item>Magento_Sales::config_sales</item>
111+
<item>Magento_Sales::sales_email</item>
112+
<item>Magento_Sales::sales_pdf</item>
113+
<item>Magento_Reports::reports</item>
114+
<item>Magento_Sitemap::config_sitemap</item>
115+
<item>Magento_Wishlist::config_wishlist</item>
116+
<item>Magento_Config::config_system</item>
117+
<item>Magento_SalesRule::config_promo</item>
118+
<item>Magento_Config::advanced</item>
119+
<item>Magento_Config::config_admin</item>
120+
<item>Magento_Config::trans_email</item>
121+
<item>Magento_Config::dev</item>
122+
<item>Magento_Config::currency</item>
123+
<item>Magento_Rss::rss</item>
124+
<item>Magento_Config::sendfriend</item>
125+
<item>Magento_NewRelicReporting::config_newrelicreporting</item>
126+
<item>Magento_CheckoutAgreements::checkoutagreement</item>
127+
<item>Magento_Sales::order_statuses</item>
128+
<item>Magento_Tax::manage_tax</item>
129+
<item>Magento_CurrencySymbol::system_currency</item>
130+
<item>Magento_CurrencySymbol::currency_rates</item>
131+
<item>Magento_CurrencySymbol::symbols</item>
132+
<item>Magento_Backend::stores_attributes</item>
133+
<item>Magento_Catalog::attributes_attributes</item>
134+
<item>Magento_Catalog::update_attributes</item>
135+
<item>Magento_Catalog::sets</item>
136+
<item>Magento_Review::ratings</item>
137+
<item>Magento_Swatches::iframe</item>
138+
<item>Magento_Backend::stores_other_settings</item>
139+
<item>Magento_Customer::group</item>
140+
<item>Magento_Backend::system</item>
141+
<item>Magento_Backend::convert</item>
142+
<item>Magento_ImportExport::import</item>
143+
<item>Magento_ImportExport::export</item>
144+
<item>Magento_TaxImportExport::import_export</item>
145+
<item>Magento_ImportExport::history</item>
146+
<item>Magento_Backend::extensions</item>
147+
<item>Magento_Backend::local</item>
148+
<item>Magento_Backend::custom</item>
149+
<item>Magento_Backend::tools</item>
150+
<item>Magento_Backend::cache</item>
151+
<item>Magento_Backend::setup_wizard</item>
152+
<item>Magento_Backup::backup</item>
153+
<item>Magento_Backup::rollback</item>
154+
<item>Magento_Indexer::index</item>
155+
<item>Magento_Indexer::changeMode</item>
156+
<item>Magento_User::acl</item>
157+
<item>Magento_User::acl_users</item>
158+
<item>Magento_User::locks</item>
159+
<item>Magento_User::acl_roles</item>
160+
<item>Magento_Backend::system_other_settings</item>
161+
<item>Magento_AdminNotification::adminnotification</item>
162+
<item>Magento_AdminNotification::show_toolbar</item>
163+
<item>Magento_AdminNotification::show_list</item>
164+
<item>Magento_AdminNotification::mark_as_read</item>
165+
<item>Magento_AdminNotification::adminnotification_remove</item>
166+
<item>Magento_Variable::variable</item>
167+
<item>Magento_EncryptionKey::crypt_key</item>
168+
<item>Magento_Backend::global_search</item>
169+
</array>
170+
</entity>
171+
</entities>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
1010
<operation name="CreateUser" dataType="user" type="create"
1111
auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
1212
<contentType>application/x-www-form-urlencoded</contentType>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
1010
<operation name="CreateUserRole" dataType="user_role" type="create"
1111
auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
1212
<contentType>application/x-www-form-urlencoded</contentType>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Analytics Functional Tests
2+
3+
The Functional Test Module for **Magento Analytics** module.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1010
<test name="AdminConfigurationBlankIndustryTest">
1111
<annotations>
1212
<features value="Analytics"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1010
<test name="AdminConfigurationEnableDisableAnalyticsTest">
1111
<annotations>
1212
<features value="Analytics"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<test name="AdminConfigurationIndustryTest">
1212
<annotations>
1313
<features value="Analytics"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<test name="AdminConfigurationPermissionTest">
1212
<annotations>
1313
<features value="Analytics"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<test name="AdminConfigurationTimeToSendDataTest">
1212
<annotations>
1313
<features value="Analytics"/>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "magento/functional-test-module-analytics",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.1.3||~7.2.0",
9+
"magento/functional-test-module-backend": "100.0.0-dev",
10+
"magento/functional-test-module-config": "100.0.0-dev",
11+
"magento/functional-test-module-integration": "100.0.0-dev",
12+
"magento/functional-test-module-store": "100.0.0-dev",
13+
"magento/magento2-functional-testing-framework": "2.2.0"
14+
},
15+
"type": "magento2-test",
16+
"license": [
17+
"OSL-3.0",
18+
"AFL-3.0"
19+
]
20+
}

0 commit comments

Comments
 (0)