Skip to content

Commit

Permalink
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-92986
Browse files Browse the repository at this point in the history
  • Loading branch information
Bohdan Korablov committed Jul 6, 2018
2 parents ff19419 + 113bf62 commit 9838f83
Show file tree
Hide file tree
Showing 2,415 changed files with 18,258 additions and 13,935 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
Expand Up @@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
$this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
}

/**
* @return array
*/
public function getIdentityDataProvider()
{
$cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
Expand Down Expand Up @@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
$this->assertEquals($expected, $this->_messageModel->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
$cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
$this->assertEquals($expectedFirstRun, $model->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
$this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
return [
Expand Down
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"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
$this->tierPrice->isValid($value);
}

/**
* @return array
*/
public function isValidResultFalseDataProvider()
{
return [
Expand Down Expand Up @@ -286,6 +289,9 @@ public function isValidResultFalseDataProvider()
];
}

/**
* @return array
*/
public function isValidAddMessagesCallDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ public function testGetAllWebsitesValue()
$this->assertEquals($expectedResult, $result);
}

/**
* @return array
*/
public function isValidReturnDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public function testInit()
$this->validator->init(null);
}

/**
* @return array
*/
public function isValidDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
}

/**
* @return array
*/
public function saveProductPricesDataProvider()
{
return [
Expand Down Expand Up @@ -839,6 +842,9 @@ public function testDeleteProductTierPrices(
);
}

/**
* @return array
*/
public function deleteProductTierPricesDataProvider()
{
return [
Expand Down Expand Up @@ -921,6 +927,9 @@ public function testProcessCountExistingPrices(
$this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
}

/**
* @return array
*/
public function processCountExistingPricesDataProvider()
{
return [
Expand Down
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"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ public function testValidateNoOptions()
$this->assertEquals($expectedResult, $this->model->validate($options, $this->deploymentConfigMock));
}

/**
* @return array
*/
public function getCreateConfigDataProvider()
{
return [
Expand Down
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>
Loading

0 comments on commit 9838f83

Please sign in to comment.