Skip to content

Commit

Permalink
Merge pull request magento#7 from magento/2.3-develop
Browse files Browse the repository at this point in the history
2.3 develop
  • Loading branch information
mageprince authored Jul 9, 2018
2 parents 360b7fd + 6178786 commit f4496e9
Show file tree
Hide file tree
Showing 1,798 changed files with 16,452 additions and 14,656 deletions.
3 changes: 3 additions & 0 deletions app/code/Magento/AdminNotification/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Admin Notification Functional Tests

The Functional Test Module for **Magento Admin Notification** module.
20 changes: 20 additions & 0 deletions app/code/Magento/AdminNotification/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "magento/functional-test-module-admin-notification",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-media-storage": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev",
"magento/functional-test-module-ui": "100.0.0-dev"
},
"type": "magento2-test",
"license": [
"OSL-3.0",
"AFL-3.0"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Advanced Pricing Import Export Functional Tests

The Functional Test Module for **Magento Advanced Pricing Import Export** module.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "magento/functional-test-module-advanced-pricing-import-export",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-catalog": "100.0.0-dev",
"magento/functional-test-module-catalog-import-export": "100.0.0-dev",
"magento/functional-test-module-catalog-inventory": "100.0.0-dev",
"magento/functional-test-module-customer": "100.0.0-dev",
"magento/functional-test-module-eav": "100.0.0-dev",
"magento/functional-test-module-import-export": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev"
},
"type": "magento2-test",
"license": [
"OSL-3.0",
"AFL-3.0"
]
}
3 changes: 3 additions & 0 deletions app/code/Magento/AdvancedSearch/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Advanced Search Functional Tests

The Functional Test Module for **Magento Advanced Search** module.
22 changes: 22 additions & 0 deletions app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "magento/functional-test-module-advanced-search",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-catalog": "100.0.0-dev",
"magento/functional-test-module-catalog-search": "100.0.0-dev",
"magento/functional-test-module-config": "100.0.0-dev",
"magento/functional-test-module-customer": "100.0.0-dev",
"magento/functional-test-module-search": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev",
"php": "~7.1.3||~7.2.0"
},
"type": "magento2-test",
"license": [
"proprietary"
]
}
File renamed without changes.
3 changes: 3 additions & 0 deletions app/code/Magento/Amqp/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Amqp Functional Tests

The Functional Test Module for **Magento Amqp** module.
17 changes: 17 additions & 0 deletions app/code/Magento/Amqp/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "magento/functional-test-module-amqp",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/framework-amqp": "100.0.0-dev",
"magento/framework-message-queue": "100.0.0-dev",
"php": "~7.1.3||~7.2.0"
},
"type": "magento2-test",
"license": [
"proprietary"
]
}
33 changes: 33 additions & 0 deletions app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
<entity name="adminNoReport" type="user">
<data key="username" unique="suffix">noreport</data>
<data key="firstname">No</data>
<data key="lastname">Report</data>
<data key="email" unique="prefix">noreport@example.com</data>
<data key="password">123123q</data>
<data key="password_confirmation">123123q</data>
<data key="interface_local">en_US</data>
<data key="is_active">true</data>
<data key="current_password">123123q</data>
</entity>
<entity name="restrictedWebUser" type="user">
<data key="username" unique="suffix">restrictedWebUser</data>
<data key="firstname">restricted</data>
<data key="lastname">webUser</data>
<data key="email" unique="prefix">restrictedWebUser@example.com</data>
<data key="password">123123q</data>
<data key="password_confirmation">123123q</data>
<data key="interface_local">en_US</data>
<data key="is_active">true</data>
<data key="current_password">123123q</data>
</entity>
</entities>
171 changes: 171 additions & 0 deletions app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
<entity name="adminNoReportRole" type="user_role">
<data key="rolename" unique="suffix">noreport</data>
<data key="current_password">123123q</data>
<array key="resource">
<item>Magento_Backend::dashboard</item>
<item>Magento_Sales::sales</item>
<item>Magento_Sales::sales_operation</item>
<item>Magento_Sales::sales_order</item>
<item>Magento_Sales::actions</item>
<item>Magento_Sales::create</item>
<item>Magento_Sales::actions_view</item>
<item>Magento_Sales::email</item>
<item>Magento_Sales::reorder</item>
<item>Magento_Sales::actions_edit</item>
<item>Magento_Sales::cancel</item>
<item>Magento_Sales::review_payment</item>
<item>Magento_Sales::capture</item>
<item>Magento_Sales::invoice</item>
<item>Magento_Sales::creditmemo</item>
<item>Magento_Sales::hold</item>
<item>Magento_Sales::unhold</item>
<item>Magento_Sales::ship</item>
<item>Magento_Sales::comment</item>
<item>Magento_Sales::emails</item>
<item>Magento_Sales::sales_invoice</item>
<item>Magento_Sales::shipment</item>
<item>Magento_Sales::sales_creditmemo</item>
<item>Magento_Paypal::billing_agreement</item>
<item>Magento_Paypal::billing_agreement_actions</item>
<item>Magento_Paypal::billing_agreement_actions_view</item>
<item>Magento_Paypal::actions_manage</item>
<item>Magento_Paypal::use</item>
<item>Magento_Sales::transactions</item>
<item>Magento_Sales::transactions_fetch</item>
<item>Magento_Catalog::catalog</item>
<item>Magento_Catalog::catalog_inventory</item>
<item>Magento_Catalog::products</item>
<item>Magento_Catalog::categories</item>
<item>Magento_Customer::customer</item>
<item>Magento_Customer::manage</item>
<item>Magento_Customer::online</item>
<item>Magento_Cart::cart</item>
<item>Magento_Cart::manage</item>
<item>Magento_Backend::myaccount</item>
<item>Magento_Backend::marketing</item>
<item>Magento_CatalogRule::promo</item>
<item>Magento_CatalogRule::promo_catalog</item>
<item>Magento_SalesRule::quote</item>
<item>Magento_Backend::marketing_communications</item>
<item>Magento_Email::template</item>
<item>Magento_Newsletter::template</item>
<item>Magento_Newsletter::queue</item>
<item>Magento_Newsletter::subscriber</item>
<item>Magento_Backend::marketing_seo</item>
<item>Magento_Search::search</item>
<item>Magento_Search::synonyms</item>
<item>Magento_UrlRewrite::urlrewrite</item>
<item>Magento_Sitemap::sitemap</item>
<item>Magento_Backend::marketing_user_content</item>
<item>Magento_Review::reviews_all</item>
<item>Magento_Review::pending</item>
<item>Magento_Backend::content</item>
<item>Magento_Backend::content_elements</item>
<item>Magento_Cms::page</item>
<item>Magento_Cms::save</item>
<item>Magento_Cms::page_delete</item>
<item>Magento_Cms::block</item>
<item>Magento_Widget::widget_instance</item>
<item>Magento_Cms::media_gallery</item>
<item>Magento_Backend::design</item>
<item>Magento_Theme::theme</item>
<item>Magento_Backend::schedule</item>
<item>Magento_Backend::content_translation</item>
<item>Magento_Backend::stores</item>
<item>Magento_Backend::stores_settings</item>
<item>Magento_Backend::store</item>
<item>Magento_Config::config</item>
<item>Magento_Payment::payment</item>
<item>Magento_Cms::config_cms</item>
<item>Magento_GoogleAnalytics::google</item>
<item>Magento_Downloadable::downloadable</item>
<item>Magento_Contact::contact</item>
<item>Magento_CatalogInventory::cataloginventory</item>
<item>Magento_Payment::payment_services</item>
<item>Magento_Newsletter::newsletter</item>
<item>Magento_Catalog::config_catalog</item>
<item>Magento_CatalogSearch::config_catalog_search</item>
<item>Magento_Shipping::config_shipping</item>
<item>Magento_Shipping::shipping_policy</item>
<item>Magento_Shipping::carriers</item>
<item>Magento_Multishipping::config_multishipping</item>
<item>Magento_Config::config_general</item>
<item>Magento_Config::web</item>
<item>Magento_Config::config_design</item>
<item>Magento_Paypal::paypal</item>
<item>Magento_Customer::config_customer</item>
<item>Magento_Tax::config_tax</item>
<item>Magento_Checkout::checkout</item>
<item>Magento_Persistent::persistent</item>
<item>Magento_Sales::config_sales</item>
<item>Magento_Sales::sales_email</item>
<item>Magento_Sales::sales_pdf</item>
<item>Magento_Reports::reports</item>
<item>Magento_Sitemap::config_sitemap</item>
<item>Magento_Wishlist::config_wishlist</item>
<item>Magento_Config::config_system</item>
<item>Magento_SalesRule::config_promo</item>
<item>Magento_Config::advanced</item>
<item>Magento_Config::config_admin</item>
<item>Magento_Config::trans_email</item>
<item>Magento_Config::dev</item>
<item>Magento_Config::currency</item>
<item>Magento_Rss::rss</item>
<item>Magento_Config::sendfriend</item>
<item>Magento_NewRelicReporting::config_newrelicreporting</item>
<item>Magento_CheckoutAgreements::checkoutagreement</item>
<item>Magento_Sales::order_statuses</item>
<item>Magento_Tax::manage_tax</item>
<item>Magento_CurrencySymbol::system_currency</item>
<item>Magento_CurrencySymbol::currency_rates</item>
<item>Magento_CurrencySymbol::symbols</item>
<item>Magento_Backend::stores_attributes</item>
<item>Magento_Catalog::attributes_attributes</item>
<item>Magento_Catalog::update_attributes</item>
<item>Magento_Catalog::sets</item>
<item>Magento_Review::ratings</item>
<item>Magento_Swatches::iframe</item>
<item>Magento_Backend::stores_other_settings</item>
<item>Magento_Customer::group</item>
<item>Magento_Backend::system</item>
<item>Magento_Backend::convert</item>
<item>Magento_ImportExport::import</item>
<item>Magento_ImportExport::export</item>
<item>Magento_TaxImportExport::import_export</item>
<item>Magento_ImportExport::history</item>
<item>Magento_Backend::extensions</item>
<item>Magento_Backend::local</item>
<item>Magento_Backend::custom</item>
<item>Magento_Backend::tools</item>
<item>Magento_Backend::cache</item>
<item>Magento_Backend::setup_wizard</item>
<item>Magento_Backup::backup</item>
<item>Magento_Backup::rollback</item>
<item>Magento_Indexer::index</item>
<item>Magento_Indexer::changeMode</item>
<item>Magento_User::acl</item>
<item>Magento_User::acl_users</item>
<item>Magento_User::locks</item>
<item>Magento_User::acl_roles</item>
<item>Magento_Backend::system_other_settings</item>
<item>Magento_AdminNotification::adminnotification</item>
<item>Magento_AdminNotification::show_toolbar</item>
<item>Magento_AdminNotification::show_list</item>
<item>Magento_AdminNotification::mark_as_read</item>
<item>Magento_AdminNotification::adminnotification_remove</item>
<item>Magento_Variable::variable</item>
<item>Magento_EncryptionKey::crypt_key</item>
<item>Magento_Backend::global_search</item>
</array>
</entity>
</entities>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
<operation name="CreateUser" dataType="user" type="create"
auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
<contentType>application/x-www-form-urlencoded</contentType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
<operation name="CreateUserRole" dataType="user_role" type="create"
auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
<contentType>application/x-www-form-urlencoded</contentType>
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/Analytics/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Analytics Functional Tests

The Functional Test Module for **Magento Analytics** module.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<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">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="AdminConfigurationBlankIndustryTest">
<annotations>
<features value="Analytics"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->

<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">
<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">
<test name="AdminConfigurationEnableDisableAnalyticsTest">
<annotations>
<features value="Analytics"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-->

<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">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="AdminConfigurationIndustryTest">
<annotations>
<features value="Analytics"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-->

<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">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="AdminConfigurationPermissionTest">
<annotations>
<features value="Analytics"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-->

<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">
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="AdminConfigurationTimeToSendDataTest">
<annotations>
<features value="Analytics"/>
Expand Down
20 changes: 20 additions & 0 deletions app/code/Magento/Analytics/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "magento/functional-test-module-analytics",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-config": "100.0.0-dev",
"magento/functional-test-module-integration": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev",
"magento/magento2-functional-testing-framework": "2.2.0"
},
"type": "magento2-test",
"license": [
"OSL-3.0",
"AFL-3.0"
]
}
Loading

0 comments on commit f4496e9

Please sign in to comment.